@indfnd/utils 0.1.37 → 0.1.39

package/global.d.ts

@@ -7,6 +7,8 @@ interface Window {
   wx: any
 }
 
+declare const __IS_HB__: string
+
 interface Date {
   toGMTString: () => string
 }

package/package.json

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

package/src/api/com.ts

@@ -1,12 +1,14 @@
 import { axios } from '@/utils'
 import { config } from '@/config'
-const isHb = location.pathname.includes('scyxweb')
+function isHb() {
+  return __IS_HB__
+}
 const CONTEXT = config.ismAmServerContext
 
 export function listComTreeApi(params) {
   if (config.useDddComItemTree) {
     return axios.get(
-      `${isHb ? '/scyxgateway' : ''}${config.ucExtServerContext}/manage/tree/getBusiComTree`,
+      `${isHb() ? '/scyxgateway' : ''}${config.ucExtServerContext}/manage/tree/getBusiComTree`,
       { params },
     )
   }

package/src/api/item.ts

@@ -1,12 +1,14 @@
 import { axios } from '@/utils'
 import { config } from '@/config'
-const isHb = location.pathname.includes('scyxweb')
+function isHb() {
+  return __IS_HB__
+}
 const CONTEXT = config.ismAmServerContext
 
 export function listItemTreeApi(params) {
   if (config.useDddComItemTree) {
     return axios.get(
-      `${isHb ? '/scyxgateway' : ''}${
+      `${isHb() ? '/scyxgateway' : ''}${
         config.ucExtServerContext
       }/manage/tree/getProductInfoAsTreeData`,
       {

package/src/api/platform/oss.ts

@@ -2,7 +2,9 @@ import { CONTENT_TYPE, axios, getToken, MIME_TYPE } from '@/utils'
 import { config } from '@/config'
 import { AxiosRequestConfig, ResponseType } from 'axios'
 
-const isHb = location.pathname.includes('scyxweb')
+function isHb() {
+  return __IS_HB__
+}
 const CONTEXT = config.ossServerContext
 
 /**
@@ -12,7 +14,7 @@ const CONTEXT = config.ossServerContext
  * @returns url
  */
 export function getOssFileUrl(fileId = '') {
-  return `${isHb ? '/scyxgateway/ind-uc-ext-server' : CONTEXT}/oss/file/get/${fileId}`
+  return `${isHb() ? '/scyxgateway/ind-uc-ext-server' : CONTEXT}/oss/file/get/${fileId}`
 }
 
 /**
@@ -21,7 +23,7 @@ export function getOssFileUrl(fileId = '') {
  * @returns url
  */
 export function putOssFileUrl() {
-  return `${isHb ? '/scyxgateway/ind-uc-ext-server' : CONTEXT}/oss/file/put`
+  return `${isHb() ? '/scyxgateway/ind-uc-ext-server' : CONTEXT}/oss/file/put`
 }
 
 /**
@@ -89,7 +91,7 @@ export async function downLoadScDcApi(fileId: string, fileName: string) {
     })
   } else {
     const downloadUrl = `${
-      (location.pathname.includes('scyxweb') ? '/scyxgateway' : '') + '/ind-uc-ext-server'
+      (isHb() ? '/scyxgateway' : '') + '/ind-uc-ext-server'
     }/oss/file/get/${fileId}`
     const token = getToken() // 获取当前 Token
 

package/src/utils/excel.js

@@ -2,7 +2,7 @@
 
 // const XlsxPopulate = require('xlsx-populate/browser/xlsx-populate')
 import _ from 'lodash'
-import { putOssFileApi } from '@indfnd/utils'
+import { putOssFileApi } from '@/api/platform/oss'
 
 const titleStyle = {
   // title style

package/src/utils/request/index.ts

@@ -26,19 +26,21 @@ instance.formPost = function (url, data, config) {
  */
 export const wrapApi = (api, isPost = false) => {
   // 每个函数都有自己的 controller，避免互相干扰
-  let currentController = null
+  let controllerMapping = {}
 
   const wrappedFunction = async function (...args) {
+    let url = args[0]
+
     // 取消之前的请求
-    if (currentController) {
+    if (controllerMapping[url]) {
       console.log('currentController.abort trigger, now cancel before request')
-      currentController.abort()
-      currentController = null
+      controllerMapping[url].abort()
+      controllerMapping[url] = null
     }
 
     // 创建新的 AbortController
     const controller = new AbortController()
-    currentController = controller
+    controllerMapping[url] = controller
 
     // 准备参数
     const newArgs = [...args]
@@ -97,7 +99,7 @@ export const wrapApi = (api, isPost = false) => {
       const result = await api(...newArgs)
 
       // 请求成功后清理 controller
-      currentController = null
+      controllerMapping[url] = null
       return result
     } catch (error) {
       // 如果是取消错误，重新抛出
@@ -113,24 +115,24 @@ export const wrapApi = (api, isPost = false) => {
       throw error
     } finally {
       // 如果当前 controller 仍然是这个请求的，清理它
-      if (currentController === controller) {
-        currentController = null
+      if (controllerMapping[url] === controller) {
+        controllerMapping[url] = null
       }
     }
   }
 
-  // 添加取消方法，允许外部取消
-  wrappedFunction.cancel = (reason) => {
-    if (currentController) {
-      currentController.abort(reason)
-      currentController = null
-    }
-  }
-
-  // 添加检查是否正在请求的方法
-  wrappedFunction.isPending = () => {
-    return currentController !== null
-  }
+  // // 添加取消方法，允许外部取消
+  // wrappedFunction.cancel = (reason) => {
+  //   if (controllerMapping[url]) {
+  //     controllerMapping[url].abort(reason)
+  //     controllerMapping[url] = null
+  //   }
+  // }
+
+  // // 添加检查是否正在请求的方法
+  // wrappedFunction.isPending = () => {
+  //   return controllerMapping[url] !== null
+  // }
 
   return wrappedFunction
 }

package/types/api/com.d.ts

@@ -1,2 +1,4 @@
-export declare function listComTreeApi(params: any): Promise<import('axios').AxiosResponse<any>>
+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,+CAQpC"}
+{"version":3,"file":"com.d.ts","sourceRoot":"","sources":["../../src/api/com.ts"],"names":[],"mappings":"AAOA,wBAAgB,cAAc,CAAC,MAAM,KAAA,wDAQpC"}

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

@@ -1,2 +1,4 @@
-export declare function listIndexDescApi(params: any): Promise<import('axios').AxiosResponse<any>>
+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,wDAEtC"}

package/types/api/item.d.ts

@@ -1,4 +1,6 @@
-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>>
+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,+CAYrC;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":"AAOA,wBAAgB,eAAe,CAAC,MAAM,KAAA,wDAYrC;AACD,wBAAgB,YAAY,yDAE3B;AACD,wBAAgB,OAAO,CAAC,MAAM,KAAA,wDAE7B"}

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

@@ -1,4 +1,6 @@
-export declare function getDictsMapApi(dictId: string): Promise<import('axios').AxiosResponse<any>>
+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,wDAE5C;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,21 @@
-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 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>>
-export declare function getMenuCollectApi(): Promise<import('axios').AxiosResponse<any>>
-export declare function addMenuCollectApi(params: any): Promise<import('axios').AxiosResponse<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>>
+): Promise<import('axios').AxiosResponse<any, 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>>
+): 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,yDAE/B;AAED,wBAAgB,iBAAiB,yDAEhC;AAED,wBAAgB,cAAc,CAAC,MAAM,KAAA,wDAEpC;AAED,wBAAgB,oBAAoB,CAAC,SAAS,KAAA,wDAE7C;AAED,wBAAgB,iBAAiB,yDAEhC;AAED,wBAAgB,iBAAiB,CAAC,MAAM,KAAA,wDAEvC;AAED,wBAAgB,oBAAoB,CAAC,SAAS,KAAA,wDAE7C;AAED,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,wDAE1C;AAED,wBAAgB,aAAa,yDAE5B;AAED,wBAAgB,oBAAoB,yDAEnC"}

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

@@ -22,7 +22,7 @@ export declare function putOssFileUrl(): string
 export declare function getOssFileApi(
   fileId: string,
   responseType?: ResponseType,
-): Promise<import('axios').AxiosResponse<any>>
+): Promise<import('axios').AxiosResponse<any, any, {}>>
 /**
  * 将文件上传到文档中心
  *
@@ -33,7 +33,7 @@ export declare function getOssFileApi(
 export declare function putOssFileApi(
   filename: string,
   blob: Blob,
-): import('axios').AxiosPromise<any>
+): Promise<import('axios').AxiosResponse<any, any, {}>>
 /**
  * 获取文档中心预览URL
  *
@@ -42,7 +42,7 @@ export declare function putOssFileApi(
  */
 export declare function getPreviewUrlApi(
   fileId: string,
-): Promise<import('axios').AxiosResponse<any>>
+): Promise<import('axios').AxiosResponse<any, any, {}>>
 /**
  * 获取文档中心预览URL
  *

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;AAKxD;;;;;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;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBA0DrE"}
+{"version":3,"file":"oss.d.ts","sourceRoot":"","sources":["../../../src/api/platform/oss.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,YAAY,EAAE,MAAM,OAAO,CAAA;AAOxD;;;;;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,wDAMxE;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,wDAUzD;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,wDAQ9C;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,iBA0DrE"}

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

@@ -8,10 +8,12 @@ export declare function loginApi({
   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>>
+}): 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>>
+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,wDAQ3E;AAED,wBAAgB,cAAc,yDAE7B;AAED,wBAAgB,kBAAkB,yDAEjC;AAED,wBAAgB,iBAAiB,CAAC,IAAI,KAAA,wDAErC;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,UAEhD;AAED,wBAAgB,SAAS,yDAExB"}

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

@@ -12,13 +12,6 @@ declare const instance: AxiosExtendsInstance
  * @param {boolean} isPost - 是否是post请求
  * @returns {Function} 封装后可取消的api
  */
-export declare const wrapApi: (
-  api: any,
-  isPost?: boolean,
-) => {
-  (...args: any[]): Promise<any>
-  cancel(reason: any): void
-  isPending(): boolean
-}
+export declare const wrapApi: (api: any, isPost?: boolean) => (...args: any[]) => Promise<any>
 export { instance as axios }
 //# sourceMappingURL=index.d.ts.map

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,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"}
+{"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,kEA+GnB,CAAA;AAQD,OAAO,EAAE,QAAQ,IAAI,KAAK,EAAE,CAAA"}