@alibarbar/common 1.1.2 → 1.1.4

package/dist/services.cjs

@@ -11,6 +11,48 @@ var Qs__default = /*#__PURE__*/_interopDefault(Qs);
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 
 // src/services/index.ts
+function convertRes2Blob(response) {
+  const contentDisposition = response.headers["content-disposition"];
+  let fileName = "file.xlsx";
+  if (contentDisposition) {
+    const rfc5987Match = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i);
+    if (rfc5987Match) {
+      fileName = decodeURIComponent(rfc5987Match[1]);
+    } else {
+      const standardMatch = contentDisposition.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/i);
+      if (standardMatch) {
+        fileName = standardMatch[1];
+        fileName = fileName.replace(/^['"]|['"]$/g, "");
+        try {
+          fileName = decodeURIComponent(fileName);
+        } catch (e) {
+          try {
+            fileName = decodeURI(fileName);
+          } catch (e2) {
+          }
+        }
+      }
+    }
+    fileName = fileName.trim().replace(/^_+|_+$/g, "");
+  }
+  const blob = new Blob([response.data], { type: "application/vnd.ms-excel;charset=utf-8" });
+  if (typeof window.navigator.msSaveBlob !== "undefined") {
+    window.navigator.msSaveBlob(blob, fileName);
+  } else {
+    const blobURL = window.URL.createObjectURL(blob);
+    const tempLink = document.createElement("a");
+    tempLink.style.display = "none";
+    tempLink.href = blobURL;
+    tempLink.setAttribute("download", fileName);
+    if (typeof tempLink.download === "undefined") {
+      tempLink.setAttribute("target", "_blank");
+    }
+    document.body.appendChild(tempLink);
+    tempLink.click();
+    document.body.removeChild(tempLink);
+    window.URL.revokeObjectURL(blobURL);
+  }
+}
 var serviceEventHandlers = {
   message: null
 };
@@ -44,11 +86,28 @@ function filterEmptyKey(params, emptyString) {
     }
   });
 }
+function isFileUpload(data) {
+  if (!data) return false;
+  if (data instanceof FormData) return true;
+  if (data instanceof File) return true;
+  if (data instanceof Blob) return true;
+  if (data instanceof ArrayBuffer) return true;
+  if (typeof data === "object" && data !== null && !Array.isArray(data)) {
+    const obj = data;
+    return Object.values(obj).some(
+      (value) => value instanceof File || value instanceof Blob || value instanceof FormData
+    );
+  }
+  return false;
+}
 function getTransformRequest(contentType) {
   if (!contentType) {
     return (data) => Qs__default.default.stringify(data);
   }
   const normalizedType = contentType.toLowerCase().trim();
+  if (normalizedType.startsWith("multipart/form-data")) {
+    return void 0;
+  }
   if (normalizedType.startsWith("application/json")) {
     return (data) => JSON.stringify(data);
   }
@@ -69,6 +128,15 @@ var service = axios__default.default.create({
 });
 service.interceptors.request.use(
   async (config) => {
+    const isFileUploadRequest = isFileUpload(config.data);
+    if (isFileUploadRequest) {
+      if (config.headers) {
+        delete config.headers["Content-Type"];
+        delete config.headers["content-type"];
+      }
+      config.transformRequest = void 0;
+      return config;
+    }
     const contentType = config.headers?.["Content-Type"] || config.headers?.["content-type"];
     if (!config.transformRequest && contentType) {
       const transformRequest = getTransformRequest(
@@ -81,9 +149,11 @@ service.interceptors.request.use(
       config.transformRequest = (data) => Qs__default.default.stringify(data);
     }
     if (config.method === "post" || config.method === "put" || config.method === "patch") {
-      const params = { ...config.data || {} };
-      filterEmptyKey(params, config.emptyParams ?? false);
-      config.data = params;
+      if (config.data && typeof config.data === "object" && !isFileUploadRequest) {
+        const params = { ...config.data || {} };
+        filterEmptyKey(params, config.emptyParams ?? false);
+        config.data = params;
+      }
     } else if (config.method === "get" || config.method === "delete") {
       if (!config.disableTimestamp) {
         config.params = {
@@ -167,19 +237,7 @@ service.interceptors.response.use(
       if (status === 401) {
         handle401Error(config, error);
       }
-      if (isAborted && config && !config._noAutoRetry) {
-        config._retryCount = config._retryCount || 0;
-        if (config._retryCount < 2) {
-          config._retryCount++;
-          console.debug(
-            `[request] aborted, retry attempt #${config._retryCount} -> ${config.url || ""}`
-          );
-          return new Promise((resolve) => setTimeout(resolve, 300)).then(
-            () => service.request(config)
-          );
-        }
-      }
-      if (!config?.hidden && !isAborted) {
+      if (!config?.hidden && !isAborted && status !== 401) {
         let friendly = messageText;
         if (status === 403) friendly = "No permission";
         else if (status === 502) friendly = "System is upgrading or unavailable";
@@ -205,7 +263,7 @@ service.json = function(url, params, config) {
   };
   return service.post(
     url,
-    Array.isArray(params) ? params : params,
+    params,
     newConfig
   );
 };
@@ -214,7 +272,13 @@ service.put = function(url, params, config) {
     headers: { "Content-Type": "application/json", ...config?.headers },
     ...config
   };
-  return service.put(url, Array.isArray(params) ? params : params, newConfig).then((res) => res);
+  const data = Array.isArray(params) ? params : params;
+  return service.request({
+    url,
+    method: "put",
+    data,
+    ...newConfig
+  }).then((res) => res);
 };
 service.arrayGet = function(url, config) {
   if (config) {
@@ -243,48 +307,6 @@ service.download = function(url, config = {}) {
     return service.post(url, params, newConfig).then(() => void 0);
   }
 };
-function convertRes2Blob(response) {
-  const contentDisposition = response.headers["content-disposition"];
-  let fileName = "file.xlsx";
-  if (contentDisposition) {
-    const rfc5987Match = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i);
-    if (rfc5987Match) {
-      fileName = decodeURIComponent(rfc5987Match[1]);
-    } else {
-      const standardMatch = contentDisposition.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/i);
-      if (standardMatch) {
-        fileName = standardMatch[1];
-        fileName = fileName.replace(/^['"]|['"]$/g, "");
-        try {
-          fileName = decodeURIComponent(fileName);
-        } catch (e) {
-          try {
-            fileName = decodeURI(fileName);
-          } catch (e2) {
-          }
-        }
-      }
-    }
-    fileName = fileName.trim().replace(/^_+|_+$/g, "");
-  }
-  const blob = new Blob([response.data], { type: "application/vnd.ms-excel;charset=utf-8" });
-  if (typeof window.navigator.msSaveBlob !== "undefined") {
-    window.navigator.msSaveBlob(blob, fileName);
-  } else {
-    const blobURL = window.URL.createObjectURL(blob);
-    const tempLink = document.createElement("a");
-    tempLink.style.display = "none";
-    tempLink.href = blobURL;
-    tempLink.setAttribute("download", fileName);
-    if (typeof tempLink.download === "undefined") {
-      tempLink.setAttribute("target", "_blank");
-    }
-    document.body.appendChild(tempLink);
-    tempLink.click();
-    document.body.removeChild(tempLink);
-    window.URL.revokeObjectURL(blobURL);
-  }
-}
 var services_default = service;
 
 exports.default = services_default;

package/dist/services.d.mts

@@ -84,7 +84,7 @@ interface ServiceError {
  * @param handlers - 事件处理器配置
  */
 declare function setServiceEventHandlers(handlers?: Partial<ServiceEventHandlers>): void;
-declare const service: AxiosInstance & ServiceInstance;
+declare const service: ServiceInstance;
 /**
  * Service 实例扩展接口
  */

package/dist/services.d.ts

@@ -84,7 +84,7 @@ interface ServiceError {
  * @param handlers - 事件处理器配置
  */
 declare function setServiceEventHandlers(handlers?: Partial<ServiceEventHandlers>): void;
-declare const service: AxiosInstance & ServiceInstance;
+declare const service: ServiceInstance;
 /**
  * Service 实例扩展接口
  */

package/dist/services.js

@@ -2,6 +2,48 @@ import Qs from 'qs';
 import axios from 'axios';
 
 // src/services/index.ts
+function convertRes2Blob(response) {
+  const contentDisposition = response.headers["content-disposition"];
+  let fileName = "file.xlsx";
+  if (contentDisposition) {
+    const rfc5987Match = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i);
+    if (rfc5987Match) {
+      fileName = decodeURIComponent(rfc5987Match[1]);
+    } else {
+      const standardMatch = contentDisposition.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/i);
+      if (standardMatch) {
+        fileName = standardMatch[1];
+        fileName = fileName.replace(/^['"]|['"]$/g, "");
+        try {
+          fileName = decodeURIComponent(fileName);
+        } catch (e) {
+          try {
+            fileName = decodeURI(fileName);
+          } catch (e2) {
+          }
+        }
+      }
+    }
+    fileName = fileName.trim().replace(/^_+|_+$/g, "");
+  }
+  const blob = new Blob([response.data], { type: "application/vnd.ms-excel;charset=utf-8" });
+  if (typeof window.navigator.msSaveBlob !== "undefined") {
+    window.navigator.msSaveBlob(blob, fileName);
+  } else {
+    const blobURL = window.URL.createObjectURL(blob);
+    const tempLink = document.createElement("a");
+    tempLink.style.display = "none";
+    tempLink.href = blobURL;
+    tempLink.setAttribute("download", fileName);
+    if (typeof tempLink.download === "undefined") {
+      tempLink.setAttribute("target", "_blank");
+    }
+    document.body.appendChild(tempLink);
+    tempLink.click();
+    document.body.removeChild(tempLink);
+    window.URL.revokeObjectURL(blobURL);
+  }
+}
 var serviceEventHandlers = {
   message: null
 };
@@ -35,11 +77,28 @@ function filterEmptyKey(params, emptyString) {
     }
   });
 }
+function isFileUpload(data) {
+  if (!data) return false;
+  if (data instanceof FormData) return true;
+  if (data instanceof File) return true;
+  if (data instanceof Blob) return true;
+  if (data instanceof ArrayBuffer) return true;
+  if (typeof data === "object" && data !== null && !Array.isArray(data)) {
+    const obj = data;
+    return Object.values(obj).some(
+      (value) => value instanceof File || value instanceof Blob || value instanceof FormData
+    );
+  }
+  return false;
+}
 function getTransformRequest(contentType) {
   if (!contentType) {
     return (data) => Qs.stringify(data);
   }
   const normalizedType = contentType.toLowerCase().trim();
+  if (normalizedType.startsWith("multipart/form-data")) {
+    return void 0;
+  }
   if (normalizedType.startsWith("application/json")) {
     return (data) => JSON.stringify(data);
   }
@@ -60,6 +119,15 @@ var service = axios.create({
 });
 service.interceptors.request.use(
   async (config) => {
+    const isFileUploadRequest = isFileUpload(config.data);
+    if (isFileUploadRequest) {
+      if (config.headers) {
+        delete config.headers["Content-Type"];
+        delete config.headers["content-type"];
+      }
+      config.transformRequest = void 0;
+      return config;
+    }
     const contentType = config.headers?.["Content-Type"] || config.headers?.["content-type"];
     if (!config.transformRequest && contentType) {
       const transformRequest = getTransformRequest(
@@ -72,9 +140,11 @@ service.interceptors.request.use(
       config.transformRequest = (data) => Qs.stringify(data);
     }
     if (config.method === "post" || config.method === "put" || config.method === "patch") {
-      const params = { ...config.data || {} };
-      filterEmptyKey(params, config.emptyParams ?? false);
-      config.data = params;
+      if (config.data && typeof config.data === "object" && !isFileUploadRequest) {
+        const params = { ...config.data || {} };
+        filterEmptyKey(params, config.emptyParams ?? false);
+        config.data = params;
+      }
     } else if (config.method === "get" || config.method === "delete") {
       if (!config.disableTimestamp) {
         config.params = {
@@ -158,19 +228,7 @@ service.interceptors.response.use(
       if (status === 401) {
         handle401Error(config, error);
       }
-      if (isAborted && config && !config._noAutoRetry) {
-        config._retryCount = config._retryCount || 0;
-        if (config._retryCount < 2) {
-          config._retryCount++;
-          console.debug(
-            `[request] aborted, retry attempt #${config._retryCount} -> ${config.url || ""}`
-          );
-          return new Promise((resolve) => setTimeout(resolve, 300)).then(
-            () => service.request(config)
-          );
-        }
-      }
-      if (!config?.hidden && !isAborted) {
+      if (!config?.hidden && !isAborted && status !== 401) {
         let friendly = messageText;
         if (status === 403) friendly = "No permission";
         else if (status === 502) friendly = "System is upgrading or unavailable";
@@ -196,7 +254,7 @@ service.json = function(url, params, config) {
   };
   return service.post(
     url,
-    Array.isArray(params) ? params : params,
+    params,
     newConfig
   );
 };
@@ -205,7 +263,13 @@ service.put = function(url, params, config) {
     headers: { "Content-Type": "application/json", ...config?.headers },
     ...config
   };
-  return service.put(url, Array.isArray(params) ? params : params, newConfig).then((res) => res);
+  const data = Array.isArray(params) ? params : params;
+  return service.request({
+    url,
+    method: "put",
+    data,
+    ...newConfig
+  }).then((res) => res);
 };
 service.arrayGet = function(url, config) {
   if (config) {
@@ -234,48 +298,6 @@ service.download = function(url, config = {}) {
     return service.post(url, params, newConfig).then(() => void 0);
   }
 };
-function convertRes2Blob(response) {
-  const contentDisposition = response.headers["content-disposition"];
-  let fileName = "file.xlsx";
-  if (contentDisposition) {
-    const rfc5987Match = contentDisposition.match(/filename\*=UTF-8''([^;]+)/i);
-    if (rfc5987Match) {
-      fileName = decodeURIComponent(rfc5987Match[1]);
-    } else {
-      const standardMatch = contentDisposition.match(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/i);
-      if (standardMatch) {
-        fileName = standardMatch[1];
-        fileName = fileName.replace(/^['"]|['"]$/g, "");
-        try {
-          fileName = decodeURIComponent(fileName);
-        } catch (e) {
-          try {
-            fileName = decodeURI(fileName);
-          } catch (e2) {
-          }
-        }
-      }
-    }
-    fileName = fileName.trim().replace(/^_+|_+$/g, "");
-  }
-  const blob = new Blob([response.data], { type: "application/vnd.ms-excel;charset=utf-8" });
-  if (typeof window.navigator.msSaveBlob !== "undefined") {
-    window.navigator.msSaveBlob(blob, fileName);
-  } else {
-    const blobURL = window.URL.createObjectURL(blob);
-    const tempLink = document.createElement("a");
-    tempLink.style.display = "none";
-    tempLink.href = blobURL;
-    tempLink.setAttribute("download", fileName);
-    if (typeof tempLink.download === "undefined") {
-      tempLink.setAttribute("target", "_blank");
-    }
-    document.body.appendChild(tempLink);
-    tempLink.click();
-    document.body.removeChild(tempLink);
-    window.URL.revokeObjectURL(blobURL);
-  }
-}
 var services_default = service;
 
 export { services_default as default, setServiceEventHandlers };