소스 검색

报表设置在其他浏览器的兼容问题

Tony Kang 1 년 전
부모
커밋
6b31717988
2개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 4 1
      app/public/report/js/rpt_main.js
  2. 2 2
      app/view/report/rpt_all_popup.ejs

+ 4 - 1
app/public/report/js/rpt_main.js

@@ -371,8 +371,11 @@ let zTreeOprObj = {
         dom.innerHTML = tmpStr;
         me.changeCfg();
     },
-    changeCfg: async function() {
+    changeCfg: async function(preCb = null) {
         let me = zTreeOprObj;
+        if (preCb) {
+            preCb();
+        }
         if (me.currentNode) {
             CUST_CFG_ORG = JSON.parse(JSON.stringify(CUST_CFG));
             let params = {};

+ 2 - 2
app/view/report/rpt_all_popup.ejs

@@ -51,7 +51,7 @@
                 </div>
             </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-link btn-sm float-left" data-dismiss="modal" onclick="zTreeOprObj.changeCfg(rptControlObj.restoreMargine);">恢复默认值</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>
@@ -77,7 +77,7 @@
                 </div>
             </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-link btn-sm float-left" data-dismiss="modal" onclick="zTreeOprObj.changeCfg(rptControlObj.restoreFormat());">恢复默认值</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>