|
|
@@ -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};
|
|
|
+ const PAGE_SHOW = {closeWatermark: 0, closeExportPdf: 0, closeExportExcel: 0, showArchive: 0, dftShowAllCustomized: 0};
|
|
|
<% if (pageShow !== null) { %>
|
|
|
<% if (parseInt(pageShow.closeWatermark) === 1) { %>
|
|
|
PAGE_SHOW['closeWatermark'] = 1;
|
|
|
@@ -335,6 +335,9 @@
|
|
|
<% if (parseInt(pageShow.showArchive) === 1) { %>
|
|
|
PAGE_SHOW['showArchive'] = 1;
|
|
|
<% } %>
|
|
|
+ <% if (parseInt(pageShow.dftShowAllCustomized) === 1) { %>
|
|
|
+ PAGE_SHOW['dftShowAllCustomized'] = 1;
|
|
|
+ <% } %>
|
|
|
<% } %>
|
|
|
|
|
|
// PAGE_SHOW['closeWatermark'] = 0; //测试用，check in 前要屏蔽
|
|
|
@@ -515,7 +518,10 @@
|
|
|
// 1.1 移除未被选择的模板
|
|
|
filterUnchkTplTreeNode(TOP_TREE_NODES[0], CUST_TREE_NODES.common);
|
|
|
TOP_TREE_NODES.unshift(individualNode); //定制在前
|
|
|
- filterUnchkTplTreeNode(TOP_TREE_NODES[0], CUST_TREE_NODES.customize);
|
|
|
+ // PAGE_SHOW['dftShowAllCustimed']
|
|
|
+ if (!(CUST_TREE_NODES.customize && CUST_TREE_NODES.customize.length === 0 && PAGE_SHOW['dftShowAllCustomized'] === 1)) {
|
|
|
+ filterUnchkTplTreeNode(TOP_TREE_NODES[0], CUST_TREE_NODES.customize);
|
|
|
+ }
|
|
|
//2. 原始的模板树(恢复用)
|
|
|
const individualNodeOrg = {id: 99999, name: '定制报表', pid: -1, rpt_type: 0, items: [], isParent: true};
|
|
|
for (let tnIdx = ORG_TOP_TREE_NODES.length - 1; tnIdx >= 0; tnIdx--) {
|
