eoss 0.1.0-alpha.17 → 0.1.0-alpha.18

package/lib/data-table.js

@@ -21200,15 +21200,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -21228,12 +21223,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/date-picker.js

@@ -4174,15 +4174,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -4202,12 +4197,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/dialog.js

@@ -4173,15 +4173,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -4201,12 +4196,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/drawer.js

@@ -470,15 +470,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return removeClass(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -498,12 +493,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return removeClass(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         removeClass(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return removeClass(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/dropdown-menu.js

@@ -2198,15 +2198,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -2226,12 +2221,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/dropdown.js

@@ -13621,15 +13621,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -13649,12 +13644,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/email-login.js

@@ -8095,15 +8095,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -8123,12 +8118,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/eoss.common.js

@@ -3058,7 +3058,8 @@ var states = vue__WEBPACK_IMPORTED_MODULE_0___default().observable({
   // 其他
   homePage: {},
   indexUrl: '',
-  initApplication: []
+  initApplication: [],
+  historyMenusMax: null
 });
 
 // 监听器
@@ -8551,15 +8552,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,utils_dom/* removeClass */.vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -8579,12 +8575,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,utils_dom/* removeClass */.vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,utils_dom/* removeClass */.vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,utils_dom/* removeClass */.vy)(modalDom, item);
+        });
+      }
     }
   }
 };
@@ -151123,8 +151132,8 @@ earlyvue_type_template_id_1ce42234_render._withStripped = true;
 
 ;// ./packages/main/src/early.vue?vue&type=template&id=1ce42234
 
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./packages/main/src/components/application.vue?vue&type=template&id=67e437b3
-var applicationvue_type_template_id_67e437b3_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./packages/main/src/components/application.vue?vue&type=template&id=35936406
+var applicationvue_type_template_id_35936406_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c("div", {
@@ -151314,6 +151323,7 @@ var applicationvue_type_template_id_67e437b3_render = function render() {
       "modal-class": "es-main-application__drawer-modal is-gzw",
       size: "534px",
       padding: "",
+      "z-index": 200,
       "modal-append-to-body": false,
       "with-header": false,
       visible: _vm.showSet
@@ -151346,6 +151356,7 @@ var applicationvue_type_template_id_67e437b3_render = function render() {
       size: "534px",
       padding: "",
       "show-close": "",
+      "z-index": 200,
       "modal-append-to-body": false,
       "with-header": false,
       visible: _vm.showAll
@@ -151379,6 +151390,7 @@ var applicationvue_type_template_id_67e437b3_render = function render() {
       "modal-class": "es-main-application__drawer-modal",
       size: "90%",
       padding: "",
+      "z-index": 200,
       "modal-append-to-body": false,
       "with-header": false,
       visible: _vm.showApps
@@ -151406,6 +151418,7 @@ var applicationvue_type_template_id_67e437b3_render = function render() {
       "modal-class": "es-main-application__drawer-modal",
       size: "100%",
       "show-close": "",
+      "z-index": 200,
       "modal-append-to-body": false,
       visible: _vm.openAi
     },
@@ -151416,10 +151429,10 @@ var applicationvue_type_template_id_67e437b3_render = function render() {
     }
   })], 1);
 };
-var applicationvue_type_template_id_67e437b3_staticRenderFns = [];
-applicationvue_type_template_id_67e437b3_render._withStripped = true;
+var applicationvue_type_template_id_35936406_staticRenderFns = [];
+applicationvue_type_template_id_35936406_render._withStripped = true;
 
-;// ./packages/main/src/components/application.vue?vue&type=template&id=67e437b3
+;// ./packages/main/src/components/application.vue?vue&type=template&id=35936406
 
 ;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./packages/main/src/components/apps.vue?vue&type=template&id=2cf0fcd6&scoped=true
 var appsvue_type_template_id_2cf0fcd6_scoped_true_render = function render() {
@@ -151835,8 +151848,8 @@ var apps_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ const apps = (apps_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./packages/main/src/components/all-apps.vue?vue&type=template&id=bb098284&scoped=true
-var all_appsvue_type_template_id_bb098284_scoped_true_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-1!./node_modules/vue-loader/lib/loaders/templateLoader.js??ruleSet[1].rules[2]!./node_modules/vue-loader/lib/index.js??vue-loader-options!./packages/main/src/components/all-apps.vue?vue&type=template&id=a96c2a30&scoped=true
+var all_appsvue_type_template_id_a96c2a30_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c("es-scrollbar", {
@@ -151907,10 +151920,10 @@ var all_appsvue_type_template_id_bb098284_scoped_true_render = function render()
     }, [_vm._v("\n            " + _vm._s(item.text || item.name) + "\n          ")])], 1)]);
   }), 0)] : _vm._e()], 2);
 };
-var all_appsvue_type_template_id_bb098284_scoped_true_staticRenderFns = [];
-all_appsvue_type_template_id_bb098284_scoped_true_render._withStripped = true;
+var all_appsvue_type_template_id_a96c2a30_scoped_true_staticRenderFns = [];
+all_appsvue_type_template_id_a96c2a30_scoped_true_render._withStripped = true;
 
-;// ./packages/main/src/components/all-apps.vue?vue&type=template&id=bb098284&scoped=true
+;// ./packages/main/src/components/all-apps.vue?vue&type=template&id=a96c2a30&scoped=true
 
 // EXTERNAL MODULE: ./packages/main/src/store/index.js
 var main_src_store = __webpack_require__(6246);
@@ -151966,6 +151979,9 @@ var main_src_store = __webpack_require__(6246);
     };
   },
   computed: {
+    historyMenusMax: function historyMenusMax() {
+      return main_src_store/* default */.A.state.historyMenusMax || 20;
+    },
     show: {
       get: function get() {
         return this.visible;
@@ -151995,7 +152011,7 @@ var main_src_store = __webpack_require__(6246);
         }
       }).then(function (res) {
         if (res.rCode == 0) {
-          _this.historyMenus = res.results || [];
+          _this.historyMenus = (res.results || []).slice(0, _this.historyMenusMax);
         }
       });
     },
@@ -152074,11 +152090,11 @@ var main_src_store = __webpack_require__(6246);
 ;
 var all_apps_component = (0,componentNormalizer/* default */.A)(
   components_all_appsvue_type_script_lang_js,
-  all_appsvue_type_template_id_bb098284_scoped_true_render,
-  all_appsvue_type_template_id_bb098284_scoped_true_staticRenderFns,
+  all_appsvue_type_template_id_a96c2a30_scoped_true_render,
+  all_appsvue_type_template_id_a96c2a30_scoped_true_staticRenderFns,
   false,
   null,
-  "bb098284",
+  "a96c2a30",
   null
   
 )
@@ -152846,8 +152862,8 @@ var aiIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAVAAAADwCAYAAABWgzyD
 ;
 var application_component = (0,componentNormalizer/* default */.A)(
   components_applicationvue_type_script_lang_js,
-  applicationvue_type_template_id_67e437b3_render,
-  applicationvue_type_template_id_67e437b3_staticRenderFns,
+  applicationvue_type_template_id_35936406_render,
+  applicationvue_type_template_id_35936406_staticRenderFns,
   false,
   null,
   null,
@@ -212433,7 +212449,7 @@ if (typeof window !== 'undefined' && window.Vue) {
   install(window.Vue);
 }
 /* harmony default export */ const src_0 = ({
-  version: '0.1.0-alpha.17',
+  version: '0.1.0-alpha.18',
   install: install,
   CollapseTransition: collapse_transition,
   Loading: packages_loading/* default */.A,

package/lib/file-card.js

@@ -4173,15 +4173,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -4201,12 +4196,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/files-card.js

@@ -4173,15 +4173,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -4201,12 +4196,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/flow-group.js

@@ -4173,15 +4173,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -4201,12 +4196,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };

package/lib/flow.js

@@ -6546,15 +6546,10 @@ var PopupManager = {
   closeModal: function closeModal(id) {
     var modalStack = this.modalStack;
     var modalDom = getModal();
+    var topItem = null;
     if (modalStack.length > 0) {
-      var topItem = modalStack[modalStack.length - 1];
+      topItem = modalStack[modalStack.length - 1];
       if (topItem.id === id) {
-        if (topItem.modalClass) {
-          var classArr = topItem.modalClass.trim().split(/\s+/);
-          classArr.forEach(function (item) {
-            return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
-          });
-        }
         modalStack.pop();
         if (modalStack.length > 0) {
           modalDom.style.zIndex = modalStack[modalStack.length - 1].zIndex;
@@ -6574,12 +6569,25 @@ var PopupManager = {
       }
       setTimeout(function () {
         if (modalStack.length === 0) {
+          if (topItem && topItem.modalClass) {
+            var classArr = topItem.modalClass.trim().split(/\s+/);
+            classArr.forEach(function (item) {
+              return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+            });
+          }
           if (modalDom.parentNode) modalDom.parentNode.removeChild(modalDom);
           modalDom.style.display = 'none';
           PopupManager.modalDom = undefined;
         }
         (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, 'v-modal-leave');
       }, 200);
+    } else {
+      if (topItem && topItem.modalClass) {
+        var classArr = topItem.modalClass.trim().split(/\s+/);
+        classArr.forEach(function (item) {
+          return (0,_dom__WEBPACK_IMPORTED_MODULE_1__/* .removeClass */ .vy)(modalDom, item);
+        });
+      }
     }
   }
 };