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

package/dist/config/index.d.ts

@@ -5,7 +5,9 @@ export type AppConfig = {
         status: 'success' | 'fail';
     }) => void;
     /** 显示全局 Loading */
-    showLoading?: () => void;
+    showLoading?: (option?: {
+        title?: string;
+    }) => void;
     /** 隐藏全局 Loading */
     hideLoading?: () => void;
     /** 跳转登录页的方法 */

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web/config/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG;IACtB,kBAAkB;IAClB,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACtE,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,eAAe;IACf,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa;IACb,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,EAAE,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CAC9E,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc;IACd,IAAI,EAAE,MAAM,CAAC;IAEb,cAAc;IACd,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAE5B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,cAAc;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,cAAc;IACd,CAAC,CAAC,EAAE,OAAO,CAAC;IAEZ,WAAW;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAIF;;GAEG;AACH,wBAAgB,kBAAkB,cAEjC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,QAEtD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web/config/index.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG;IACtB,kBAAkB;IAClB,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACtE,mBAAmB;IACnB,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACpD,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,eAAe;IACf,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,aAAa;IACb,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,EAAE,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CAC9E,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,cAAc;IACd,IAAI,EAAE,MAAM,CAAC;IAEb,cAAc;IACd,MAAM,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC;IAE5B,cAAc;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,cAAc;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,cAAc;IACd,CAAC,CAAC,EAAE,OAAO,CAAC;IAEZ,WAAW;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IAGd,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB,CAAC;AAIF;;GAEG;AACH,wBAAgB,kBAAkB,cAEjC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,SAAS,QAEtD"}

package/dist/index.cjs

@@ -79,6 +79,8 @@ __export(index_exports, {
   copyText: () => copyText,
   copyUrl: () => copyUrl,
   download: () => download,
+  filterRequestData: () => filterRequestData,
+  filterRequestHeader: () => filterRequestHeader,
   getBaseToolsConfig: () => getBaseToolsConfig,
   getBrowserName: () => getBrowserName,
   getBrowserVersion: () => getBrowserVersion,
@@ -118,6 +120,7 @@ __export(index_exports, {
   setCookie: () => setCookie,
   setLocalStorage: () => setLocalStorage,
   unlockBodyScroll: () => unlockBodyScroll,
+  uploadFile: () => uploadFile,
   windowScrollTo: () => windowScrollTo
 });
 module.exports = __toCommonJS(index_exports);
@@ -506,7 +509,7 @@ function unlockBodyScroll() {
   window.scrollTo(0, y);
 }
 
-// src/web/network/load.ts
+// src/web/network/download.ts
 function download(url, fileName = "") {
   return __async(this, null, function* () {
     if (!url) return;
@@ -777,6 +780,7 @@ var EventBus = class {
     return this;
   }
 };
+var EventBus_default = new EventBus();
 
 // src/ts/day/index.ts
 var import_dayjs = __toESM(require("dayjs"), 1);
@@ -1668,9 +1672,8 @@ function request(config) {
       const isGet = method === "GET";
       const isObjectData = (0, ts_exports.isPlainObject)(data);
       const isArrayData = !isObjectData && Array.isArray(data);
-      const fillData = isObjectData ? (0, ts_exports.pickBy)(data, (val) => val !== void 0) : data;
-      const emptyValue = [void 0, null, ""];
-      const fillHeader = header ? (0, ts_exports.pickBy)(header, (val) => !emptyValue.includes(val)) : {};
+      const fillData = isObjectData ? filterRequestData(data) : data;
+      const fillHeader = filterRequestHeader(header);
       const contentTypeKey = Object.keys(fillHeader).find(
         (k) => k.toLowerCase() === "content-type"
       );
@@ -1711,7 +1714,8 @@ function request(config) {
         }
       }
       const appConfig2 = getBaseToolsConfig();
-      if (showLoading) (_a = appConfig2.showLoading) == null ? void 0 : _a.call(appConfig2);
+      if (showLoading)
+        (_a = appConfig2.showLoading) == null ? void 0 : _a.call(appConfig2, typeof showLoading === "string" ? { title: showLoading } : {});
       let isTimeout = false;
       const timeoutId = setTimeout(() => {
         isTimeout = true;
@@ -1776,6 +1780,22 @@ function request(config) {
   promise.task = task;
   return promise;
 }
+function filterRequestData(data) {
+  const res = {};
+  Object.entries(data).forEach(([k, v]) => {
+    if (v !== void 0) res[k] = v;
+  });
+  return res;
+}
+function filterRequestHeader(header) {
+  const newHeader = {};
+  if (header) {
+    Object.entries(header).forEach(([k, v]) => {
+      if (v !== void 0 && v !== null && v !== "") newHeader[k] = String(v);
+    });
+  }
+  return newHeader;
+}
 function logRequestInfo(options) {
   const { log } = getBaseToolsConfig();
   const { isLog = true } = options.config;
@@ -1884,6 +1904,112 @@ function toFormData(data) {
   return formData;
 }
 
+// src/web/async/index.ts
+function enhanceWebApi(webApi, apiName) {
+  return (option, config) => {
+    const finalConfig = config || {};
+    const {
+      showLoading = false,
+      toastSuccess = false,
+      toastError = true,
+      showLog = true
+    } = finalConfig;
+    const {
+      log,
+      toast,
+      showLoading: showLoadingFn,
+      hideLoading: hideLoadingFn
+    } = getBaseToolsConfig();
+    const fname = apiName || "enhanceWebApi";
+    if (showLoading) {
+      const title = typeof showLoading === "string" ? showLoading : "";
+      showLoadingFn == null ? void 0 : showLoadingFn({ title });
+    }
+    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;
+        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 });
+        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)}`,
+            status: "fail"
+          });
+        }
+        reject(e);
+      });
+    });
+  };
+}
+
+// src/web/network/uploadFile.ts
+function upload(option, config) {
+  return new Promise((resolve, reject) => {
+    var _a;
+    const xhr = new XMLHttpRequest();
+    const { url, file, name = "file", header, formData, timeout = 0 } = option;
+    const fail = (error) => reject(error);
+    const success = (responseText) => {
+      try {
+        resolve(JSON.parse(responseText));
+      } catch (e) {
+        resolve(responseText);
+      }
+    };
+    let onProgressUpdate;
+    const task = {
+      onProgressUpdate: (callback) => {
+        onProgressUpdate = callback;
+      },
+      abort: () => xhr.abort()
+    };
+    (_a = config == null ? void 0 : config.onTaskReady) == null ? void 0 : _a.call(config, task);
+    xhr.upload.onprogress = (e) => {
+      if (!e.lengthComputable) return;
+      const ev = {
+        progress: Math.round(e.loaded / e.total * 100),
+        loaded: e.loaded,
+        total: e.total
+      };
+      onProgressUpdate == null ? void 0 : onProgressUpdate(ev);
+    };
+    xhr.onload = () => {
+      if (xhr.status >= 200 && xhr.status < 300) {
+        success(xhr.responseText);
+      } else {
+        fail({ message: `\u4E0A\u4F20\u5931\u8D25`, status: xhr.status });
+      }
+    };
+    xhr.onerror = () => fail({ message: "\u7F51\u7EDC\u9519\u8BEF", status: 0 });
+    xhr.ontimeout = () => fail({ message: "\u4E0A\u4F20\u8D85\u65F6", status: -1 });
+    xhr.onabort = () => fail({ message: "\u7528\u6237\u53D6\u6D88", status: -2 });
+    xhr.open("POST", url);
+    if (header) {
+      Object.entries(header).forEach(([k, v]) => {
+        if (v !== void 0 && v !== null && v !== "") xhr.setRequestHeader(k, String(v));
+      });
+    }
+    xhr.timeout = timeout;
+    const data = new FormData();
+    data.append(name, file);
+    if (formData) {
+      Object.entries(formData).forEach(([k, v]) => {
+        if (v !== void 0 && v !== null) data.append(k, String(v));
+      });
+    }
+    xhr.send(data);
+  });
+}
+function uploadFile(option, config) {
+  return enhanceWebApi(upload, "uploadFile")(option, config);
+}
+
 // src/web/storage/index.ts
 var WK = {
   val: "__l_val",
@@ -1960,6 +2086,8 @@ function getUrlParams(url = window.location.href) {
   copyText,
   copyUrl,
   download,
+  filterRequestData,
+  filterRequestHeader,
   getBaseToolsConfig,
   getBrowserName,
   getBrowserVersion,
@@ -1999,6 +2127,7 @@ function getUrlParams(url = window.location.href) {
   setCookie,
   setLocalStorage,
   unlockBodyScroll,
+  uploadFile,
   windowScrollTo
 });
 //# sourceMappingURL=index.cjs.map