@base-web-kits/base-tools-web 1.1.18-alpha.1 → 1.2.0

package/dist/async/index.d.ts

@@ -11,6 +11,10 @@ export type WebApiConfig<Res = any, Err = any> = {
     toastError?: ((e: Err) => boolean | string) | boolean | string;
     /** 是否显示日志, 默认 true */
     showLog?: boolean;
+    /** 成功响应数据的处理, 如解密操作 (返回值在成功日志中输出'resMap'字段) */
+    resMap?: (res: any) => Res;
+    /** 成功和失败时,额外输出的日志数据 (可覆盖内部log参数,如'name') */
+    logExtra?: Record<string, unknown>;
 };
 /**
  * 拓展 web api, 使其支持loading,toast,log能力

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web/async/index.ts"],"names":[],"mappings":"AAEA,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;CACnB,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,kBA+CjE"}
+{"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,+CAA+C;IAC/C,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"}

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

@@ -1002,10 +1002,10 @@ var baseToolsWeb = (() => {
         div.innerHTML = html;
         document.body.appendChild(div);
         const selection = window.getSelection();
-        const range = document.createRange();
-        range.selectNodeContents(div);
+        const range2 = document.createRange();
+        range2.selectNodeContents(div);
         selection == null ? void 0 : selection.removeAllRanges();
-        selection == null ? void 0 : selection.addRange(range);
+        selection == null ? void 0 : selection.addRange(range2);
         const ok = document.execCommand("copy");
         document.body.removeChild(div);
         selection == null ? void 0 : selection.removeAllRanges();
@@ -1349,22 +1349,22 @@ var baseToolsWeb = (() => {
     return (0, import_dayjs.default)(t, fmt);
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/predicate/isPrimitive.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/predicate/isPrimitive.mjs
   function isPrimitive(value) {
     return value == null || typeof value !== "object" && typeof value !== "function";
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/predicate/isTypedArray.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/predicate/isTypedArray.mjs
   function isTypedArray(x) {
     return ArrayBuffer.isView(x) && !(x instanceof DataView);
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/compat/_internal/getSymbols.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/compat/_internal/getSymbols.mjs
   function getSymbols(object) {
     return Object.getOwnPropertySymbols(object).filter((symbol) => Object.prototype.propertyIsEnumerable.call(object, symbol));
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/compat/_internal/getTag.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/compat/_internal/getTag.mjs
   function getTag(value) {
     if (value == null) {
       return value === void 0 ? "[object Undefined]" : "[object Null]";
@@ -1372,7 +1372,7 @@ var baseToolsWeb = (() => {
     return Object.prototype.toString.call(value);
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/compat/_internal/tags.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/compat/_internal/tags.mjs
   var regexpTag = "[object RegExp]";
   var stringTag = "[object String]";
   var numberTag = "[object Number]";
@@ -1396,7 +1396,7 @@ var baseToolsWeb = (() => {
   var float32ArrayTag = "[object Float32Array]";
   var float64ArrayTag = "[object Float64Array]";
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/object/cloneDeepWith.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/object/cloneDeepWith.mjs
   function cloneDeepWithImpl(valueToClone, keyToClone, objectToClone, stack = /* @__PURE__ */ new Map(), cloneValue = void 0) {
     const cloned = cloneValue == null ? void 0 : cloneValue(valueToClone, keyToClone, objectToClone, stack);
     if (cloned !== void 0) {
@@ -1558,12 +1558,12 @@ var baseToolsWeb = (() => {
     }
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/object/cloneDeep.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/object/cloneDeep.mjs
   function cloneDeep(obj) {
     return cloneDeepWithImpl(obj, void 0, obj, /* @__PURE__ */ new Map(), void 0);
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/predicate/isPlainObject.mjs
   function isPlainObject(value) {
     if (!value || typeof value !== "object") {
       return false;
@@ -1576,12 +1576,12 @@ var baseToolsWeb = (() => {
     return Object.prototype.toString.call(value) === "[object Object]";
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/_internal/isUnsafeProperty.mjs
   function isUnsafeProperty(key) {
     return key === "__proto__";
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/compat/_internal/isDeepKey.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/compat/_internal/isDeepKey.mjs
   function isDeepKey(key) {
     switch (typeof key) {
       case "number":
@@ -1594,7 +1594,7 @@ var baseToolsWeb = (() => {
     }
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/compat/_internal/toKey.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/compat/_internal/toKey.mjs
   function toKey(value) {
     var _a;
     if (typeof value === "string" || typeof value === "symbol") {
@@ -1606,7 +1606,7 @@ var baseToolsWeb = (() => {
     return String(value);
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/compat/util/toString.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/compat/util/toString.mjs
   function toString(value) {
     if (value == null) {
       return "";
@@ -1624,7 +1624,7 @@ var baseToolsWeb = (() => {
     return result;
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/compat/util/toPath.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/compat/util/toPath.mjs
   function toPath(deepKey) {
     if (Array.isArray(deepKey)) {
       return deepKey.map(toKey);
@@ -1691,7 +1691,7 @@ var baseToolsWeb = (() => {
     return result;
   }
 
-  // node_modules/.pnpm/es-toolkit@1.42.0/node_modules/es-toolkit/dist/compat/object/get.mjs
+  // node_modules/.pnpm/es-toolkit@1.44.0/node_modules/es-toolkit/dist/compat/object/get.mjs
   function get(object, path, defaultValue) {
     if (object == null) {
       return defaultValue;
@@ -1787,6 +1787,26 @@ var baseToolsWeb = (() => {
   // src/web/network/request.ts
   var requestCache = /* @__PURE__ */ new Map();
   function request(config) {
+    const {
+      url,
+      data,
+      header,
+      method = "GET",
+      resKey,
+      msgKey,
+      codeKey,
+      successKey,
+      successCode,
+      reloginCode,
+      showLoading = true,
+      toastError = true,
+      enableChunked = false,
+      cacheTime,
+      resMap,
+      responseType = "json",
+      timeout: timeout2 = 6e4,
+      onTaskReady
+    } = config;
     const controller = new AbortController();
     const signal = controller.signal;
     let chunkCallback = null;
@@ -1799,28 +1819,10 @@ var baseToolsWeb = (() => {
         chunkCallback = null;
       }
     };
-    const promise = new Promise((resolve, reject) => {
+    onTaskReady == null ? void 0 : onTaskReady(task);
+    return new Promise((resolve, reject) => {
       const execute = () => __async(null, null, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        const {
-          url,
-          data,
-          header,
-          method = "GET",
-          resKey,
-          msgKey,
-          codeKey,
-          successKey,
-          successCode,
-          reloginCode,
-          showLoading = true,
-          toastError = true,
-          enableChunked = false,
-          cacheTime,
-          responseInterceptor,
-          responseType = "json",
-          timeout = 6e4
-        } = config;
         const isGet = method === "GET";
         const isObjectData = isPlainObject(data);
         const isArrayData = !isObjectData && Array.isArray(data);
@@ -1872,7 +1874,7 @@ var baseToolsWeb = (() => {
         const timeoutId = setTimeout(() => {
           isTimeout = true;
           controller.abort();
-        }, timeout);
+        }, timeout2);
         try {
           const response = yield fetch(fillUrl, {
             method,
@@ -1893,7 +1895,7 @@ var baseToolsWeb = (() => {
           }
           const resData = yield parseResponse(response, responseType);
           if (showLoading) (_d = appConfig2.hideLoading) == null ? void 0 : _d.call(appConfig2);
-          const res = responseInterceptor ? responseInterceptor(resData) : resData;
+          const res = resMap ? resMap(resData) : resData;
           const code = getObjectValue(res, codeKey);
           const scode = successKey ? getObjectValue(res, successKey) : code;
           const msg = getObjectValue(res, msgKey);
@@ -1929,8 +1931,6 @@ var baseToolsWeb = (() => {
       });
       execute();
     });
-    promise.task = task;
-    return promise;
   }
   function filterRequestData(data) {
     const res = {};
@@ -1950,10 +1950,10 @@ var baseToolsWeb = (() => {
   }
   function logRequestInfo(options) {
     const { log } = getBaseToolsConfig();
-    const { isLog = true } = options.config;
-    if (!log || !isLog) return;
+    const { showLog = true } = options.config;
+    if (!log || !showLog) return;
     const { config, res, fromCache = false, startTime, status, e } = options;
-    const { url, data, header, method, extraLog } = config;
+    const { url, data, header, method, logExtra } = config;
     const endTime = Date.now();
     const fmt = "YYYY-MM-DD HH:mm:ss.SSS";
     const info = __spreadValues({
@@ -1967,7 +1967,7 @@ var baseToolsWeb = (() => {
       startTime: toDayjs(startTime).format(fmt),
       endTime: toDayjs(endTime).format(fmt),
       duration: endTime - startTime
-    }, extraLog);
+    }, logExtra);
     if (status === "success") {
       info.res = cloneDeep(res);
       log("info", info);
@@ -2064,7 +2064,9 @@ var baseToolsWeb = (() => {
         showLoading = false,
         toastSuccess = false,
         toastError = true,
-        showLog = true
+        showLog = true,
+        resMap,
+        logExtra
       } = finalConfig;
       const {
         log,
@@ -2080,13 +2082,23 @@ var baseToolsWeb = (() => {
       return new Promise((resolve, reject) => {
         webApi(option, finalConfig).then((res) => {
           if (showLoading) hideLoadingFn == null ? void 0 : hideLoadingFn();
-          if (showLog) log == null ? void 0 : log("info", { name: fname, status: "success", option, res });
-          resolve(res);
-          const msg = typeof toastSuccess === "function" ? toastSuccess(res) : toastSuccess;
+          const finalRes = resMap ? resMap(res) : res;
+          if (showLog) {
+            const logData = __spreadValues({ name: fname, status: "success", option }, logExtra);
+            if (resMap) {
+              logData.res = res;
+              logData.resMap = cloneDeep(finalRes);
+            } else {
+              logData.res = cloneDeep(res);
+            }
+            log == null ? void 0 : log("info", logData);
+          }
+          resolve(finalRes);
+          const msg = typeof toastSuccess === "function" ? toastSuccess(finalRes) : toastSuccess;
           if (msg) toast == null ? void 0 : toast({ msg, status: "success" });
         }).catch((e) => {
           if (showLoading) hideLoadingFn == null ? void 0 : hideLoadingFn();
-          if (showLog) log == null ? void 0 : log("error", { name: fname, status: "fail", option, e });
+          if (showLog) log == null ? void 0 : log("error", __spreadValues({ name: fname, status: "fail", option, e }, logExtra));
           const msg = typeof toastError === "function" ? toastError(e) : toastError;
           if (msg) {
             toast == null ? void 0 : toast({
@@ -2105,7 +2117,7 @@ var baseToolsWeb = (() => {
     return new Promise((resolve, reject) => {
       var _a;
       const xhr = new XMLHttpRequest();
-      const { url, file, name = "file", header, formData, timeout = 0 } = option;
+      const { url, file, name = "file", header, formData, timeout: timeout2 = 0 } = option;
       const fail = (error) => reject(error);
       const success = (responseText) => {
         try {
@@ -2147,7 +2159,7 @@ var baseToolsWeb = (() => {
           if (v !== void 0 && v !== null && v !== "") xhr.setRequestHeader(k, String(v));
         });
       }
-      xhr.timeout = timeout;
+      xhr.timeout = timeout2;
       const data = new FormData();
       data.append(name, file);
       if (formData) {