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

package/dist/network/uploadFile.d.ts

@@ -53,5 +53,5 @@ export type UploadFail = {
  *     task.onProgressUpdate((res) => console.log('上传进度:', res.progress)),
  * });
  */
-export declare function uploadFile<T = any>(option: UploadFileOption, config?: UploadConfig & WebApiConfig<T, UploadFail>): Promise<T>;
+export declare function uploadFile(option: UploadFileOption, config?: UploadConfig & WebApiConfig): Promise<any>;
 //# sourceMappingURL=uploadFile.d.ts.map

package/dist/network/uploadFile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../src/web/network/uploadFile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa;IACb,GAAG,EAAE,MAAM,CAAC;IAEZ,eAAe;IACf,IAAI,EAAE,IAAI,CAAC;IAEX,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,UAAU;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAEzC,oBAAoB;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAE3C,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,GAAG,EAAE,mBAAmB,KAAK,IAAI,CAAC;AAExE,MAAM,MAAM,mBAAmB,GAAG;IAChC,qBAAqB;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW;IACX,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,WAAW;IACX,gBAAgB,EAAE,CAAC,QAAQ,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC7D,WAAW;IACX,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe;IACf,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6EF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,UAAU,CAAC,CAAC,GAAG,GAAG,EAChC,MAAM,EAAE,gBAAgB,EACxB,MAAM,CAAC,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC,EAAE,UAAU,CAAC,cAMpD"}
+{"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../src/web/network/uploadFile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,aAAa;IACb,GAAG,EAAE,MAAM,CAAC;IAEZ,eAAe;IACf,IAAI,EAAE,IAAI,CAAC;IAEX,mDAAmD;IACnD,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,UAAU;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAEzC,oBAAoB;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC;IAE3C,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,GAAG,EAAE,mBAAmB,KAAK,IAAI,CAAC;AAExE,MAAM,MAAM,mBAAmB,GAAG;IAChC,qBAAqB;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa;IACb,MAAM,EAAE,MAAM,CAAC;IACf,WAAW;IACX,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,WAAW;IACX,gBAAgB,EAAE,CAAC,QAAQ,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC7D,WAAW;IACX,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe;IACf,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AA6EF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,EAAE,YAAY,GAAG,YAAY,gBAExF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base-web-kits/base-tools-web",
-  "version": "1.1.18-alpha.0",
+  "version": "1.1.18-alpha.1",
   "sideEffects": false,
   "description": "Independent Web utilities package built from src/web.",
   "keywords": [

package/src/web/async/index.ts

@@ -1,11 +1,14 @@
 import { getBaseToolsConfig } from '../index';
 
-type WebApi<Option, Res, Config = unknown> = (option: Option, config?: Config) => Promise<Res>;
+type WebApi<Option = any, Res = any, Config = any> = (
+  option: Option,
+  config?: Config,
+) => Promise<Res>;
 
 /**
  * web api 的调用配置
  */
-export type WebApiConfig<Res, Err> = {
+export type WebApiConfig<Res = any, Err = any> = {
   /** 是否显示加载提示, 默认 false. (支持字符串,自定义文本) */
   showLoading?: boolean | string;
 
@@ -20,15 +23,15 @@ export type WebApiConfig<Res, Err> = {
 };
 
 /**
- * 拓展 web api, 使其支持loading,toast,log,任务对象等能力
+ * 拓展 web api, 使其支持loading,toast,log能力
  * @param webApi web api
- * @param apiName web api 名称 (可选, 用于日志输出, 默认'promisifyWebApi')
+ * @param apiName web api 名称 (可选, 用于日志输出, 默认'enhanceWebApi')
  * @return 注入拓展能力的promise (默认提示异常和输出日志,不显示进度条和操作成功)
  * @example
- * const promise = promisifyWebApi(downloadFile, 'downloadFile');
+ * const promise = enhanceWebApi(downloadFile, 'downloadFile');
  * await promise({ url: 'xx' }, {showLoading: '下载中', toastSuccess: '下载成功'});
  */
-export function promisifyWebApi<Option, Res, Err, Config = unknown>(
+export function enhanceWebApi<Option = any, Res = any, Err = any, Config = any>(
   webApi: WebApi<Option, Res, Config>,
   apiName?: string,
 ) {
@@ -46,7 +49,7 @@ export function promisifyWebApi<Option, Res, Err, Config = unknown>(
       showLoading: showLoadingFn,
       hideLoading: hideLoadingFn,
     } = getBaseToolsConfig();
-    const fname = apiName || 'promisifyWebApi'; // webApi.name经过打包后取不到原函数名，不如默认'promisifyWebApi'
+    const fname = apiName || 'enhanceWebApi'; // webApi.name经过打包后取不到原函数名，不如默认'enhanceWebApi'
 
     if (showLoading) {
       const title = typeof showLoading === 'string' ? showLoading : '';

package/src/web/network/uploadFile.ts

@@ -1,4 +1,4 @@
-import { promisifyWebApi } from '../async';
+import { enhanceWebApi } from '../async';
 import type { WebApiConfig } from '../async';
 
 /**
@@ -118,7 +118,7 @@ function upload<T>(option: UploadFileOption, config?: UploadConfig) {
     data.append(name, file);
     if (formData) {
       Object.entries(formData).forEach(([k, v]) => {
-        if (v !== undefined) data.append(k, String(v));
+        if (v !== undefined && v !== null) data.append(k, String(v));
       });
     }
 
@@ -141,12 +141,6 @@ function upload<T>(option: UploadFileOption, config?: UploadConfig) {
  *     task.onProgressUpdate((res) => console.log('上传进度:', res.progress)),
  * });
  */
-export function uploadFile<T = any>(
-  option: UploadFileOption,
-  config?: UploadConfig & WebApiConfig<T, UploadFail>,
-) {
-  return promisifyWebApi<UploadFileOption, T, UploadFail, UploadConfig>(upload, 'uploadFile')(
-    option,
-    config,
-  );
+export function uploadFile(option: UploadFileOption, config?: UploadConfig & WebApiConfig) {
+  return enhanceWebApi(upload, 'uploadFile')(option, config);
 }