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

package/dist/async/index.d.ts

@@ -11,8 +11,8 @@ export type WebApiConfig<Res = any, Err = any> = {
     toastError?: ((e: Err) => boolean | string) | boolean | string;
     /** 是否显示日志, 默认 true */
     showLog?: boolean;
-    /** 响应数据的转换, 如解密操作 (返回值在成功日志中输出'resMap'字段) */
-    resMap?: (res: any) => Res;
+    /** 响应数据的转换, 如解密操作 (返回值在成功日志中输出'transformResponse'字段) */
+    transformResponse?: (res: any) => Res;
     /** 成功和失败时,额外输出的日志数据 (可覆盖内部log参数,如'name') */
     logExtra?: Record<string, unknown>;
 };

package/dist/async/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web/async/index.ts"],"names":[],"mappings":"AAIA,KAAK,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,CACnD,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,KACZ,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI;IAC/C,wCAAwC;IACxC,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE/B,0BAA0B;IAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,KAAK,GAAG,MAAM,CAAC,GAAG,KAAK,GAAG,MAAM,CAAC;IAE/D,wGAAwG;IACxG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,OAAO,GAAG,MAAM,CAAC,GAAG,OAAO,GAAG,MAAM,CAAC;IAE/D,sBAAsB;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,6CAA6C;IAC7C,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC;IAE3B,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,EAC5E,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EACnC,OAAO,CAAC,EAAE,MAAM,IAER,QAAQ,MAAM,EAAE,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,kBAiEjE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web/async/index.ts"],"names":[],"mappings":"AAIA,KAAK,MAAM,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,IAAI,CACnD,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,KACZ,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,IAAI;IAC/C,wCAAwC;IACxC,WAAW,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAE/B,0BAA0B;IAC1B,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,KAAK,GAAG,MAAM,CAAC,GAAG,KAAK,GAAG,MAAM,CAAC;IAE/D,wGAAwG;IACxG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,OAAO,GAAG,MAAM,CAAC,GAAG,OAAO,GAAG,MAAM,CAAC;IAE/D,sBAAsB;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,wDAAwD;IACxD,iBAAiB,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC;IAEtC,4CAA4C;IAC5C,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,MAAM,GAAG,GAAG,EAC5E,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EACnC,OAAO,CAAC,EAAE,MAAM,IAER,QAAQ,MAAM,EAAE,SAAS,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,MAAM,kBAiEjE"}

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

@@ -2046,7 +2046,8 @@ var baseToolsWeb = (() => {
       toastError = true,
       enableChunked = false,
       cacheTime,
-      resMap,
+      transformRequest,
+      transformResponse,
       responseType = "json",
       timeout = 6e4,
       onTaskReady,
@@ -2066,18 +2067,34 @@ var baseToolsWeb = (() => {
       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 @@ var baseToolsWeb = (() => {
           }
           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);
@@ -2336,7 +2353,7 @@ var baseToolsWeb = (() => {
         toastSuccess = false,
         toastError = true,
         showLog = true,
-        resMap,
+        transformResponse,
         logExtra
       } = finalConfig;
       const {
@@ -2353,12 +2370,12 @@ var baseToolsWeb = (() => {
       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);
             }