|
|
@@ -429,7 +429,7 @@ let cbTools = {
|
|
|
},
|
|
|
|
|
|
// 获取全部有公式的树节点清单。 CSL, 2018-01-05
|
|
|
- getFormulaNodes: function (needOrder = false) {
|
|
|
+ getFormulaNodes: function (needOrder = false, tree = projectObj.project.mainTree) {
|
|
|
// 给公式结点清单换照引用计算顺序排序。
|
|
|
function orderFormulaNodes(nodesArr) {
|
|
|
let orderArr = [];
|
|
|
@@ -448,7 +448,7 @@ let cbTools = {
|
|
|
};
|
|
|
|
|
|
let nodes = [];
|
|
|
- for (let node of projectObj.project.mainTree.items) {
|
|
|
+ for (let node of tree.items) {
|
|
|
if (node.sourceType == ModuleNames.bills && node.data.calcBase && node.data.calcBase != '')
|
|
|
nodes.push(node);
|
|
|
};
|
|
|
@@ -1879,4 +1879,4 @@ let calcBase = {
|
|
|
alert(err);
|
|
|
}
|
|
|
}
|
|
|
-};
|
|
|
+};
|
