@indfnd/utils 0.1.25 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indfnd/utils",
-  "version": "0.1.25",
+  "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/api/com.ts

@@ -4,5 +4,8 @@ import { config } from '@/config'
 const CONTEXT = config.ismAmServerContext
 
 export function listComTreeApi(params) {
+  if (config.useDddComItemTree) {
+    return axios.get(`${config.ucExtServerContext}/manage/tree/getBusiComTree`, { params })
+  }
   return axios.get(`${CONTEXT}/tree/com/listComTree`, { params })
 }

package/src/api/item.ts

@@ -4,6 +4,11 @@ import { config } from '@/config'
 const CONTEXT = config.ismAmServerContext
 
 export function listItemTreeApi(params) {
+  if (config.useDddComItemTree) {
+    return axios.get(`${config.ucExtServerContext}/manage/tree/getProductInfoAsTreeData`, {
+      params,
+    })
+  }
   return axios.get(`${CONTEXT}/tree/item/listItemTree`, { params })
 }
 export function getPriceInfo() {

package/src/config/index.ts

@@ -2,10 +2,21 @@ import baseConfig from './base.config'
 import { getDevConfig } from './dev.config'
 import { getProdConfig } from './prod.config'
 
-export function useConfig(isDev?: boolean) {
-  return isDev
+let config: any = {}
+
+function useConfig(isDev?: boolean) {
+  config = isDev
     ? Object.assign({}, baseConfig, getDevConfig())
     : Object.assign({}, baseConfig, getProdConfig())
+  return config
+}
+
+useConfig()
+
+function setConfig(key, value) {
+  baseConfig[key] = value // 避免先调用setConfig，后调用useConfig导致信息丢失
+  config[key] = value
 }
 
-export const config = useConfig()
+export default config
+export { config, useConfig, setConfig }

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/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,+CAEpC"}
+{"version":3,"file":"com.d.ts","sourceRoot":"","sources":["../../src/api/com.ts"],"names":[],"mappings":"AAKA,wBAAgB,cAAc,CAAC,MAAM,KAAA,+CAKpC"}

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/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,+CAErC;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,+CAOrC;AACD,wBAAgB,YAAY,gDAE3B;AACD,wBAAgB,OAAO,CAAC,MAAM,KAAA,+CAE7B"}

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,67 +1,6 @@
-export declare function useConfig(isDev?: boolean): {
-  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
-} & {
-  showMenus: boolean
-}
-export declare const config: {
-  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
-} & {
-  showMenus: boolean
-}
-//# 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/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAIA,wBAAgB,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIxC;AAED,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAIA,QAAA,IAAI,MAAM,EAAE,GAAQ,CAAA;AAEpB,iBAAS,SAAS,CAAC,KAAK,CAAC,EAAE,OAAO,OAKjC;AAID,iBAAS,SAAS,CAAC,GAAG,KAAA,EAAE,KAAK,KAAA,QAG5B;AAED,eAAe,MAAM,CAAA;AACrB,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAA"}

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