@moluoxixi/ajax-package 0.0.41 → 0.0.43

package/es/index.mjs

@@ -2,9 +2,9 @@
   "use strict";
   try {
     if (typeof document !== "undefined") {
-      if (!document.getElementById("980e338e-d621-406b-8660-db906d5c2f50")) {
+      if (!document.getElementById("b98adb7e-1e48-4cc5-8e14-015f69a7d6cf")) {
         var elementStyle = document.createElement("style");
-        elementStyle.id = "980e338e-d621-406b-8660-db906d5c2f50";
+        elementStyle.id = "b98adb7e-1e48-4cc5-8e14-015f69a7d6cf";
         elementStyle.appendChild(document.createTextNode("._root_11p33_1 .el-dialog__header {\n  padding: 0 12px 12px;\n}\n\n._root_11p33_1 .el-dialog__body {\n  border-top: 1px solid #e5e7eb;\n  border-bottom: 1px solid #e5e7eb;\n  padding: 0 12px;\n}\n\n._root_11p33_1 .el-dialog__footer {\n  padding: 0 12px;\n}"));
         document.head.appendChild(elementStyle);
       }
@@ -7531,9 +7531,10 @@ const _BaseHttpClient = class _BaseHttpClient {
       return null;
     }
     if (!this.containerId) {
-      this.containerId = `ajaxPackage-container-${generateUUID()}`;
-      this.popoverContainerId = `ajaxPackage-popover-${generateUUID()}`;
-      this.messageContainerId = `ajaxPackage-message-${generateUUID()}`;
+      const targetElementId = generateUUID();
+      this.containerId = `ajaxPackage-container-${targetElementId}`;
+      this.popoverContainerId = `ajaxPackage-popover-${targetElementId}`;
+      this.messageContainerId = `ajaxPackage-message-${targetElementId}`;
     }
     let container = document.getElementById(this.containerId);
     if (!container) {
@@ -7634,41 +7635,19 @@ const _BaseHttpClient = class _BaseHttpClient {
     }
   }
   handleTimeoutError(error) {
-    var _a2;
-    if (error.code === "ECONNABORTED") {
-      if (error.message.includes("timeout")) {
-        this.onTimeout(this.messageInstance);
-      } else {
-        const errorMessage = "请求已取消";
-        const currentTime = Date.now();
-        const shouldShowError = !this.recentErrorCache || this.recentErrorCache.message !== errorMessage || currentTime - this.recentErrorCache.timestamp > this.errorDebounceTime;
-        if (shouldShowError) {
-          (_a2 = this.messageInstance) == null ? void 0 : _a2.call(this, {
-            type: "error",
-            message: errorMessage,
-            duration: 5 * 1e3
-          });
-          this.recentErrorCache = { message: errorMessage, timestamp: currentTime };
-          if (this.errorCacheTimer) {
-            clearTimeout(this.errorCacheTimer);
-            this.errorCacheTimer = null;
-          }
-          this.errorCacheTimer = setTimeout(() => {
-            if (this.recentErrorCache && this.recentErrorCache.message === errorMessage) {
-              this.recentErrorCache = null;
-              this.errorCacheTimer = null;
-            }
-          }, 5e3);
-        }
-      }
+    if (error.code === "ECONNABORTED" && error.message.includes("timeout")) {
+      this.onTimeout(this.messageInstance);
     }
   }
   handleNetworkError(error) {
     var _a2, _b, _c;
     if (((_a2 = error.response) == null ? void 0 : _a2.status) !== 401 && error.code !== "ECONNABORTED") {
       const fallbackError = error;
-      const errorMessage = ((_b = fallbackError.response) == null ? void 0 : _b.data) || fallbackError.message || "网络错误";
+      let errorMessage = ((_b = fallbackError.response) == null ? void 0 : _b.data) || fallbackError.message || "网络错误";
       const currentTime = Date.now();
+      if (error.code === "ERR_CANCELED") {
+        errorMessage = "请求已取消";
+      }
       const shouldShowError = !this.recentErrorCache || this.recentErrorCache.message !== errorMessage || currentTime - this.recentErrorCache.timestamp > this.errorDebounceTime;
       if (shouldShowError) {
         (_c = this.messageInstance) == null ? void 0 : _c.call(this, {
@@ -7677,9 +7656,13 @@ const _BaseHttpClient = class _BaseHttpClient {
           duration: 5 * 1e3
         });
         this.recentErrorCache = { message: errorMessage, timestamp: currentTime };
-        setTimeout(() => {
+        if (this.errorCacheTimer) {
+          clearTimeout(this.errorCacheTimer);
+        }
+        this.errorCacheTimer = setTimeout(() => {
           if (this.recentErrorCache && this.recentErrorCache.message === errorMessage) {
             this.recentErrorCache = null;
+            this.errorCacheTimer = null;
           }
         }, 5e3);
       }
@@ -8569,8 +8552,9 @@ const SystemErrorDialog = defineComponent({
     }
     function showMessage(options) {
       const container = getAjaxPackageMessageContainer();
+      const dialogContainer = container || document.querySelector(`.${cssModules.root}`);
       const { type = "info", message: message2 } = options;
-      const finalOptions = container ? { type, message: message2, appendTo: container } : { type, message: message2 };
+      const finalOptions = dialogContainer ? { type, message: message2, appendTo: dialogContainer } : { type, message: message2 };
       ElMessage(finalOptions);
     }
     async function handleReport() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moluoxixi/ajax-package",
-  "version": "0.0.41",
+  "version": "0.0.43",
   "description": "AjaxPackage 组件",
   "sideEffects": [
     "*.css",