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

package/dist/index.js

@@ -1732,7 +1732,7 @@ function logRequestInfo(options) {
   const { isLog = true } = options.config;
   if (!log || !isLog) 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({
@@ -1746,7 +1746,7 @@ function logRequestInfo(options) {
     startTime: toDayjs(startTime).format(fmt),
     endTime: toDayjs(endTime).format(fmt),
     duration: endTime - startTime
-  }, extraLog);
+  }, logExtra);
   if (status === "success") {
     info.res = (0, ts_exports.cloneDeep)(res);
     log("info", info);
@@ -1836,14 +1836,16 @@ function toFormData(data) {
 }
 
 // src/web/async/index.ts
-function promisifyWebApi(webApi, apiName) {
+function enhanceWebApi(webApi, apiName) {
   return (option, config) => {
     const finalConfig = config || {};
     const {
       showLoading = false,
       toastSuccess = false,
       toastError = true,
-      showLog = true
+      showLog = true,
+      resFilter,
+      logExtra
     } = finalConfig;
     const {
       log,
@@ -1851,7 +1853,7 @@ function promisifyWebApi(webApi, apiName) {
       showLoading: showLoadingFn,
       hideLoading: hideLoadingFn
     } = getBaseToolsConfig();
-    const fname = apiName || "promisifyWebApi";
+    const fname = apiName || "enhanceWebApi";
     if (showLoading) {
       const title = typeof showLoading === "string" ? showLoading : "";
       showLoadingFn == null ? void 0 : showLoadingFn({ title });
@@ -1859,13 +1861,23 @@ function promisifyWebApi(webApi, apiName) {
     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 = resFilter ? resFilter(res) : res;
+        if (showLog) {
+          const logData = __spreadValues({ name: fname, status: "success", option }, logExtra);
+          if (resFilter) {
+            logData.res = res;
+            logData.resFilter = (0, ts_exports.cloneDeep)(finalRes);
+          } else {
+            logData.res = (0, ts_exports.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({
@@ -1931,17 +1943,14 @@ function upload(option, config) {
     data.append(name, file);
     if (formData) {
       Object.entries(formData).forEach(([k, v]) => {
-        if (v !== void 0) data.append(k, String(v));
+        if (v !== void 0 && v !== null) data.append(k, String(v));
       });
     }
     xhr.send(data);
   });
 }
 function uploadFile(option, config) {
-  return promisifyWebApi(upload, "uploadFile")(
-    option,
-    config
-  );
+  return enhanceWebApi(upload, "uploadFile")(option, config);
 }
 
 // src/web/storage/index.ts