报表，modal问题v3

app/public/report/js/rpt_custom.js

@@ -269,7 +269,7 @@ const rptCustomObj = (function () {
 
         // 初始化
         if (resolve) {
-            setTimeout(() => { $("#gather-select").modal('show'); }, 500);
+            setTimeout(() => { $("#gather-select").modal('show'); }, 1000);
         } else {
             $("#gather-select").modal('show');
         }
@@ -277,7 +277,7 @@ const rptCustomObj = (function () {
         $('#gather-select-ok').unbind('click');
         $('#gather-select-ok').bind('click', () => {
             rptCustomObj.resetGatherSelect(resolve);
-            $("#gather-select").modal('hide');
+            // $("#gather-select").modal('hide');
         });
     };
     const initStageSelect = function (gsSetting, gsSelect, rptName, resolve = null) {
@@ -295,7 +295,7 @@ const rptCustomObj = (function () {
             }
         }
         if (resolve) {
-            setTimeout(() => { $("#stage-select").modal('show'); }, 500);
+            setTimeout(() => { $("#stage-select").modal('show'); }, 1000);
         } else {
             $("#stage-select").modal('show');
         }
@@ -303,7 +303,7 @@ const rptCustomObj = (function () {
         $('#stage-select-ok').unbind('click');
         $('#stage-select-ok').bind('click', () => {
             rptCustomObj.resetStageSelect(resolve);
-            $("#stage-select").modal('hide');
+            // $("#stage-select").modal('hide');
         });
     };
     const init = function (cDefine, sfData, cSelect, rptName, resolve = null) {
@@ -727,8 +727,9 @@ const rptCustomObj = (function () {
                     params.customSelect.push(data);
                 } 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');
+                    const select = await comfirmSelectPromise(chkNode ? chkNode.name : '', gather_select)
+                    params.customSelect.push(select);
+                    $('#gather-select').modal('hide');
                 }
             } else if (stage_select && stage_select.custom_define && stage_select.custom_define[sStageSelect].enable) {
                 if (rptId === currentRptId) {
@@ -737,8 +738,9 @@ const rptCustomObj = (function () {
                     params.customSelect.push(data);
                 } 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');
+                    const select = await comfirmSelectPromise(chkNode ? chkNode.name : '', stage_select);
+                    params.customSelect.push(select);
+                    $('#stage-select').modal('hide');
                 }
             } else {
                 params.customSelect.push(null);