@base-web-kits/base-tools-web 1.4.1 → 1.4.3

package/dist/base-tools-web.umd.global.js

@@ -2404,13 +2404,40 @@ var baseToolsWeb = (() => {
   }
 
   // src/web/network/uploadFile.ts
+  function parseJsonSafe(text) {
+    try {
+      return JSON.parse(text);
+    } catch (e) {
+      return null;
+    }
+  }
+  function getErrorMessage(responseText, fallback) {
+    const parsed = parseJsonSafe(responseText);
+    if (parsed && typeof parsed === "object" && "message" in parsed) {
+      const message = parsed.message;
+      if (typeof message === "string" && message.trim()) {
+        return message;
+      }
+    }
+    return fallback;
+  }
   function upload(option, config) {
     return new Promise((resolve, reject) => {
-      var _a;
+      var _a, _b;
       const xhr = new XMLHttpRequest();
       const { url, file, name = "file", header, data, timeout = 0 } = option;
+      const responseType = (_a = config == null ? void 0 : config.responseType) != null ? _a : "text";
       const fail = (error) => reject(error);
       const success = (responseText) => {
+        if (responseType === "json") {
+          const parsed = parseJsonSafe(responseText);
+          if (parsed === null) {
+            fail({ message: "\u54CD\u5E94\u4E0D\u662F\u5408\u6CD5 JSON", status: xhr.status });
+            return;
+          }
+          resolve(parsed);
+          return;
+        }
         resolve(responseText);
       };
       let onProgressUpdate;
@@ -2420,7 +2447,7 @@ var baseToolsWeb = (() => {
         },
         abort: () => xhr.abort()
       };
-      (_a = config == null ? void 0 : config.onTaskReady) == null ? void 0 : _a.call(config, task);
+      (_b = config == null ? void 0 : config.onTaskReady) == null ? void 0 : _b.call(config, task);
       xhr.upload.onprogress = (e) => {
         if (!e.lengthComputable) return;
         const ev = {
@@ -2431,10 +2458,15 @@ var baseToolsWeb = (() => {
         onProgressUpdate == null ? void 0 : onProgressUpdate(ev);
       };
       xhr.onload = () => {
+        const responseText = xhr.responseText || "";
         if (xhr.status >= 200 && xhr.status < 300) {
-          success(xhr.responseText);
+          success(responseText);
         } else {
-          fail({ message: `\u4E0A\u4F20\u5931\u8D25`, status: xhr.status });
+          fail({
+            message: getErrorMessage(responseText, "\u4E0A\u4F20\u5931\u8D25"),
+            status: xhr.status,
+            data: parseJsonSafe(responseText)
+          });
         }
       };
       xhr.onerror = () => fail({ message: "\u7F51\u7EDC\u9519\u8BEF", status: 0 });
@@ -2458,7 +2490,10 @@ var baseToolsWeb = (() => {
     });
   }
   function uploadFile(option, config) {
-    return enhanceWebApi(upload, "uploadFile")(option, config);
+    return enhanceWebApi(
+      upload,
+      "uploadFile"
+    )(option, config);
   }
 
   // src/web/storage/index.ts