BUG #3145

app/public/report/js/rpt_main.js

@@ -295,6 +295,7 @@ let zTreeOprObj = {
     changeCfg: function() {
         let me = zTreeOprObj;
         if (me.currentNode) {
+            CUST_CFG_ORG = JSON.parse(JSON.stringify(CUST_CFG));
             let params = {};
             params.pageSize = rptControlObj.getCurrentPageSize();
             params.orientation = rptControlObj.getCurrentOrientation();
@@ -860,6 +861,9 @@ let rptControlObj = {
     },
     confirmCfgChange: function() {
         zTreeOprObj.changeCfg();
+    },
+    cancelCfgChange: function() {
+        CUST_CFG = JSON.parse(JSON.stringify(CUST_CFG_ORG));
     }
 };
 

app/view/report/index.ejs

@@ -342,6 +342,8 @@
     } else {
         localStorage[CUST_NAME + '_custCfg'] = JSON.stringify(CUST_CFG);
     }
+    let CUST_CFG_ORG = JSON.parse(JSON.stringify(CUST_CFG));
+
     let USED_LIST = <%- used_list %>;
     const STAGE_STATUS = <%- stg_status %>;
     const FOLDER_SEPERATER = '->';

app/view/report/rpt_all_popup.ejs

@@ -52,7 +52,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-link btn-sm float-left" data-dismiss="modal" onclick="rptControlObj.restoreMargine(); zTreeOprObj.changeCfg();">恢复默认值</button>
-                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="rptControlObj.cancelCfgChange()">取消</button>
                 <a href="javascript:void(0)" class="btn btn-primary btn-sm" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</a>
             </div>
         </div>
@@ -78,7 +78,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-link btn-sm float-left" data-dismiss="modal" onclick="rptControlObj.restoreFormat(); zTreeOprObj.changeCfg();">恢复默认值</button>
-                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal" onclick="rptControlObj.cancelCfgChange()">取消</button>
                 <a href="javascript:void(0)" class="btn btn-primary btn-sm" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</a>
             </div>
         </div>
@@ -139,7 +139,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal" onclick="rptControlObj.cancelCfgChange()">取消</button>
                 <a href="javascript:void(0)" class="btn btn-primary btn-sm" data-dismiss="modal" onclick="rptControlObj.confirmCfgChange()">确定</a>
             </div>
         </div>