bug 1728 + code sync

modules/reports/util/rpt_construct_data_util.js

@@ -1281,7 +1281,7 @@ function ext_getPropety(propKey) {
                     if (pi === propKey.length - 1) rst.push('');
                 }
             } else {
-                if (doc.hasOwnProperty("property")) {
+                if (doc.hasOwnProperty("property") && doc["property"].hasOwnProperty(propKey)) {
                     rst.push(doc["property"][propKey]);
                 } else if (doc.hasOwnProperty(propKey)) {
                     rst.push(doc[propKey]);

web/maintain/report/js/rpt_tpl_main.js

@@ -353,7 +353,7 @@ let zTreeOprObj = {
         let canContinue = false;
         if (isCopy) {
             me.getNewNodeID(1, function (newNodeID) {
-                let orgID = treeNodes[0].ID;
+                let orgID = treeNodes[0].refId; //refId才是正确的模板ID(因可能copy一个有引用的节点)，
                 treeNodes[0].ID = newNodeID;
                 if (confirm("是否引用相同的报表模板？")) {
                     newTopNode = me.buildRootNodeDoc(targetTopNode);
@@ -363,6 +363,9 @@ let zTreeOprObj = {
                             treeNodes[0].rptTpl.ID = newNodeID;
                         }
                         me.currentNode = treeNodes[0];
+                        me.chkAndSetDupRefTplIds(me.treeObj.getNodes(), null);
+                        me.treeObj.refresh();
+                        me.chkAndRreshRefTpl();
                     }, function(badRst){
                         displayMessage("更新模板节点失败!", "red", 2000);
                         // console.log(badRst.toString());
@@ -381,6 +384,9 @@ let zTreeOprObj = {
                                 treeNodes[0].rptTpl.ID = newNodeID;
                             }
                             me.currentNode = treeNodes[0];
+                            me.chkAndSetDupRefTplIds(me.treeObj.getNodes(), null);
+                            me.treeObj.refresh();
+                            me.chkAndRreshRefTpl();
                         }, function(badRst){
                             displayMessage("更新模板节点失败!", "red", 2000);
                             // console.log(badRst.toString());
@@ -393,9 +399,9 @@ let zTreeOprObj = {
                     });
                 }
             });
-            if (canContinue) {
-                me.chkAndRreshRefTpl();
-            }
+            // if (canContinue) {
+            //     me.chkAndRreshRefTpl();
+            // }
         } else {
             newTopNode = me.buildRootNodeDoc(targetTopNode);
             me.updateTreeRootNode(newTopNode, false, function(rst){
@@ -530,6 +536,9 @@ let zTreeOprObj = {
                     tplNode.icon = "/lib/ztree/css/img/diy/3.png";
                 }
                 // tplNode.style = "background:url(/lib/ztree/css/img/diy/3.png) 0 0 no-repeat;"
+            } else {
+                //设置白板
+                if (!tplNode.isParent) tplNode.icon = "/lib/ztree/css/img/diy/10.png";
             }
             if (tplNode.items && tplNode.items.length > 0) {
                 for (let subTplNode of tplNode.items) {