Browse Source

报表,modal问题v2

MaiXinRong 3 years ago
parent
commit
2f9b67b40e
2 changed files with 11 additions and 5 deletions
  1. 10 4
      app/public/report/js/rpt_custom.js
  2. 1 1
      build_min.js

+ 10 - 4
app/public/report/js/rpt_custom.js

@@ -275,7 +275,10 @@ const rptCustomObj = (function () {
         }
 
         $('#gather-select-ok').unbind('click');
-        $('#gather-select-ok').bind('click', () => {rptCustomObj.resetGatherSelect(resolve);});
+        $('#gather-select-ok').bind('click', () => {
+            rptCustomObj.resetGatherSelect(resolve);
+            $("#gather-select").modal('hide');
+        });
     };
     const initStageSelect = function (gsSetting, gsSelect, rptName, resolve = null) {
         const setting = JSON.parse(gsSetting);
@@ -298,7 +301,10 @@ const rptCustomObj = (function () {
         }
 
         $('#stage-select-ok').unbind('click');
-        $('#stage-select-ok').bind('click', () => {rptCustomObj.resetStageSelect(resolve);});
+        $('#stage-select-ok').bind('click', () => {
+            rptCustomObj.resetStageSelect(resolve);
+            $("#stage-select").modal('hide');
+        });
     };
     const init = function (cDefine, sfData, cSelect, rptName, resolve = null) {
         stageFlow = sfData;
@@ -722,8 +728,8 @@ const rptCustomObj = (function () {
                 } else {
                     const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
                     params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', gather_select));
+                    // $('#gather-select').modal('hide');
                 }
-                $('#gather-select').modal('hide');
             } else if (stage_select && stage_select.custom_define && stage_select.custom_define[sStageSelect].enable) {
                 if (rptId === currentRptId) {
                     const data = {};
@@ -732,8 +738,8 @@ const rptCustomObj = (function () {
                 } else {
                     const chkNode = chkNodes.find(function (x) { return x.refId === rptId});
                     params.customSelect.push(await comfirmSelectPromise(chkNode ? chkNode.name : '', stage_select));
+                    // $('#stage-select').modal('hide');
                 }
-                $('#stage-select').modal('hide');
             } else {
                 params.customSelect.push(null);
             }

+ 1 - 1
build_min.js

@@ -43,7 +43,7 @@ fs.writeFileSync(needMinFileName, Uglyfy.minify(needMinCode, { mangle: true }).c
 
 const needVersionCss = ['/public/css/main'];
 for (const nvc of needVersionCss) {
-    fs.copyFileSync(nvc + '.css', nvc + '.' + version + '.css');
+    fs.copyFileSync(__dirname + '/app' + nvc + '.css', __dirname + '/app' + nvc + '.' + version + '.css');
 }