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

package/dist/index.cjs

@@ -2046,7 +2046,8 @@ function request(config) {
     toastError = true,
     enableChunked = false,
     cacheTime,
-    resMap,
+    transformRequest,
+    transformResponse,
     responseType = "json",
     timeout = 6e4,
     onTaskReady,
@@ -2066,18 +2067,34 @@ function request(config) {
     const execute = () => __async(null, null, function* () {
       var _a, _b, _c, _d, _e, _f, _g, _h, _i;
       const isGet = method === "GET";
-      const isObjectData = isPlainObject(data);
-      const isArrayData = !isObjectData && Array.isArray(data);
-      const fillData = isObjectData ? filterRequestData(data) : data;
-      const fillHeader = filterRequestHeader(header);
+      let fillData = isPlainObject(data) ? filterRequestData(data) : data;
+      let fillHeader = filterRequestHeader(header);
+      let fillUrl = url;
+      const requestTransformer = transformRequest;
+      if (requestTransformer) {
+        const transformed = (yield requestTransformer({
+          url: fillUrl,
+          method,
+          header: __spreadValues({}, fillHeader),
+          data: fillData
+        })) || {};
+        if (transformed.url !== void 0) fillUrl = transformed.url;
+        if (transformed.header !== void 0) fillHeader = filterRequestHeader(transformed.header);
+        if (transformed.data !== void 0) {
+          const transformedData = transformed.data;
+          fillData = isPlainObject(transformedData) ? filterRequestData(transformedData) : transformedData;
+        }
+      }
       const contentTypeKey = Object.keys(fillHeader).find(
         (k) => k.toLowerCase() === "content-type"
       );
       const contentType = contentTypeKey ? String(fillHeader[contentTypeKey]).toLowerCase() : "";
+      const isObjectData = isPlainObject(fillData);
+      const isArrayData = !isObjectData && Array.isArray(fillData);
       if (!isGet && fillData && (isObjectData || isArrayData) && !contentType) {
         fillHeader["Content-Type"] = "application/json";
       }
-      const fillUrl = isGet && isObjectData ? appendUrlParam(url, fillData) : url;
+      fillUrl = isGet && isPlainObject(fillData) ? appendUrlParam(fillUrl, fillData) : fillUrl;
       let fillBody;
       if (!isGet && fillData) {
         if (isObjectData && contentType.includes("application/x-www-form-urlencoded")) {
@@ -2148,7 +2165,7 @@ function request(config) {
         }
         const resData = yield parseResponse(response, responseType);
         if (showLoading) (_d = appConfig2.hideLoading) == null ? void 0 : _d.call(appConfig2);
-        const res = resMap ? resMap(resData) : resData;
+        const res = transformResponse ? transformResponse(resData) : resData;
         const code = getObjectValue(res, codeKey);
         const scode = successKey ? getObjectValue(res, successKey) : code;
         const msg = getObjectValue(res, msgKey);
@@ -2177,7 +2194,10 @@ function request(config) {
           return;
         }
         if (!isAbortError && toastError)
-          (_i = appConfig2.toast) == null ? void 0 : _i.call(appConfig2, { status, msg: `\u8BF7\u6C42\u5931\u8D25,${JSON.stringify(e)}` });
+          (_i = appConfig2.toast) == null ? void 0 : _i.call(appConfig2, {
+            status,
+            msg: `\u8BF7\u6C42\u5931\u8D25: ${e instanceof Error ? e.message : JSON.stringify(e)}`
+          });
         logRequestInfo({ status, config: logConfig, startTime, e });
         reject(e);
       } finally {
@@ -2336,7 +2356,7 @@ function enhanceWebApi(webApi, apiName) {
       toastSuccess = false,
       toastError = true,
       showLog = true,
-      resMap,
+      transformResponse,
       logExtra
     } = finalConfig;
     const {
@@ -2353,12 +2373,12 @@ function enhanceWebApi(webApi, apiName) {
     return new Promise((resolve, reject) => {
       webApi(option, finalConfig).then((res) => {
         if (showLoading) hideLoadingFn == null ? void 0 : hideLoadingFn();
-        const finalRes = resMap ? resMap(res) : res;
+        const finalRes = transformResponse ? transformResponse(res) : res;
         if (showLog) {
           const logData = __spreadValues({ name: fname, status: "success", option }, logExtra);
-          if (resMap) {
+          if (transformResponse) {
             logData.res = res;
-            logData.resMap = cloneDeep(finalRes);
+            logData.transformResponse = cloneDeep(finalRes);
           } else {
             logData.res = cloneDeep(res);
           }
@@ -2373,7 +2393,7 @@ function enhanceWebApi(webApi, apiName) {
         const msg = typeof toastError === "function" ? toastError(e) : toastError;
         if (msg) {
           toast == null ? void 0 : toast({
-            msg: typeof msg === "string" ? msg : `${fname} fail: ${JSON.stringify(e)}`,
+            msg: typeof msg === "string" ? msg : `${fname} fail: ${e instanceof Error ? e.message : JSON.stringify(e)}`,
             status: "fail"
           });
         }