diff --git a/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.css b/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.css
index 63df567ac19c06350d2dce206cc21ff988310c3d..9cdbe8880a3ff2d1447b0ec3a15d34f04fd81f52 100644
--- a/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.css
+++ b/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.css
@@ -47,7 +47,7 @@
     font-size: 72px;
     color: #000000;
     width: 100%;
-    height: 10%;
+    height: 13%;
 }
 
 .calc-rsl {
@@ -60,7 +60,7 @@
 .input-area {
     width: 100%;
     height: 65%;
-    margin-top: 25%;
+    margin-top: 22%;
 }
 
 .calc-text-btn, .calc-op-btn, .calc-equals-btn {
diff --git a/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.js b/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.js
index afd161b3e8ffe4f2fea4abbc3ae6994d786a2dc8..0f1eb117ae06b27cf189fd3f2b3b54a69e15d41d 100644
--- a/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.js
+++ b/common/DistributeCalc/entry/src/main/js/default/pages/calc/calc.js
@@ -12,7 +12,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
 import {calc, isOperator} from '../../common/calculator.js';
 import app from '@system.app';
 import distributedDataKit from '@ohos.data.distributedData';
@@ -101,7 +100,16 @@ export default {
                                     that.expression = '';
                                     that.result = '';
                                     continue;
+                                } else if(entry.value.value == "equal") {
+                                    if (that.result !== '') {
+                                        console.log("Calc[CalcPage] data expression:equal");
+                                        that.expression = that.result;
+                                        that.result = '';
+                                        //pressedEqual = true;
+                                    }
+                                    continue;
                                 }
+                                pressedEqual = false;
                                 that.expression = entry.value.value;
                                 console.log("Calc[CalcPage] data changed:"+entry.value.value);
                             }
@@ -134,6 +142,8 @@ export default {
         }
     },
     handleInput(value) {
+        console.log('Calc[CalcPage] handleInput:'+value);
+        this.isPush = false;
         if (isOperator(value)) {
             if (pressedEqual) {
                 pressedEqual = false;
@@ -155,28 +165,43 @@ export default {
                 this.expression = value;
                 pressedEqual = false;
             } else {
+                console.log("Calc[CalcPage] handleinput value:"+value)
                 this.expression += value;
             }
         }
-        this.isPush = false;
+
     },
     handleBackspace() {
         if(pressedEqual) {
             this.expression = '';
             this.result = '';
             pressedEqual = false;
+            if(kvStore != null) {
+                console.log('Calc[CalcPage] handleBackspace1');
+                this.dataChange('expression','clear');
+            }
         } else {
+            this.isPush = false;
             this.expression = this.expression.slice(0, -1);
             if (!this.expression.length) {
                 this.result = '';
+                if(kvStore != null) {
+                    console.log('Calc[CalcPage] handleBackspace2');
+                    this.dataChange('expression','clear');
+                }
             }
         }
     },
     handleEqual() {
         if (this.result !== '') {
+            this.isPush = true;
             this.expression = this.result;
             this.result = '';
             pressedEqual = true;
+            if(kvStore != null) {
+                console.log('Calc[CalcPage] handleEqual');
+                this.dataChange('expression','equal');
+            }
         }
     },
     handleTerminate(e) {
diff --git a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.css b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.css
index 4397478a016ceb281360fb3240051140fca1a95e..7a9423c256f6ef397e1baa0f0bf727f0cb15b937 100644
--- a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.css
+++ b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.css
@@ -92,7 +92,7 @@
     font-size: 72px;
     color: #000000;
     width: 100%;
-    height: 10%;
+    height: 13%;
 }
 
 .calc-rsl {
@@ -105,7 +105,7 @@
 .input-area {
     width: 100%;
     height: 65%;
-    margin-top: 25%;
+    margin-top: 22%;
 }
 
 .calc-text-btn, .calc-op-btn, .calc-equals-btn {
diff --git a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js
index d866c1355c54ed0a16d0ee43608dca7862c8c87b..3b29af6121e6db5450dec7c9d4c0884fdeb554fd 100644
--- a/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js
+++ b/common/DistributeCalc/entry/src/main/js/default/pages/index/index.js
@@ -40,7 +40,7 @@ export default {
             if (value !== '') {
                 this.result = calc(value).toString();
                 if(this.isDistributed && kvStore != null && !this.isPush) {
-                    console.log('Calc[IndexPage] data changed');
+                    console.log('Calc[IndexPage] put key start');
                     this.dataChange('expression',value);
                 }
             }
@@ -137,8 +137,17 @@ export default {
                             that.expression = '';
                             that.result = '';
                             continue;
+                        }else if(entry.value.value == "equal") {
+                            if (that.result !== '') {
+                                console.log("Calc[IndexPage] data expression:equal");
+                                that.expression = that.result;
+                                that.result = '';
+                                //pressedEqual = true;
+                            }
+                            continue;
                         }
                         that.expression = entry.value.value;
+                        pressedEqual = false;
                         console.log("Calc[IndexPage] data expression:" + that.expression);
                         console.log("Calc[IndexPage] data changed:" + entry.value.value);
                     }
@@ -225,12 +234,13 @@ export default {
         this.expression = '';
         this.result = '';
         if(this.isDistributed && kvStore != null) {
-            console.log('Calc[IndexPage] data changed');
+            console.log('Calc[IndexPage] handleClear');
             this.dataChange('expression','clear');
         }
     },
     handleInput(value) {
-        console.log("Calc[IndexPage] handle input value:"+value)
+        console.log("Calc[IndexPage] handle input value:"+value);
+        this.isPush = false;
         if (isOperator(value)) {
             if (pressedEqual) {
                 pressedEqual = false;
@@ -256,25 +266,39 @@ export default {
                 this.expression += value;
             }
         }
-        this.isPush = false;
+
     },
     handleBackspace() {
         if(pressedEqual) {
             this.expression = '';
             this.result = '';
             pressedEqual = false;
+            if(this.isDistributed && kvStore != null) {
+                console.log('Calc[IndexPage] handleBackspace1');
+                this.dataChange('expression','clear');
+            }
         } else {
+            this.isPush = false;
             this.expression = this.expression.slice(0, -1);
             if (!this.expression.length) {
                 this.result = '';
+                if(this.isDistributed && kvStore != null) {
+                    console.log('Calc[IndexPage] handleBackspace2');
+                    this.dataChange('expression','clear');
+                }
             }
         }
     },
     handleEqual() {
         if (this.result !== '') {
+            this.isPush = true;
             this.expression = this.result;
             this.result = '';
             pressedEqual = true;
+            if(this.isDistributed && kvStore != null) {
+                console.log('Calc[IndexPage] handleEqual');
+                this.dataChange('expression','equal');
+            }
         }
     },
     handleTerminate(e) {