优化

public/web/common_util.js

@@ -13,6 +13,7 @@ String.prototype.hasSubStr = function (str) {
     return this.toLowerCase().indexOf(str.toLowerCase()) > -1;
 };
 
+// 判断字符串是否是数字形式的字符串
 String.prototype.isNumberStr = function () {
     return this == +this;
 };
@@ -23,20 +24,21 @@ function parseFloatPlus(value){
     return  isNaN(rst) ? 0 : rst;
 };
 
-// 将arr2合并到arr1，并去重复。
-function mergeArr(arr1, arr2){
-    if (arr2.length > 0){
-        for (let e of arr2){
-            if (!arr1.includes(e)) arr1.push(e);
+// 数组合并，并去重复。
+Array.prototype.merge = function (arr) {
+    if (arr.length > 0){
+        for (let e of arr){
+            if (!this.includes(e)) this.push(e);
         };
     }
 };
 
-// 判断 sub 是否是 arr 的子数组。
-function isSubArr(sub, arr){
-    for(var i = 0, len = sub.length; i < len; i++){
-        if(arr.indexOf(sub[i]) == -1) return false;
+// 数组是否包含另一个数组。
+Array.prototype.hasSubArr = function (subArr){
+    for(var i = 0, len = subArr.length; i < len; i++){
+        if(this.indexOf(subArr[i]) == -1) return false;
     }
     return true;
 };
 
+

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

@@ -1862,11 +1862,11 @@ class CalcProgram {
                 leafBills.push(leafBill);
         };
 
-        mergeArr(billNodes, leafBills);
+        billNodes.merge(leafBills);
 
         for (let bill of billNodes){
             let changeBills = me.calculate(bill, true, false, tender);
-            mergeArr(allChangedNodes, changeBills);
+            allChangedNodes.merge(changeBills);
         };
 
         me.calcFormulaNodes(allChangedNodes, tender);
@@ -1908,7 +1908,7 @@ class CalcProgram {
             };
 
             let curChangeds = me.calculate(treeNode, true, true, tender);
-            mergeArr(changedNodes, curChangeds);
+            changedNodes.merge(curChangeds);
             me.saveNodes(changedNodes);
         };
     };