bugs.

public/web/sheet/sheet_common.js

@@ -40,7 +40,10 @@ var sheetCommonObj = {
 
         sheet.showRowOutline(false);
         me.buildHeader(sheet, setting);
-        if (rowCount > 0) sheet.setRowCount(rowCount);
+        if (rowCount > 0)
+            sheet.setRowCount(rowCount)
+        else
+            sheet.setRowCount(1);
         sheet.resumeEvent();
         sheet.resumePaint();
     },

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

@@ -438,35 +438,12 @@ let treeNodeTools = {
     orderFormulaNodes: function (nodesArr) {
         let orderArr = [];
 
-        function getNodesByExp(expression){
-            // for test --------------
-            function getNode(name) {
-                for (let node of projectObj.project.mainTree.items){
-                    if (node.data.name == name)
-                        return node;
-                };
-            };
-
-            if (expression.hasSubStr("{措施项目费}")){
-                let node = getNode('措施项目');
-                return [node];
-            }
-
-            else if (expression.hasSubStr("{技术措施项目费}")){
-                let node = getNode('1.技术措施项目');
-                return [node];
-            }
-            // -------------------------------
-
-            return [];
-        };
-
         function recursionNode(nodes) {
             for (let node of nodes){
                 if (orderArr.includes(node)) continue;    // 已排过序的节点则跳过
 
                 if (node.data.calcBase){
-                    let subNodes = getNodesByExp(node.data.calcBase);
+                    let subNodes = cbTools.getNodesByExp(node.data.calcBase);
                     recursionNode(subNodes);
                 };