Explorar o código

优化计算基数、费率自定义单元格

zhongzewei %!s(int64=7) %!d(string=hai) anos
pai
achega
4a7ee2fff4

+ 7 - 3
web/building_saas/main/js/views/calc_base_view.js

@@ -252,6 +252,7 @@ let calcBaseView = {
         };
         CalcBaseCellType.prototype.processMouseDown = function (hitinfo) {
             let me=calcBaseView;
+            me.pmLeave = false;
             if(me.editingCell==null){
                 var showSelectBtn = true;
                 if(hitinfo.sheet.name()!='calc_detail'){
@@ -276,9 +277,12 @@ let calcBaseView = {
             }
         };
         CalcBaseCellType.prototype.processMouseLeave = function (hitinfo) {
-            calcBaseView.editingCell=null;
-            hitinfo.sheet.invalidateLayout();
-            hitinfo.sheet.repaint();
+            if(!calcBaseView.pmLeave){
+                calcBaseView.editingCell=null;
+                hitinfo.sheet.invalidateLayout();
+                hitinfo.sheet.repaint();
+                calcBaseView.pmLeave = true;
+            }
         }
         return new CalcBaseCellType();
     },

+ 7 - 3
web/building_saas/main/js/views/fee_rate_view.js

@@ -287,6 +287,7 @@ var feeRateObject={
         };
         FeeRateEditCellType.prototype.processMouseDown = function (hitinfo) {
             var me=feeRateObject;
+            me.pmLeave = false;
             if(me.editingCell==null){
                 var showSelectBtn = true;
                 if(hitinfo.sheet.name()!='calc_detail'){
@@ -311,9 +312,12 @@ var feeRateObject={
             }
         };
         FeeRateEditCellType.prototype.processMouseLeave = function (hitinfo) {
-            feeRateObject.editingCell=null;
-            hitinfo.sheet.invalidateLayout();
-            hitinfo.sheet.repaint();
+            if(!feeRateObject.pmLeave){
+                feeRateObject.editingCell=null;
+                hitinfo.sheet.invalidateLayout();
+                hitinfo.sheet.repaint();
+                feeRateObject.pmLeave = true;
+            }
         }
         return new FeeRateEditCellType();
     },