TASK#4044 调整

app/view/report/index.ejs

@@ -321,7 +321,7 @@
 
 <script type="text/javascript">
     let TOP_TREE_NODES = <%- rpt_tpl_data %>;
-    const PAGE_SHOW = {closeWatermark: 0, closeExportPdf: 0, closeExportExcel: 0, showArchive: 0, dftShowAllCustomized: 0};
+    const PAGE_SHOW = {closeWatermark: 0, closeExportPdf: 0, closeExportExcel: 0, showArchive: 0, closeShowAllCustomized: 0};
     <% if (pageShow !== null) { %>
         <% if (parseInt(pageShow.closeWatermark) === 1) { %>
             PAGE_SHOW['closeWatermark'] = 1;
@@ -335,8 +335,8 @@
         <% if (parseInt(pageShow.showArchive) === 1) { %>
             PAGE_SHOW['showArchive'] = 1;
         <% } %>
-        <% if (parseInt(pageShow.dftShowAllCustomized) === 1) { %>
-        PAGE_SHOW['dftShowAllCustomized'] = 1;
+        <% if (parseInt(pageShow.closeShowAllCustomized) === 1) { %>
+        PAGE_SHOW['closeShowAllCustomized'] = 1;
         <% } %>
     <% } %>
 
@@ -519,8 +519,15 @@
             filterUnchkTplTreeNode(TOP_TREE_NODES[0], CUST_TREE_NODES.common);
             TOP_TREE_NODES.unshift(individualNode); //定制在前
             // PAGE_SHOW['dftShowAllCustimed']
-            if (!(CUST_TREE_NODES.customize && CUST_TREE_NODES.customize.length === 0 && PAGE_SHOW['dftShowAllCustomized'] === 1)) {
+//            if (!(CUST_TREE_NODES.customize && CUST_TREE_NODES.customize.length === 0 && PAGE_SHOW['dftShowAllCustomized'] === 1)) {
+//                filterUnchkTplTreeNode(TOP_TREE_NODES[0], CUST_TREE_NODES.customize);
+//            }
+            if (CUST_TREE_NODES.customize && CUST_TREE_NODES.customize.length > 0) {
+                // 优先过滤用户选择
                 filterUnchkTplTreeNode(TOP_TREE_NODES[0], CUST_TREE_NODES.customize);
+            } else if (PAGE_SHOW['closeShowAllCustomized'] === 1) {
+                // 如果没有用户选择 且 关闭显示所有定制表
+                filterUnchkTplTreeNode(TOP_TREE_NODES[0], []);
             }
             //2. 原始的模板树(恢复用)
             const individualNodeOrg = {id: 99999, name: '定制报表', pid: -1, rpt_type: 0, items: [], isParent: true};