|
@@ -1081,7 +1081,7 @@ let calcTools = {
|
|
|
else if (tender == tenderTypes.ttReverseRation)
|
|
else if (tender == tenderTypes.ttReverseRation)
|
|
|
return node.data.rationQuantityCoe;
|
|
return node.data.rationQuantityCoe;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
};
|
|
};
|
|
|
|
|
|
|
@@ -2075,7 +2075,7 @@ class CalcProgram {
|
|
|
projectObj.project.projectInfo.lastFileVer = VERSION;
|
|
projectObj.project.projectInfo.lastFileVer = VERSION;
|
|
|
// 批量树结点计算后，计算程序早已物是人非，所以这里要重新计算一下。警告：第二个参数千万不能改成3，否则死循环！
|
|
// 批量树结点计算后，计算程序早已物是人非，所以这里要重新计算一下。警告：第二个参数千万不能改成3，否则死循环！
|
|
|
if (activeSubSheetIsCalcProgram())
|
|
if (activeSubSheetIsCalcProgram())
|
|
|
- calcProgramObj.refreshCalcProgram(treeNodes.tree.selected, 2);
|
|
|
|
|
|
|
+ calcProgramObj.refreshCalcProgram(treeNodes[0].tree.selected, 2);
|
|
|
$.bootstrapLoading.end();
|
|
$.bootstrapLoading.end();
|
|
|
});
|
|
});
|
|
|
};
|
|
};
|
|
@@ -2142,7 +2142,7 @@ class CalcProgram {
|
|
|
calcNodes(tree.roots);
|
|
calcNodes(tree.roots);
|
|
|
me.calcFormulaNodes(changedNodes, tender);
|
|
me.calcFormulaNodes(changedNodes, tender);
|
|
|
debugger;
|
|
debugger;
|
|
|
- if (tender){
|
|
|
|
|
|
|
+ if (tender){
|
|
|
for(let node of tree.items){
|
|
for(let node of tree.items){
|
|
|
this.clearTenderCache(node);
|
|
this.clearTenderCache(node);
|
|
|
};
|
|
};
|
|
@@ -2739,7 +2739,7 @@ class CalcProgram {
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
};
|
|
};
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
// export default analyzer;
|
|
// export default analyzer;
|
