ele-admin-plus 1.2.0 → 1.2.1-beta.2

package/lib/utils/message.cjs

@@ -42,7 +42,7 @@ function getOffsetStyle(offset, userStyle) {
 function isObjOpt(params) {
   return params != null && typeof params === "object" && !vue.isVNode(params);
 }
-function normalizeOption(params, globalOpt, onClose, type, loading, getWrapEl2, groupKey) {
+function normalizeOption(params, globalOpt, onClose, type, loading, getWrapEl2, groupKey, messageId, onMessageDestroy) {
   const opt = { ...globalOpt || {} };
   if (isObjOpt(params)) {
     Object.assign(opt, params);
@@ -91,7 +91,9 @@ function normalizeOption(params, globalOpt, onClose, type, loading, getWrapEl2,
       showClose: opt.showClose,
       dangerouslyUseHTMLString: opt.dangerouslyUseHTMLString,
       loading,
-      onClose
+      messageId,
+      onClose,
+      onMessageDestroy
     },
     { default: isFn ? content : isStr ? void 0 : () => content }
   );
@@ -163,7 +165,8 @@ function useMessage(globalOpt) {
   const globalProps = receiver.useGlobalProps("message");
   const appContext = (_b = (_a = vue.getCurrentInstance) == null ? void 0 : _a.call(vue)) == null ? void 0 : _b.appContext;
   const groupKey = (globalOpt == null ? void 0 : globalOpt.groupKey) || getDefaultGroupKey();
-  const state = { wrapEl: null, isActivated: true };
+  const state = { wrapEl: null, isActivated: true, id: 0 };
+  const instances = /* @__PURE__ */ new Map();
   const hideClass = "is-hide";
   vue.provide(MESSAGE_KEY, { groupKey, getInnerWrap: () => getWrap(true) });
   const parentMsg = vue.inject(MESSAGE_KEY, null);
@@ -175,6 +178,12 @@ function useMessage(globalOpt) {
     state.isActivated = false;
     state.wrapEl && state.wrapEl.classList.add(hideClass);
   });
+  vue.onBeforeUnmount(() => {
+    for (const [_key, ins] of instances) {
+      ins && ins.close && ins.close();
+    }
+    instances.clear();
+  });
   const getWrap = (inner) => {
     if (inner) {
       if (parentMsg != null && parentMsg.groupKey === groupKey) {
@@ -192,49 +201,63 @@ function useMessage(globalOpt) {
     }
     return getWrapEl();
   };
-  const getOption = function(params, onClose, type, loading) {
-    return normalizeOption(
+  const getOpt = function(params, onClose, type, loading) {
+    state.id++;
+    const msgId = `m_${state.id}`;
+    const opt = normalizeOption(
       params,
       { ...globalProps.value || {}, ...globalOpt || {} },
       onClose,
       type,
       loading,
       getWrap,
-      groupKey
+      groupKey,
+      msgId,
+      (messageId) => {
+        messageId && instances.delete(messageId);
+      }
     );
+    return { opt, msgId };
   };
   const message = function(params) {
-    const opt = getOption(params, () => ins.close());
+    const { opt, msgId } = getOpt(params, () => ins.close());
     const ins = elementPlus.ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.success = function(params) {
-    const opt = getOption(params, () => ins.close(), "success", false);
+    const { opt, msgId } = getOpt(params, () => ins.close(), "success", false);
     const ins = elementPlus.ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.warning = function(params) {
-    const opt = getOption(params, () => ins.close(), "warning", false);
+    const { opt, msgId } = getOpt(params, () => ins.close(), "warning", false);
     const ins = elementPlus.ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.error = function(params) {
-    const opt = getOption(params, () => ins.close(), "error", false);
+    const { opt, msgId } = getOpt(params, () => ins.close(), "error", false);
     const ins = elementPlus.ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.info = function(params) {
-    const opt = getOption(params, () => ins.close());
+    const { opt, msgId } = getOpt(params, () => ins.close());
     const ins = elementPlus.ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.loading = function(params) {
     blurCurrentFocus();
-    const opt = getOption(params, () => ins.close(), void 0, true);
+    const { opt, msgId } = getOpt(params, () => ins.close(), void 0, true);
     const ins = elementPlus.ElMessage(opt, appContext);
+    instances.set(msgId, ins);
     return ins;
   };
   message.closeAll = function(type) {
+    instances.clear();
     return elementPlus.ElMessage.closeAll(type);
   };
   return message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.2.0",
+  "version": "1.2.1-beta.2",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",
@@ -27,12 +27,12 @@
     "@types/node": "^20.14.2",
     "@types/nprogress": "^0.2.3",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^7.12.0",
-    "@typescript-eslint/parser": "^7.12.0",
+    "@typescript-eslint/eslint-plugin": "^7.13.0",
+    "@typescript-eslint/parser": "^7.13.0",
     "@vitejs/plugin-vue": "^5.0.5",
     "@vitejs/plugin-vue-jsx": "^4.0.0",
-    "@vue/compiler-sfc": "^3.4.27",
-    "@vueuse/core": "^10.10.0",
+    "@vue/compiler-sfc": "^3.4.29",
+    "@vueuse/core": "^10.11.0",
     "axios": "^1.7.2",
     "bytemd": "^1.21.0",
     "chalk": "^5.3.0",
@@ -49,7 +49,7 @@
     "esno": "^4.7.0",
     "exceljs": "^4.4.0",
     "execa": "^9.2.0",
-    "github-markdown-css": "^5.5.1",
+    "github-markdown-css": "^5.6.0",
     "highlight.js": "^11.9.0",
     "jsbarcode": "^3.11.6",
     "lodash-es": "^4.17.21",
@@ -57,20 +57,20 @@
     "p-limit": "^5.0.0",
     "pinia": "^2.1.7",
     "postcss": "^8.4.38",
-    "prettier": "^3.3.1",
+    "prettier": "^3.3.2",
     "rimraf": "^5.0.7",
-    "sass": "^1.77.4",
+    "sass": "^1.77.5",
     "sortablejs": "^1.15.2",
     "tinymce": "^5.10.9",
     "typescript": "^5.4.5",
     "unplugin-vue-components": "^0.27.0",
-    "vite": "^5.2.13",
+    "vite": "^5.3.1",
     "vite-plugin-dts": "^3.9.1",
-    "vue": "^3.4.27",
+    "vue": "^3.4.29",
     "vue-echarts": "^6.7.3",
     "vue-eslint-parser": "^9.4.3",
     "vue-i18n": "^9.13.1",
-    "vue-router": "^4.3.2",
+    "vue-router": "^4.3.3",
     "vue-tsc": "^2.0.21",
     "vuedraggable": "^4.1.0",
     "xgplayer": "^3.0.18",