update

web/building_saas/main/js/models/calc_base.js

@@ -613,8 +613,8 @@ let calcBase = {
             me.success = true;
             node.data.calcBase = exp;
             node.data.calcBaseValue = parseFloat(calcBaseValue).toDecimal(decimalObj.decimal('totalPrice', node));
-            me.project.calcProgram.calculate(node);
-            me.project.calcProgram.saveNode(node);
+           /* me.project.calcProgram.calculate(node);
+            me.project.calcProgram.saveNode(node);*/
         }
         catch (err){
             alert(me.errMsg);

web/building_saas/main/js/views/calc_base_view.js

@@ -195,8 +195,7 @@ let calcBaseView = {
         let me = calcBaseView;
         me.confirmBtn.bind('click', function () {
             let selected = projectObj.project.mainTree.selected;
-            selected.data.userCalcBase = me.getInputExpr();
-            projectObj.project.calcBase.calculate(selected);
+            projectObj.updateCellValue(selected, me.getInputExpr(), {data: {field: 'calcBase'}});
             if(projectObj.project.calcBase.success){
                 $('#qd-jsjs').modal('hide');
             }

web/building_saas/main/js/views/project_view.js

@@ -265,7 +265,6 @@ var projectObj = {
         }
     },
     updateCellValue: function (node, value, colSetting) {
-        console.log(`value : ${value}`);
         let project = projectObj.project, fieldName = colSetting.data.field;
         if(node.sourceType==project.ration_glj.getSourceType()){
             project.ration_glj.updateFromMainSpread(value,node,fieldName);
@@ -310,8 +309,8 @@ var projectObj = {
                     if(!project.calcBase.success){
                         let activeCell = projectObj.mainSpread.getActiveSheet().getSelections()[0];
                         projectObj.mainSpread.getActiveSheet().setValue(activeCell.row, activeCell.col, node.data.calcBase? node.data.calcBase: '');
+                        return;
                     }
-                    return;
                     // if (value) {value = parseFloat(value).toDecimal(decimalObj.decimal("totalPrice", node))};
                 };
                 node.changed = true;