@indfnd/utils 0.1.27 → 0.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indfnd/utils",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "author": "huxuetong",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/utils/request/index.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import type { AxiosExtendsInstance } from './axios.extends'
-import { requestInterceptors, responseInterceptors, inspectorError } from './interceptors'
+import { inspectorError, requestInterceptors, responseInterceptors } from './interceptors'
 import { CONTENT_TYPE, setContentType } from './content-type'
 
 export * from './url-params'
@@ -21,9 +21,10 @@ instance.formPost = function (url, data, config) {
  * 即上一次发起的网络请求将调用浏览器取消网络请求
  * 注意：如果serviceApi是多个组件共同使用时，需要慎重使用本方法，避免导致由于请求被取消导致的功能异常
  * @param {Function} api - 需要封装的API函数
+ * @param {boolean} isPost - 是否是post请求
  * @returns {Function} 封装后可取消的api
  */
-export const wrapApi = (api) => {
+export const wrapApi = (api, isPost = false) => {
   // 每个函数都有自己的 controller，避免互相干扰
   let currentController = null
 
@@ -43,10 +44,13 @@ export const wrapApi = (api) => {
     const newArgs = [...args]
     const lastIndex = newArgs.length - 1
 
+    // 如果isPost是true，如果参数只有一个和两个，需要新增config参数，如果参数有三个，需要往最后一个参数增加signal
+    // 如果isPost是false，如果参数只有一个，需要新增config参数，如果参数有个，需要往最后一个参数增加signal
+
     try {
       // 处理配置参数
       if (
-        newArgs.length > 0 &&
+        (isPost ? lastIndex > 1 : lastIndex > 0) &&
         typeof newArgs[lastIndex] === 'object' &&
         !Array.isArray(newArgs[lastIndex])
       ) {
@@ -81,6 +85,9 @@ export const wrapApi = (api) => {
             signal: controller.signal,
           }
         }
+      } else if (isPost && lastIndex === 0) {
+        // 没有配置对象且没有data，添加一个
+        newArgs.push(null, { signal: controller.signal })
       } else {
         // 没有配置对象，添加一个
         newArgs.push({ signal: controller.signal })
@@ -129,8 +136,9 @@ export const wrapApi = (api) => {
 }
 
 // 对axios进行封装，返回单例模式的Api
+
 instance.getSingleton = wrapApi(instance.get)
-instance.postSingleton = wrapApi(instance.post)
-instance.formPostSingleton = wrapApi(instance.formPost)
+instance.postSingleton = wrapApi(instance.post, true)
+instance.formPostSingleton = wrapApi(instance.formPost, true)
 
 export { instance as axios }

package/types/api/com.d.ts

@@ -1,2 +1,2 @@
-export declare function listComTreeApi(params: any): Promise<import('axios').AxiosResponse<any>>
-//# sourceMappingURL=com.d.ts.map
+export declare function listComTreeApi(params: any): Promise<import("axios").AxiosResponse<any, any>>;
+//# sourceMappingURL=com.d.ts.map

package/types/api/com.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"com.d.ts","sourceRoot":"","sources":["../../src/api/com.ts"],"names":[],"mappings":"AAKA,wBAAgB,cAAc,CAAC,MAAM,KAAA,+CAKpC"}
+{"version":3,"file":"com.d.ts","sourceRoot":"","sources":["../../src/api/com.ts"],"names":[],"mappings":"AAKA,wBAAgB,cAAc,CAAC,MAAM,KAAA,oDAKpC"}

package/types/api/index-desc.d.ts

@@ -1,2 +1,2 @@
-export declare function listIndexDescApi(params: any): Promise<import('axios').AxiosResponse<any>>
-//# sourceMappingURL=index-desc.d.ts.map
+export declare function listIndexDescApi(params: any): Promise<import("axios").AxiosResponse<any, any>>;
+//# sourceMappingURL=index-desc.d.ts.map

package/types/api/index-desc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index-desc.d.ts","sourceRoot":"","sources":["../../src/api/index-desc.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,CAAC,MAAM,KAAA,+CAEtC"}
+{"version":3,"file":"index-desc.d.ts","sourceRoot":"","sources":["../../src/api/index-desc.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,CAAC,MAAM,KAAA,oDAEtC"}

package/types/api/item.d.ts

@@ -1,4 +1,4 @@
-export declare function listItemTreeApi(params: any): Promise<import('axios').AxiosResponse<any>>
-export declare function getPriceInfo(): Promise<import('axios').AxiosResponse<any>>
-export declare function getItem(params: any): Promise<import('axios').AxiosResponse<any>>
-//# sourceMappingURL=item.d.ts.map
+export declare function listItemTreeApi(params: any): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getPriceInfo(): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getItem(params: any): Promise<import("axios").AxiosResponse<any, any>>;
+//# sourceMappingURL=item.d.ts.map

package/types/api/item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../src/api/item.ts"],"names":[],"mappings":"AAKA,wBAAgB,eAAe,CAAC,MAAM,KAAA,+CAOrC;AACD,wBAAgB,YAAY,gDAE3B;AACD,wBAAgB,OAAO,CAAC,MAAM,KAAA,+CAE7B"}
+{"version":3,"file":"item.d.ts","sourceRoot":"","sources":["../../src/api/item.ts"],"names":[],"mappings":"AAKA,wBAAgB,eAAe,CAAC,MAAM,KAAA,oDAOrC;AACD,wBAAgB,YAAY,qDAE3B;AACD,wBAAgB,OAAO,CAAC,MAAM,KAAA,oDAE7B"}

package/types/api/platform/dict.d.ts

@@ -1,4 +1,4 @@
-export declare function getDictsMapApi(dictId: string): Promise<import('axios').AxiosResponse<any>>
-export declare function getDictApi(dictId: string): Promise<any>
-export declare function getDictMapApi(dictIdArr: string[]): Promise<{}>
-//# sourceMappingURL=dict.d.ts.map
+export declare function getDictsMapApi(dictId: string): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getDictApi(dictId: string): Promise<any>;
+export declare function getDictMapApi(dictIdArr: string[]): Promise<{}>;
+//# sourceMappingURL=dict.d.ts.map

package/types/api/platform/dict.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dict.d.ts","sourceRoot":"","sources":["../../../src/api/platform/dict.ts"],"names":[],"mappings":"AAMA,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,+CAE5C;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,gBAgB9C;AAkBD,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eActD"}
+{"version":3,"file":"dict.d.ts","sourceRoot":"","sources":["../../../src/api/platform/dict.ts"],"names":[],"mappings":"AAMA,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,oDAE5C;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,gBAgB9C;AAkBD,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,eActD"}

package/types/api/platform/menu.d.ts

@@ -1,17 +1,11 @@
-export declare function getPermissionApi(): Promise<import('axios').AxiosResponse<any>>
-export declare function getMenuHistoryApi(): Promise<import('axios').AxiosResponse<any>>
-export declare function menuHistoryApi(params: any): Promise<import('axios').AxiosResponse<any>>
-export declare function deleteMenuHistoryApi(
-  historyId: any,
-): Promise<import('axios').AxiosResponse<any>>
-export declare function getMenuCollectApi(): Promise<import('axios').AxiosResponse<any>>
-export declare function addMenuCollectApi(params: any): Promise<import('axios').AxiosResponse<any>>
-export declare function deleteMenuCollectApi(
-  collectId: any,
-): Promise<import('axios').AxiosResponse<any>>
-export declare function removeMenuCollectApi(
-  params: any,
-): Promise<import('axios').AxiosResponse<any>>
-export declare function getAppListApi(): Promise<import('axios').AxiosResponse<any>>
-export declare function getMaxTabNumValueApi(): Promise<import('axios').AxiosResponse<any>>
-//# sourceMappingURL=menu.d.ts.map
+export declare function getPermissionApi(): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getMenuHistoryApi(): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function menuHistoryApi(params: any): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function deleteMenuHistoryApi(historyId: any): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getMenuCollectApi(): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function addMenuCollectApi(params: any): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function deleteMenuCollectApi(collectId: any): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function removeMenuCollectApi(params: any): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getAppListApi(): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getMaxTabNumValueApi(): Promise<import("axios").AxiosResponse<any, any>>;
+//# sourceMappingURL=menu.d.ts.map

package/types/api/platform/menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu.d.ts","sourceRoot":"","sources":["../../../src/api/platform/menu.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,gDAE/B;AAED,wBAAgB,iBAAiB,gDAEhC;AAED,wBAAgB,cAAc,CAAC,MAAM,KAAA,+CAEpC;AAED,wBAAgB,oBAAoB,CAAC,SAAS,KAAA,+CAE7C;AAED,wBAAgB,iBAAiB,gDAEhC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,KAAA,+CAEvC;AAED,wBAAgB,oBAAoB,CAAC,SAAS,KAAA,+CAE7C;AAED,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,+CAE1C;AAED,wBAAgB,aAAa,gDAE5B;AAED,wBAAgB,oBAAoB,gDAEnC"}
+{"version":3,"file":"menu.d.ts","sourceRoot":"","sources":["../../../src/api/platform/menu.ts"],"names":[],"mappings":"AAKA,wBAAgB,gBAAgB,qDAE/B;AAED,wBAAgB,iBAAiB,qDAEhC;AAED,wBAAgB,cAAc,CAAC,MAAM,KAAA,oDAEpC;AAED,wBAAgB,oBAAoB,CAAC,SAAS,KAAA,oDAE7C;AAED,wBAAgB,iBAAiB,qDAEhC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,KAAA,oDAEvC;AAED,wBAAgB,oBAAoB,CAAC,SAAS,KAAA,oDAE7C;AAED,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,oDAE1C;AAED,wBAAgB,aAAa,qDAE5B;AAED,wBAAgB,oBAAoB,qDAEnC"}

package/types/api/platform/oss.d.ts

@@ -1,17 +1,17 @@
-import { ResponseType } from 'axios'
+import { ResponseType } from 'axios';
 /**
  * 文档中心下载文件的url，主要用于图片等直接写在 href 里
  *
  * @param fileId 文件Id
  * @returns url
  */
-export declare function getOssFileUrl(fileId?: string): string
+export declare function getOssFileUrl(fileId?: string): string;
 /**
  * 文档中心上传文件的url
  *
  * @returns url
  */
-export declare function putOssFileUrl(): string
+export declare function putOssFileUrl(): string;
 /**
  * 获取文档中心文件
  *
@@ -19,10 +19,7 @@ export declare function putOssFileUrl(): string
  * @param responseType 数据类型，支持 arraybuffer | blob | document | json | text | stream
  * @returns 文件内容
  */
-export declare function getOssFileApi(
-  fileId: string,
-  responseType?: ResponseType,
-): Promise<import('axios').AxiosResponse<any>>
+export declare function getOssFileApi(fileId: string, responseType?: ResponseType): Promise<import("axios").AxiosResponse<any, any>>;
 /**
  * 将文件上传到文档中心
  *
@@ -30,17 +27,12 @@ export declare function getOssFileApi(
  * @param blob 文件的Blob数据
  * @returns 文件Id
  */
-export declare function putOssFileApi(
-  filename: string,
-  blob: Blob,
-): import('axios').AxiosPromise<any>
+export declare function putOssFileApi(filename: string, blob: Blob): import("axios").AxiosPromise<any>;
 /**
  * 获取文档中心预览URL
  *
  * @param fileId 文件Id
  * @returns 文件内容
  */
-export declare function getPreviewUrlApi(
-  fileId: string,
-): Promise<import('axios').AxiosResponse<any>>
-//# sourceMappingURL=oss.d.ts.map
+export declare function getPreviewUrlApi(fileId: string): Promise<import("axios").AxiosResponse<any, any>>;
+//# sourceMappingURL=oss.d.ts.map

package/types/api/platform/oss.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oss.d.ts","sourceRoot":"","sources":["../../../src/api/platform/oss.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,YAAY,EAAE,MAAM,OAAO,CAAA;AAIxD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,SAAK,UAExC;AAED;;;;GAIG;AACH,wBAAgB,aAAa,WAE5B;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY,+CAMxE;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,qCAUzD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,+CAQ9C"}
+{"version":3,"file":"oss.d.ts","sourceRoot":"","sources":["../../../src/api/platform/oss.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,YAAY,EAAE,MAAM,OAAO,CAAA;AAIxD;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,SAAK,UAExC;AAED;;;;GAIG;AACH,wBAAgB,aAAa,WAE5B;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,YAAY,oDAMxE;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,qCAUzD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,oDAQ9C"}

package/types/api/platform/user.d.ts

@@ -1,17 +1,12 @@
-export declare function loginApi({
-  userName,
-  password,
-  validCodeId,
-  validCodeInput,
-}: {
-  userName: any
-  password: any
-  validCodeId: any
-  validCodeInput: any
-}): Promise<import('axios').AxiosResponse<any>>
-export declare function getUserInfoApi(): Promise<import('axios').AxiosResponse<any>>
-export declare function getGlobalPolicyApi(): Promise<import('axios').AxiosResponse<any>>
-export declare function updatePasswordApi(data: any): Promise<import('axios').AxiosResponse<any>>
-export declare function getCaptchaURL(validCodeId: string): string
-export declare function logoutApi(): Promise<import('axios').AxiosResponse<any>>
-//# sourceMappingURL=user.d.ts.map
+export declare function loginApi({ userName, password, validCodeId, validCodeInput }: {
+    userName: any;
+    password: any;
+    validCodeId: any;
+    validCodeInput: any;
+}): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getUserInfoApi(): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getGlobalPolicyApi(): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function updatePasswordApi(data: any): Promise<import("axios").AxiosResponse<any, any>>;
+export declare function getCaptchaURL(validCodeId: string): string;
+export declare function logoutApi(): Promise<import("axios").AxiosResponse<any, any>>;
+//# sourceMappingURL=user.d.ts.map

package/types/api/platform/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/api/platform/user.ts"],"names":[],"mappings":"AAMA,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;;;;;CAAA,+CAQ3E;AAED,wBAAgB,cAAc,gDAE7B;AAED,wBAAgB,kBAAkB,gDAEjC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,KAAA,+CAErC;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,UAEhD;AAED,wBAAgB,SAAS,gDAExB"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/api/platform/user.ts"],"names":[],"mappings":"AAMA,wBAAgB,QAAQ,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;;;;;CAAA,oDAQ3E;AAED,wBAAgB,cAAc,qDAE7B;AAED,wBAAgB,kBAAkB,qDAEjC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,KAAA,oDAErC;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,UAEhD;AAED,wBAAgB,SAAS,qDAExB"}

package/types/api/user.d.ts

@@ -1,2 +1,2 @@
-export declare function listUserTreeApi(params: any): Promise<import('axios').AxiosResponse<any>>
-//# sourceMappingURL=user.d.ts.map
+export declare function listUserTreeApi(params: any): Promise<import("axios").AxiosResponse<any, any>>;
+//# sourceMappingURL=user.d.ts.map

package/types/api/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/api/user.ts"],"names":[],"mappings":"AAKA,wBAAgB,eAAe,CAAC,MAAM,KAAA,+CAErC"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/api/user.ts"],"names":[],"mappings":"AAKA,wBAAgB,eAAe,CAAC,MAAM,KAAA,oDAErC"}

package/types/utils/request/index.d.ts

@@ -9,9 +9,10 @@ declare const instance: AxiosExtendsInstance;
  * 即上一次发起的网络请求将调用浏览器取消网络请求
  * 注意：如果serviceApi是多个组件共同使用时，需要慎重使用本方法，避免导致由于请求被取消导致的功能异常
  * @param {Function} api - 需要封装的API函数
+ * @param {boolean} isPost - 是否是post请求
  * @returns {Function} 封装后可取消的api
  */
-export declare const wrapApi: (api: any) => {
+export declare const wrapApi: (api: any, isPost?: boolean) => {
     (...args: any[]): Promise<any>;
     cancel(reason: any): void;
     isPending(): boolean;

package/types/utils/request/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/request/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAC3D,OAAO,EAAuB,oBAAoB,EAAkB,MAAM,gBAAgB,CAAA;AAG1F,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAE/B,QAAA,MAAM,QAAQ,EAAE,oBAA+D,CAAA;AAS/E;;;;;;GAMG;AACH,eAAO,MAAM,OAAO;;;;CAuGnB,CAAA;AAOD,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAE,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/request/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAA;AAC3D,OAAO,EAAuC,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAG1F,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAE/B,QAAA,MAAM,QAAQ,EAAE,oBAA+D,CAAA;AAS/E;;;;;;;GAOG;AACH,eAAO,MAAM,OAAO;;;;CA6GnB,CAAA;AAQD,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAE,CAAA"}