@base-web-kits/base-tools-web 1.4.2 → 1.4.5

package/dist/index.d.cts

@@ -566,6 +566,8 @@ type UploadFileOption = {
     data?: Record<string, string | number>;
     /** 超时时间，单位 ms，默认 0（不超时） */
     timeout?: number;
+    /** 响应类型, 默认'text' */
+    responseType?: 'text' | 'json';
 };
 type OnUploadProgressUpdate = (res: UploadProgressEvent) => void;
 type UploadProgressEvent = {
@@ -589,6 +591,7 @@ type UploadConfig = {
 type UploadFail = {
     message: string;
     status: number;
+    data?: unknown;
 };
 /**
  * 上传文件
@@ -604,10 +607,13 @@ type UploadFail = {
  *     task.onProgressUpdate((res) => console.log('上传进度:', res.progress)),
  * });
  *
+ * // 直接返回json对象
+ * const json = await uploadFile({ url: 'https://xx', file: file, responseType: 'json' });
+ *
  * // 解析上传结果
  * console.log('uploadFile ok', JSON.parse(res));
  */
-declare function uploadFile(option: UploadFileOption, config?: UploadConfig & WebApiConfig): Promise<string>;
+declare function uploadFile<T = string>(option: UploadFileOption, config?: UploadConfig & WebApiConfig<T, UploadFail>): Promise<T>;
 
 /**
  * 写入 localStorage（自动 JSON 序列化）

package/dist/index.mjs

@@ -2341,13 +2341,39 @@ function enhanceWebApi(webApi, apiName) {
 }
 
 // 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;
     const xhr = new XMLHttpRequest();
-    const { url, file, name = "file", header, data, timeout = 0 } = option;
+    const { url, file, name = "file", header, data, timeout = 0, responseType = "text" } = option;
     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;
@@ -2368,10 +2394,15 @@ function upload(option, config) {
       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 });
@@ -2395,7 +2426,10 @@ function upload(option, config) {
   });
 }
 function uploadFile(option, config) {
-  return enhanceWebApi(upload, "uploadFile")(option, config);
+  return enhanceWebApi(
+    upload,
+    "uploadFile"
+  )(option, config);
 }
 
 // src/web/storage/index.ts