bugs.

web/building_saas/main/js/models/calc_program.js

@@ -884,27 +884,6 @@ let analyzer = {
         }
         return false;
     },
-    calcItemNew: function(template, idx){
-        let newItem = {};
-        newItem.ID = analyzer.calcItemMaxID(template) + 1;
-        newItem.memo = '用户自定义';
-        newItem.expression = '0';
-        template.calcItems.splice(idx + 1, 0, newItem);
-        projectObj.project.calcProgram.compileTemplate(template);
-    },
-    calcItemDelete: function(template, idx){
-        let item = template.calcItems[idx];
-        if (analyzer.calcItemIsUsed(template, item)){
-            alert(`第 ${idx + 1} 行“${item.name}”已被第 ${item.tempUsed + 1} 行引用，不允许删除！`);
-            delete item.tempUsed;
-            return false;
-        }
-        else{
-            template.calcItems.splice(idx, 1);
-            projectObj.project.calcProgram.compileTemplate(template);
-            return true;
-        }
-    },
     calcItemLabourCoe: function(calcItem){
         let lc = 0;
         if (calcItem.labourCoeID)

web/building_saas/main/js/views/calc_program_manage.js

@@ -176,10 +176,17 @@ let calcProgramManage = {
                 "newCalcItem": {
                     name: "插入行",
                     icon: 'fa-sign-in',
-                    callback: function (key, opt) {
-                        let t = calcProgramManage.getSelectionInfo().template;
+                    callback: function () {
+                        let template = calcProgramManage.getSelectionInfo().template;
                         var idx = calcProgramManage.detailSpread.getActiveSheet().getActiveRowIndex();
-                        analyzer.calcItemNew(t, idx); // CSLAAAAA 这里要回调
+
+                        let newItem = {};
+                        newItem.ID = analyzer.calcItemMaxID(template) + 1;
+                        newItem.memo = '用户自定义';
+                        newItem.expression = '0';
+                        template.calcItems.splice(idx + 1, 0, newItem);
+
+                        projectObj.project.calcProgram.compileTemplate(template);
                         calcProgramManage.refreshDetailSheet();
                         calcProgramManage.detailSpread.getActiveSheet().setSelection(idx + 1, 0, 1, 1);
                     }
@@ -187,16 +194,20 @@ let calcProgramManage = {
                 "deleteCalcItem": {
                     name: '删除行',
                     icon: 'fa-remove',
-                    disabled: function () {
-                        var idx = calcProgramManage.detailSpread.getActiveSheet().getActiveRowIndex();
-                        return idx >9;
-                        return false;
-                    },
                     callback: function () {
-                        let t = calcProgramManage.getSelectionInfo().template;
+                        let template = calcProgramManage.getSelectionInfo().template;
                         var idx = calcProgramManage.detailSpread.getActiveSheet().getActiveRowIndex();
-                        if (analyzer.calcItemDelete(t, idx)) // CSLAAAAA 这里要回调
+                        let item = template.calcItems[idx];
+
+                        if (analyzer.calcItemIsUsed(template, item)){
+                            alert(`第 ${idx + 1} 行“${item.name}”已被第 ${item.tempUsed + 1} 行引用，不允许删除！`);
+                            delete item.tempUsed;
+                        }
+                        else{
+                            template.calcItems.splice(idx, 1);
+                            projectObj.project.calcProgram.compileTemplate(template);
                             calcProgramManage.refreshDetailSheet();
+                        }
                     }
                 }
             }