bugs

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

@@ -822,10 +822,10 @@ let analyzer = {
     },
     refLineToIDs: function (dispExpr, template) {   // F7、F8 → @2、@3
         let rst = analyzer.standard(dispExpr);
-        let fArr = me.getFArr(rst);
+        let fArr = analyzer.getFArr(rst);
         let IDArr = [];
         for (let F of fArr) {
-            let ID = me.getID(F, template);
+            let ID = analyzer.getID(F, template);
             IDArr.push(ID);
         };
         for (let i = 0; i < fArr.length; i++) {
@@ -887,7 +887,7 @@ let analyzer = {
     calcItemNew: function(template, idx){
         let newItem = {};
         newItem.ID = analyzer.calcItemMaxID(template) + 1;
-        newItem.statement = '用户自定义';
+        newItem.memo = '用户自定义';
         newItem.expression = '0';
         template.calcItems.splice(idx + 1, 0, newItem);
         projectObj.project.calcProgram.compileTemplate(template);

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

@@ -171,28 +171,25 @@ let calcProgramManage = {
             selector: '#detailSpread',
             build: function ($triggerElement, event) {
                 SheetDataHelper.safeRightClickSelection($triggerElement, event, calcProgramManage.detailSpread);
-               // alert($triggerElement.attr("id"));   // detailSpread
             },
             items: {
                 "newCalcItem": {
                     name: "插入行",
                     icon: 'fa-sign-in',
-                    disabled: function () {
-                        return false;
-                    },
                     callback: function (key, opt) {
                         let t = calcProgramManage.getSelectionInfo().template;
                         var idx = calcProgramManage.detailSpread.getActiveSheet().getActiveRowIndex();
                         analyzer.calcItemNew(t, idx); // CSLAAAAA 这里要回调
                         calcProgramManage.refreshDetailSheet();
+                        calcProgramManage.detailSpread.getActiveSheet().setSelection(idx + 1, 0, 1, 1);
                     }
                 },
                 "deleteCalcItem": {
                     name: '删除行',
                     icon: 'fa-remove',
                     disabled: function () {
-                        // var idx = calcProgramManage.detailSpread.getActiveSheet().getActiveRowIndex();
-                        // return idx >9;
+                        var idx = calcProgramManage.detailSpread.getActiveSheet().getActiveRowIndex();
+                        return idx >9;
                         return false;
                     },
                     callback: function () {