@base-web-kits/base-tools-web 1.1.18-alpha.1 → 1.2.0-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/async/index.d.ts +4 -0
- package/dist/async/index.d.ts.map +1 -1
- package/dist/base-tools-web.umd.global.js +19 -7
- package/dist/base-tools-web.umd.global.js.map +1 -1
- package/dist/index.cjs +19 -7
- package/dist/index.cjs.map +1 -1
- package/dist/index.js +19 -7
- package/dist/index.js.map +1 -1
- package/dist/network/request.d.ts +2 -2
- package/dist/network/request.d.ts.map +1 -1
- package/dist/storage/index.d.ts +1 -3
- package/dist/storage/index.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/web/async/index.ts +30 -4
- package/src/web/network/request.ts +8 -4
- package/src/web/storage/index.ts +1 -3
package/dist/async/index.d.ts
CHANGED
|
@@ -11,6 +11,10 @@ export type WebApiConfig<Res = any, Err = any> = {
|
|
|
11
11
|
toastError?: ((e: Err) => boolean | string) | boolean | string;
|
|
12
12
|
/** 是否显示日志, 默认 true */
|
|
13
13
|
showLog?: boolean;
|
|
14
|
+
/** 处理成功res, 如解密操作 (返回值在成功日志中输出'resFilter'字段) */
|
|
15
|
+
resFilter?: (res: Res) => Res;
|
|
16
|
+
/** 成功和失败时,额外输出的日志数据 (可覆盖内部log参数,如'name') */
|
|
17
|
+
logExtra?: Record<string, unknown>;
|
|
14
18
|
};
|
|
15
19
|
/**
|
|
16
20
|
* 拓展 web api, 使其支持loading,toast,log能力
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/web/async/index.ts"],"names":[],"mappings":"
|
|
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,gDAAgD;IAChD,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC;IAE9B,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"}
|
|
@@ -1953,7 +1953,7 @@ var baseToolsWeb = (() => {
|
|
|
1953
1953
|
const { isLog = true } = options.config;
|
|
1954
1954
|
if (!log || !isLog) return;
|
|
1955
1955
|
const { config, res, fromCache = false, startTime, status, e } = options;
|
|
1956
|
-
const { url, data, header, method,
|
|
1956
|
+
const { url, data, header, method, logExtra } = config;
|
|
1957
1957
|
const endTime = Date.now();
|
|
1958
1958
|
const fmt = "YYYY-MM-DD HH:mm:ss.SSS";
|
|
1959
1959
|
const info = __spreadValues({
|
|
@@ -1967,7 +1967,7 @@ var baseToolsWeb = (() => {
|
|
|
1967
1967
|
startTime: toDayjs(startTime).format(fmt),
|
|
1968
1968
|
endTime: toDayjs(endTime).format(fmt),
|
|
1969
1969
|
duration: endTime - startTime
|
|
1970
|
-
},
|
|
1970
|
+
}, logExtra);
|
|
1971
1971
|
if (status === "success") {
|
|
1972
1972
|
info.res = cloneDeep(res);
|
|
1973
1973
|
log("info", info);
|
|
@@ -2064,7 +2064,9 @@ var baseToolsWeb = (() => {
|
|
|
2064
2064
|
showLoading = false,
|
|
2065
2065
|
toastSuccess = false,
|
|
2066
2066
|
toastError = true,
|
|
2067
|
-
showLog = true
|
|
2067
|
+
showLog = true,
|
|
2068
|
+
resFilter,
|
|
2069
|
+
logExtra
|
|
2068
2070
|
} = finalConfig;
|
|
2069
2071
|
const {
|
|
2070
2072
|
log,
|
|
@@ -2080,13 +2082,23 @@ var baseToolsWeb = (() => {
|
|
|
2080
2082
|
return new Promise((resolve, reject) => {
|
|
2081
2083
|
webApi(option, finalConfig).then((res) => {
|
|
2082
2084
|
if (showLoading) hideLoadingFn == null ? void 0 : hideLoadingFn();
|
|
2083
|
-
|
|
2084
|
-
|
|
2085
|
-
|
|
2085
|
+
const finalRes = resFilter ? resFilter(res) : res;
|
|
2086
|
+
if (showLog) {
|
|
2087
|
+
const logData = __spreadValues({ name: fname, status: "success", option }, logExtra);
|
|
2088
|
+
if (resFilter) {
|
|
2089
|
+
logData.res = res;
|
|
2090
|
+
logData.resFilter = cloneDeep(finalRes);
|
|
2091
|
+
} else {
|
|
2092
|
+
logData.res = cloneDeep(res);
|
|
2093
|
+
}
|
|
2094
|
+
log == null ? void 0 : log("info", logData);
|
|
2095
|
+
}
|
|
2096
|
+
resolve(finalRes);
|
|
2097
|
+
const msg = typeof toastSuccess === "function" ? toastSuccess(finalRes) : toastSuccess;
|
|
2086
2098
|
if (msg) toast == null ? void 0 : toast({ msg, status: "success" });
|
|
2087
2099
|
}).catch((e) => {
|
|
2088
2100
|
if (showLoading) hideLoadingFn == null ? void 0 : hideLoadingFn();
|
|
2089
|
-
if (showLog) log == null ? void 0 : log("error", { name: fname, status: "fail", option, e });
|
|
2101
|
+
if (showLog) log == null ? void 0 : log("error", __spreadValues({ name: fname, status: "fail", option, e }, logExtra));
|
|
2090
2102
|
const msg = typeof toastError === "function" ? toastError(e) : toastError;
|
|
2091
2103
|
if (msg) {
|
|
2092
2104
|
toast == null ? void 0 : toast({
|