Procházet zdrojové kódy

production issue,增强清单建树的强壮性

TonyKang před 5 roky
rodič
revize
657ac71629

+ 6 - 2
public/web/treeDataHelper.js

@@ -44,7 +44,7 @@ let tree_Data_Helper = {
                 if (nextNode === null || nextNode === undefined) {
                     //备注: 考虑到实际数据的健壮性,有些节点会掉链子,需要用 parentItem[SUB_ID] 比对已经加上的节点,如发现加上的节点数量不够,那就得在这里补充上去
                     if (parentItem) {
-                        if (parentItem[SUB_ID].length > iter.length) {
+                        if (parentItem[SUB_ID] && parentItem[SUB_ID].length > iter.length) {
                             for (let subId of parentItem[SUB_ID]) {
                                 if (pushedIds.indexOf(subId) < 0) {
                                     let restNode = tmpNodes[prefix + subId];
@@ -109,7 +109,11 @@ let tree_Data_Helper = {
                     }
                 }
             }
-            if (parseInt(data[i][P_ID]) !== EMPTY_ID_VAL) {
+            // if (parseInt(data[i][P_ID]) !== EMPTY_ID_VAL && !(tmpNodes[prefix + data[i][P_ID]])) {
+            //     console.log(data[i][NODE_ID]);
+            // }
+            if (parseInt(data[i][P_ID]) !== EMPTY_ID_VAL && tmpNodes[prefix + data[i][P_ID]] ) {
+                //断链情况下,tmpNodes[prefix + data[i][P_ID]有可能找不到!
                 tmpNodes[prefix + data[i][P_ID]][SUB_ID].push(data[i][NODE_ID]);
             }
         }

+ 2 - 2
test/unit/reports/test_rpt_test_template.js

@@ -56,7 +56,7 @@ let demoPrjId = - 1;
 // let demoRptId = 551; //表05
 // let demoRptId = 1104; //内蒙2017 表09
 
-let demoRptId = 1104;
+let demoRptId = 479;
 
 let pagesize = "A4";
 
@@ -72,7 +72,7 @@ let userId_me = "5b6a60b1c4ba33000dd417c0"; //我的
 // demoPrjId = 2260; //QA:
 // demoPrjId = 5029; //
 // demoPrjId = 5029; //项目名称过长
-demoPrjId = 23235; //
+demoPrjId = 37189; //
 // demoPrjId = 4107; //UAT:
 //*/
 let userId_Dft = userId_Leng;