@indfnd/utils 0.1.26 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indfnd/utils",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "author": "huxuetong",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -34,7 +34,7 @@
     "re-publish": "yarn publish --access public"
   },
   "dependencies": {
-    "axios": "^0.21.4",
+    "axios": "^0.24.0",
     "dayjs": "^1.11.9",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",

package/src/utils/request/axios.extends.ts

@@ -6,4 +6,18 @@ export interface AxiosExtendsInstance extends AxiosInstance {
     data: any,
     config?: AxiosRequestConfig,
   ): Promise<R>
+
+  getSingleton?<T = any, R = AxiosResponse<T>>(url: string, config?: AxiosRequestConfig): Promise<R>
+
+  postSingleton?<T = any, R = AxiosResponse<T>>(
+    url: string,
+    data: any,
+    config?: AxiosRequestConfig,
+  ): Promise<R>
+
+  formPostSingleton?<T = any, R = AxiosResponse<T>>(
+    url: string,
+    data: any,
+    config?: AxiosRequestConfig,
+  ): Promise<R>
 }

package/src/utils/request/index.ts

@@ -16,5 +16,121 @@ instance.formPost = function (url, data, config) {
   setContentType(headers, CONTENT_TYPE.form)
   return instance.post(url, data, { ...config, headers })
 }
+/**
+ * 对业务封装的axios service Api进行封装，封装以后的Api同一时间只有一个网络请求
+ * 即上一次发起的网络请求将调用浏览器取消网络请求
+ * 注意：如果serviceApi是多个组件共同使用时，需要慎重使用本方法，避免导致由于请求被取消导致的功能异常
+ * @param {Function} api - 需要封装的API函数
+ * @returns {Function} 封装后可取消的api
+ */
+export const wrapApi = (api) => {
+  // 每个函数都有自己的 controller，避免互相干扰
+  let currentController = null
+
+  const wrappedFunction = async function (...args) {
+    // 取消之前的请求
+    if (currentController) {
+      console.log('currentController.abort trigger, now cancel before request')
+      currentController.abort()
+      currentController = null
+    }
+
+    // 创建新的 AbortController
+    const controller = new AbortController()
+    currentController = controller
+
+    // 准备参数
+    const newArgs = [...args]
+    const lastIndex = newArgs.length - 1
+
+    try {
+      // 处理配置参数
+      if (
+        newArgs.length > 0 &&
+        typeof newArgs[lastIndex] === 'object' &&
+        !Array.isArray(newArgs[lastIndex])
+      ) {
+        // 最后一个参数是配置对象
+        const config = newArgs[lastIndex]
+
+        // 如果有原生的 signal，需要合并处理
+        if (config.signal) {
+          // 创建一个新的 AbortController 来合并多个 signal
+          const combinedController = new AbortController()
+          const originalSignal = config.signal
+
+          // 监听原始 signal 的取消
+          originalSignal.addEventListener('abort', () => {
+            combinedController.abort(originalSignal.reason)
+          })
+
+          // 监听当前 controller 的取消
+          controller.signal.addEventListener('abort', () => {
+            combinedController.abort(controller.signal.reason)
+          })
+
+          // 使用合并后的 signal
+          newArgs[lastIndex] = {
+            ...config,
+            signal: combinedController.signal,
+          }
+        } else {
+          // 直接使用新的 signal
+          newArgs[lastIndex] = {
+            ...config,
+            signal: controller.signal,
+          }
+        }
+      } else {
+        // 没有配置对象，添加一个
+        newArgs.push({ signal: controller.signal })
+      }
+
+      // 执行请求
+      const result = await api(...newArgs)
+
+      // 请求成功后清理 controller
+      currentController = null
+      return result
+    } catch (error) {
+      // 如果是取消错误，重新抛出
+      if (error.name === 'AbortError' || axios.isCancel(error)) {
+        throw Object.assign(new Error('Request cancelled'), {
+          name: 'AbortError',
+          cancelled: true,
+          originalError: error,
+        })
+      }
+
+      // 其他错误正常抛出
+      throw error
+    } finally {
+      // 如果当前 controller 仍然是这个请求的，清理它
+      if (currentController === controller) {
+        currentController = null
+      }
+    }
+  }
+
+  // 添加取消方法，允许外部取消
+  wrappedFunction.cancel = (reason) => {
+    if (currentController) {
+      currentController.abort(reason)
+      currentController = null
+    }
+  }
+
+  // 添加检查是否正在请求的方法
+  wrappedFunction.isPending = () => {
+    return currentController !== null
+  }
+
+  return wrappedFunction
+}
+
+// 对axios进行封装，返回单例模式的Api
+instance.getSingleton = wrapApi(instance.get)
+instance.postSingleton = wrapApi(instance.post)
+instance.formPostSingleton = wrapApi(instance.formPost)
 
 export { instance as axios }

package/src/utils/request/interceptors.ts

@@ -9,6 +9,7 @@ const SUCCESS_CODE = 1
 const NO_SESSION_CODE = 10106
 
 let timer: any = null
+
 function _debounce(callback: Function) {
   if (timer) {
     clearTimeout(timer)
@@ -103,7 +104,7 @@ export function inspectorError(error) {
   if (error?.code === 'ECONNABORTED') {
     // 超时
     window.apiErrorHandler && window.apiErrorHandler('请求超时，请稍后再试')
-  } else if (error?.response?.status !== 200) {
+  } else if (error?.response?.status !== 200 && error?.message !== 'canceled') {
     window.apiErrorHandler && window.apiErrorHandler('请求出错了')
   }
   return Promise.reject(error)

package/types/api/index.d.ts

@@ -1,6 +1,6 @@
-export * from './platform'
-export * from './com'
-export * from './index-desc'
-export * from './item'
-export * from './user'
-//# sourceMappingURL=index.d.ts.map
+export * from './platform';
+export * from './com';
+export * from './index-desc';
+export * from './item';
+export * from './user';
+//# sourceMappingURL=index.d.ts.map

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

@@ -1,7 +1,7 @@
 export namespace Base64 {
-  let Base64Chars: string
-  function encode(s: any): any
-  function ucs2_utf8(s: any): any[]
-  function utf8_ucs2(s: any): string
+    let Base64Chars: string;
+    function encode(s: any): any;
+    function ucs2_utf8(s: any): any[];
+    function utf8_ucs2(s: any): string;
 }
-//# sourceMappingURL=base64.d.ts.map
+//# sourceMappingURL=base64.d.ts.map

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

@@ -1,5 +1,5 @@
-export * from './dict'
-export * from './menu'
-export * from './oss'
-export * from './user'
-//# sourceMappingURL=index.d.ts.map
+export * from './dict';
+export * from './menu';
+export * from './oss';
+export * from './user';
+//# sourceMappingURL=index.d.ts.map

package/types/config/base.config.d.ts

@@ -1,34 +1,34 @@
 declare const _default: {
-  title: string
-  icomId: string
-  showMenus: boolean
-  routerBase: string
-  loginRouteName: string
-  rootRouteName: string
-  homeRouteName: string
-  authServerContext: string
-  ossServerContext: string
-  ismAmServerContext: string
-  ismAcServerContext: string
-  ismSqServerContext: string
-  ilmServerContext: string
-  imgServerContext: string
-  imaServerContext: string
-  ucExtServerContext: string
-  dataManageServerContext: string
-  kkfilepreviewContext: string
-  errorMessage: string
-  leftLockDays: number
-  labelStyle: {
-    labelWidthButton: number
-    labelWidthSmall: number
-    labelWidthMiddle: number
-    labelWidthMiddleLarge: number
-    labelWidthLarge: number
-    labelWidthSuperLarge: number
-  }
-  /** 点击跳转的文字颜色 */
-  linkColor: string
-}
-export default _default
-//# sourceMappingURL=base.config.d.ts.map
+    title: string;
+    icomId: string;
+    showMenus: boolean;
+    routerBase: string;
+    loginRouteName: string;
+    rootRouteName: string;
+    homeRouteName: string;
+    authServerContext: string;
+    ossServerContext: string;
+    ismAmServerContext: string;
+    ismAcServerContext: string;
+    ismSqServerContext: string;
+    ilmServerContext: string;
+    imgServerContext: string;
+    imaServerContext: string;
+    ucExtServerContext: string;
+    dataManageServerContext: string;
+    kkfilepreviewContext: string;
+    errorMessage: string;
+    leftLockDays: number;
+    labelStyle: {
+        labelWidthButton: number;
+        labelWidthSmall: number;
+        labelWidthMiddle: number;
+        labelWidthMiddleLarge: number;
+        labelWidthLarge: number;
+        labelWidthSuperLarge: number;
+    };
+    /** 点击跳转的文字颜色 */
+    linkColor: string;
+};
+export default _default;
+//# sourceMappingURL=base.config.d.ts.map

package/types/config/dev.config.d.ts

@@ -1,4 +1,4 @@
 export declare function getDevConfig(): {
-  showMenus: boolean
-}
-//# sourceMappingURL=dev.config.d.ts.map
+    showMenus: boolean;
+};
+//# sourceMappingURL=dev.config.d.ts.map

package/types/config/index.d.ts

@@ -1,6 +1,6 @@
-declare let config: any
-declare function useConfig(isDev?: boolean): any
-declare function setConfig(key: any, value: any): void
-export default config
-export { config, useConfig, setConfig }
-//# sourceMappingURL=index.d.ts.map
+declare let config: any;
+declare function useConfig(isDev?: boolean): any;
+declare function setConfig(key: any, value: any): void;
+export default config;
+export { config, useConfig, setConfig };
+//# sourceMappingURL=index.d.ts.map

package/types/config/prod.config.d.ts

@@ -1,4 +1,4 @@
 export declare function getProdConfig(): {
-  showMenus: boolean
-}
-//# sourceMappingURL=prod.config.d.ts.map
+    showMenus: boolean;
+};
+//# sourceMappingURL=prod.config.d.ts.map

package/types/index.d.ts

@@ -1,4 +1,4 @@
-export * from './api'
-export * from './config'
-export * from './utils'
-//# sourceMappingURL=index.d.ts.map
+export * from './api';
+export * from './config';
+export * from './utils';
+//# sourceMappingURL=index.d.ts.map

package/types/utils/base64.d.ts

@@ -1,23 +1,23 @@
 declare let Base64ForLogin: {
-  Base64Chars: string
-  /**
-   * Encode a string to a Base64 string follow Bse64 regular.
-   * @param s, a normal string
-   * @return a Base64 string
-   */
-  encode: (s: any) => any
-  /**
-   * Encodes a ucs2 string to a utf8 integer array.
-   * @param s, a string
-   * @return an integer array
-   */
-  ucs2_utf8: (s: any) => any[]
-  /**
-   * Encodes a utf8 integer array to a ucs2 string.
-   * @param s, an integer array
-   * @return a string
-   */
-  utf8_ucs2: (s: any) => string
-}
-export { Base64ForLogin }
-//# sourceMappingURL=base64.d.ts.map
+    Base64Chars: string;
+    /**
+     * Encode a string to a Base64 string follow Bse64 regular.
+     * @param s, a normal string
+     * @return a Base64 string
+     */
+    encode: (s: any) => any;
+    /**
+     * Encodes a ucs2 string to a utf8 integer array.
+     * @param s, a string
+     * @return an integer array
+     */
+    ucs2_utf8: (s: any) => any[];
+    /**
+     * Encodes a utf8 integer array to a ucs2 string.
+     * @param s, an integer array
+     * @return a string
+     */
+    utf8_ucs2: (s: any) => string;
+};
+export { Base64ForLogin };
+//# sourceMappingURL=base64.d.ts.map

package/types/utils/blob.d.ts

@@ -5,6 +5,6 @@
  * @param contentType 数据的MIME Type，如 png 为 image/png
  * @returns Blob数据
  */
-export declare function base64ToBlob(base64Data: string, contentType: string): Blob
-export declare function blobToBase64(blob: Blob, hasPrefix?: boolean): Promise<unknown>
-//# sourceMappingURL=blob.d.ts.map
+export declare function base64ToBlob(base64Data: string, contentType: string): Blob;
+export declare function blobToBase64(blob: Blob, hasPrefix?: boolean): Promise<unknown>;
+//# sourceMappingURL=blob.d.ts.map

package/types/utils/cache/dict-cache.d.ts

@@ -1,3 +1,3 @@
-export declare function getDictCache(dictId: string): any
-export declare function setDictCache(dictId: string, data: any): void
-//# sourceMappingURL=dict-cache.d.ts.map
+export declare function getDictCache(dictId: string): any;
+export declare function setDictCache(dictId: string, data: any): void;
+//# sourceMappingURL=dict-cache.d.ts.map

package/types/utils/cache/index-desc.d.ts

@@ -1,4 +1,4 @@
-export declare function getIndexDescCache(): any
-export declare function setIndexDescCache(data: any): void
-export declare function clearIndexDescCache(): void
-//# sourceMappingURL=index-desc.d.ts.map
+export declare function getIndexDescCache(): any;
+export declare function setIndexDescCache(data: any): void;
+export declare function clearIndexDescCache(): void;
+//# sourceMappingURL=index-desc.d.ts.map

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

@@ -1,4 +1,4 @@
-export * from './index-desc'
-export * from './permission-cache'
-export * from './user-cache'
-//# sourceMappingURL=index.d.ts.map
+export * from './index-desc';
+export * from './permission-cache';
+export * from './user-cache';
+//# sourceMappingURL=index.d.ts.map

package/types/utils/cache/permission-cache.d.ts

@@ -1,4 +1,4 @@
-export declare function getPermissionCache(): any
-export declare function setPermissionCache(data: any): void
-export declare function clearPermissionCache(): void
-//# sourceMappingURL=permission-cache.d.ts.map
+export declare function getPermissionCache(): any;
+export declare function setPermissionCache(data: any): void;
+export declare function clearPermissionCache(): void;
+//# sourceMappingURL=permission-cache.d.ts.map

package/types/utils/cache/user-cache.d.ts

@@ -1,4 +1,4 @@
-export declare function getUserInfoCache(): any
-export declare function setUserInfoCache(data: any): void
-export declare function clearUserInfoCache(): void
-//# sourceMappingURL=user-cache.d.ts.map
+export declare function getUserInfoCache(): any;
+export declare function setUserInfoCache(data: any): void;
+export declare function clearUserInfoCache(): void;
+//# sourceMappingURL=user-cache.d.ts.map

package/types/utils/date.d.ts

@@ -1,4 +1,4 @@
-export declare function str2Date(value: string): Date
-export declare function formatDate(value: string): string
-export declare function formatDateChinese(value: string): string
-//# sourceMappingURL=date.d.ts.map
+export declare function str2Date(value: string): Date;
+export declare function formatDate(value: string): string;
+export declare function formatDateChinese(value: string): string;
+//# sourceMappingURL=date.d.ts.map

package/types/utils/enum.d.ts

@@ -1,40 +1,40 @@
 /** 是否枚举的key */
-export declare const IS_OR_NOT_ENUM_KEY = 'IS_ENUM'
+export declare const IS_OR_NOT_ENUM_KEY = "IS_ENUM";
 /** 是否枚举的map形式 */
 export declare const IS_OR_NOT_ENUM: {
-  '1': string
-  '0': string
-}
+    '1': string;
+    '0': string;
+};
 /** 是否枚举的list形式 */
 export declare const IS_OR_NOT_ENUM_LIST: {
-  K: string
-  V: string
-}[]
+    K: string;
+    V: string;
+}[];
 export declare const UC_ENUM: {
-  MANAGE_UNIT_ID: string
-  ORG_CODE_ADMIN: string
-  ORG_CODE_MKT: string
-  ORG_CODE_LOG: string
-  ORG_CODE_ACTIVITY: string
-  ADMIN_LEVEL_IND: string
-  ADMIN_LEVEL_CENTER: string
-  ADMIN_LEVEL_FAC: string
-  ADMIN_LEVEL_DIST: string
-  ADMIN_LEVEL_COMMON_DEPT: string
-  ADMIN_LEVEL_COMMON_POST: string
-  LEVEL_IND: string
-  LEVEL_CENTER: string
-  LEVEL_FAC: string
-  LEVEL_DIST: string
-  LEVEL_CIGAR_DIST: string
-  LEVEL_COMMON_DEPT: string
-  LEVEL_COMMON_POST: string
-  LEVEL_DIST_MANAGE_POST: string
-  LEVEL_CUST_MANAGE_POST: string
-  LEVEL_CIGAR_DIST_MANAGE_POST: string
-  LEVEL_CIGAR_CUST_MANAGE_POST: string
-  LEVEL_INTERNAL_POST: string
-}
+    MANAGE_UNIT_ID: string;
+    ORG_CODE_ADMIN: string;
+    ORG_CODE_MKT: string;
+    ORG_CODE_LOG: string;
+    ORG_CODE_ACTIVITY: string;
+    ADMIN_LEVEL_IND: string;
+    ADMIN_LEVEL_CENTER: string;
+    ADMIN_LEVEL_FAC: string;
+    ADMIN_LEVEL_DIST: string;
+    ADMIN_LEVEL_COMMON_DEPT: string;
+    ADMIN_LEVEL_COMMON_POST: string;
+    LEVEL_IND: string;
+    LEVEL_CENTER: string;
+    LEVEL_FAC: string;
+    LEVEL_DIST: string;
+    LEVEL_CIGAR_DIST: string;
+    LEVEL_COMMON_DEPT: string;
+    LEVEL_COMMON_POST: string;
+    LEVEL_DIST_MANAGE_POST: string;
+    LEVEL_CUST_MANAGE_POST: string;
+    LEVEL_CIGAR_DIST_MANAGE_POST: string;
+    LEVEL_CIGAR_CUST_MANAGE_POST: string;
+    LEVEL_INTERNAL_POST: string;
+};
 /**
  * 将自定义的列表转换为枚举列表格式，如
  * ```
@@ -47,14 +47,10 @@ export declare const UC_ENUM: {
  * @param vProp value对应属性名
  * @returns 公共组件可直接使用的枚举列表
  */
-export declare function renderEnumList(
-  list?: any[],
-  kProp?: string,
-  vProp?: string,
-): {
-  K: any
-  V: any
-}[]
+export declare function renderEnumList(list?: any[], kProp?: string, vProp?: string): {
+    K: any;
+    V: any;
+}[];
 /**
  * 将自定义的列表转换为枚举对象格式，如
  * ```
@@ -66,7 +62,7 @@ export declare function renderEnumList(
  * @param vProp value对应属性名
  * @returns 公共组件可直接使用的枚举对象
  */
-export declare function renderEnumData(list?: any[], kProp?: string, vProp?: string): any
+export declare function renderEnumData(list?: any[], kProp?: string, vProp?: string): any;
 /**
  * 统一处理表格列定义的枚举列
  * - 由于表格组件不方便获取枚举数据，需要各业务先获取枚举数据后，重新组织列定义
@@ -76,7 +72,7 @@ export declare function renderEnumData(list?: any[], kProp?: string, vProp?: str
  * @param enumRelation 枚举数据，支持多个枚举，格式为 `{ '枚举Id1': [{ K: '', V: ''}] }` 或 `{ '枚举Id1': { 'K': 'V' } }`
  * @returns 新的列定义
  */
-export declare function renderColumnEnums(columns?: any[], enumRelation?: {}): any[]
+export declare function renderColumnEnums(columns?: any[], enumRelation?: {}): any[];
 /**
  * 统一处理表单的类枚举列
  * - 用于处理需特定接口获取数据的列表
@@ -86,5 +82,5 @@ export declare function renderColumnEnums(columns?: any[], enumRelation?: {}): a
  * @param enumRelation 枚举数据，支持多个枚举，格式为 `{ '枚举Id1': [{ K: '', V: ''}] }` 或 `{ '枚举Id1': { 'K': 'V' } }`
  * @returns 新的表单定义
  */
-export declare function renderFieldEnums(fieldList?: any[], enumRelation?: {}): any[]
-//# sourceMappingURL=enum.d.ts.map
+export declare function renderFieldEnums(fieldList?: any[], enumRelation?: {}): any[];
+//# sourceMappingURL=enum.d.ts.map

package/types/utils/event.d.ts

@@ -1,25 +1,17 @@
 /**
  * 绑定事件 on(element, event, handler)
  */
-export declare function on(
-  element: any,
-  event: any,
-  handler: any,
-): (element: any, event: any, handler: any) => void
+export declare function on(element: any, event: any, handler: any): (element: any, event: any, handler: any) => void;
 /**
  * 解绑事件 off(element, event, handler)
  */
-export declare function off(
-  element: any,
-  event: any,
-  handler: any,
-): (element: HTMLElement, event: string, handler: EventListenerOrEventListenerObject) => void
-export declare const stopPropagation: (event: Event) => void
+export declare function off(element: any, event: any, handler: any): (element: HTMLElement, event: string, handler: EventListenerOrEventListenerObject) => void;
+export declare const stopPropagation: (event: Event) => void;
 /**
  * 事件 preventDefault
  *
  * @param event 事件
  * @param isStopPropagation 是否阻止冒泡
  */
-export declare function preventDefault(event: Event, isStopPropagation?: Boolean): void
-//# sourceMappingURL=event.d.ts.map
+export declare function preventDefault(event: Event, isStopPropagation?: Boolean): void;
+//# sourceMappingURL=event.d.ts.map

package/types/utils/excel.d.ts

@@ -17,7 +17,7 @@
  *   rowSpanIndexCol:'', // 根据哪一列进行跨行计算，如根据卷烟ITEM_NAME
  * } excelData
  */
-export function exportJsonToExcel(excelData: any): void
+export function exportJsonToExcel(excelData: any): void;
 /**
  * 根据参数导出excel，目前系统仅支持agGrid和iviewTable，这两个表格的columns定义都是树形的，所以这里仅支持树形的列定义即可
  * 根据每个column的树形信息，可以计算出每个column定义的单元格跨行跨列信息，直接得出excel待导出的表头
@@ -37,12 +37,12 @@ export function exportJsonToExcel(excelData: any): void
  *   rowSpanIndexCol:'', // 根据哪一列进行跨行计算，如根据卷烟ITEM_NAME
  * } excelData
  */
-export function importJsonFromExcel(excelData: any): Promise<any>
+export function importJsonFromExcel(excelData: any): Promise<any>;
 /**
  * 根据列的数组下标返回excel对应的列号 (目前是按照.xlsx的定义计算的)
  *
  * @param {number} number 列的下标，从0开始计数
  * @returns excel里的列号
  */
-export function getExcelColumnIdx(number: number): string
-//# sourceMappingURL=excel.d.ts.map
+export function getExcelColumnIdx(number: number): string;
+//# sourceMappingURL=excel.d.ts.map

package/types/utils/half-year.d.ts

@@ -1,6 +1,6 @@
-export declare function getHalfYear(date: string): string
-export declare function getHalfYearNum(month: number | string): 0 | 1 | 2
-export declare function formatHalfYear(halfYear: string): string
-export declare function getHalfYearBeginMonth(halfYear: string): string
-export declare function getHalfYearEndMonth(halfYear: string): string
-//# sourceMappingURL=half-year.d.ts.map
+export declare function getHalfYear(date: string): string;
+export declare function getHalfYearNum(month: number | string): 0 | 1 | 2;
+export declare function formatHalfYear(halfYear: string): string;
+export declare function getHalfYearBeginMonth(halfYear: string): string;
+export declare function getHalfYearEndMonth(halfYear: string): string;
+//# sourceMappingURL=half-year.d.ts.map