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

package/dist/index.d.cts

@@ -585,10 +585,13 @@ type UploadTask = {
 type UploadConfig = {
     /** 获取task对象 */
     onTaskReady?: (task: UploadTask) => void;
+    /** 响应类型, 默认'text' */
+    responseType?: 'text' | 'json';
 };
 type UploadFail = {
     message: string;
     status: number;
+    data?: unknown;
 };
 /**
  * 上传文件
@@ -604,10 +607,14 @@ 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(option: UploadFileOption, config?: UploadConfig & WebApiConfig<string, UploadFail>): Promise<string>;
+declare function uploadFile<T = unknown>(option: UploadFileOption, config?: UploadConfig & WebApiConfig<T, UploadFail>): Promise<T>;
 
 /**
  * 写入 localStorage（自动 JSON 序列化）

package/dist/index.mjs

@@ -2341,13 +2341,40 @@ 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;
+    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;
@@ -2357,7 +2384,7 @@ function upload(option, config) {
       },
       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 = {
@@ -2368,10 +2395,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 +2427,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