chenshilong пре 7 година
родитељ
комит
622578d589

+ 3 - 2
web/building_saas/main/js/models/calc_program.js

@@ -773,8 +773,9 @@ class CalcProgram {
         for (let node of treeNodes){delete node.changed};
         projectObj.mainController.refreshTreeNode(treeNodes);
 
-        if (activeSubSheetIs(subSheetIndex.ssiCalcProgram)) {    // 批量树结点计算后,计算程序早已今非昔比,所以这里要重新计算一下。
-            calcProgramObj.showData(me.project.mainTree.selected, true);
+        // 批量树结点计算后,计算程序早已物是人非,所以这里要重新计算一下。
+        if (activeSubSheetIs(subSheetIndex.ssiCalcProgram)) {
+            calcProgramObj.refreshCurNodeCalcItems(me.project.mainTree.selected);
         };
     };
 

+ 10 - 0
web/building_saas/main/js/views/calc_program_view.js

@@ -50,6 +50,16 @@ let calcProgramObj = {
         sheetCommonObj.showData(me.sheet, me.setting, me.datas);
     },
 
+    refreshCurNodeCalcItems: function (treeNode) {
+        var me = this;
+        me.treeNode = treeNode;
+        projectObj.project.calcProgram.innerCalc(treeNode, []);
+        delete treeNode.changed;
+        me.datas = treeNode.data.calcTemplate ? treeNode.data.calcTemplate.calcItems : [];
+        sheetCommonObj.initSheet(me.sheet, me.setting, me.datas.length);
+        sheetCommonObj.showData(me.sheet, me.setting, me.datas);
+    },
+
     clearData: function (){
         var me = this;
         me.treeNode = null;