diff --git a/package.json b/package.json index f6e5798d39c6be508dabb856b209467556899048..13ad7eeeea2dbef2c65df7b0d2047e3eeb1170d6 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "@vueuse/shared": "^9.13.0", "@zxcvbn-ts/core": "^2.2.1", "ant-design-vue": "^3.2.17", - "axios": "^1.3.4", + "axios": "^1.3.5", "codemirror": "^5.65.12", "cropperjs": "^1.5.13", "crypto-js": "^4.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 651859371420782341073a7de089848f094a2bbc..391416dc116d6e69d03fe8e48c4275c82740e846 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,8 +32,8 @@ importers: specifier: ^3.2.17 version: 3.2.17(vue@3.2.47) axios: - specifier: ^1.3.4 - version: 1.3.4 + specifier: ^1.3.5 + version: 1.3.5 codemirror: specifier: ^5.65.12 version: 5.65.12 @@ -3021,8 +3021,8 @@ packages: - debug dev: true - /axios@1.3.4: - resolution: {integrity: sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==} + /axios@1.3.5: + resolution: {integrity: sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==} dependencies: follow-redirects: 1.15.2(debug@4.3.4) form-data: 4.0.0 diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts index 62730cc2ac403a9ad2708afb698a32707a3fdead..38b9a59efb7a364c68ef2d65230cd75105b0c495 100644 --- a/src/utils/http/axios/Axios.ts +++ b/src/utils/http/axios/Axios.ts @@ -1,4 +1,10 @@ -import type { AxiosRequestConfig, AxiosInstance, AxiosResponse, AxiosError } from 'axios'; +import type { + AxiosRequestConfig, + AxiosInstance, + AxiosResponse, + AxiosError, + InternalAxiosRequestConfig, +} from 'axios'; import type { RequestOptions, Result, UploadFileParams } from '/#/axios'; import type { CreateAxiosOptions } from './axiosTransform'; import axios from 'axios'; @@ -63,7 +69,11 @@ export class VAxios { * @description: Interceptor configuration 拦截器配置 */ private setupInterceptors() { - const transform = this.getTransform(); + // const transform = this.getTransform(); + const { + axiosInstance, + options: { transform }, + } = this; if (!transform) { return; } @@ -77,16 +87,13 @@ export class VAxios { const axiosCanceler = new AxiosCanceler(); // Request interceptor configuration processing - this.axiosInstance.interceptors.request.use((config: AxiosRequestConfig) => { + this.axiosInstance.interceptors.request.use((config: InternalAxiosRequestConfig) => { // If cancel repeat request is turned on, then cancel repeat request is prohibited - // @ts-ignore - const { ignoreCancelToken } = config.requestOptions; - const ignoreCancel = - ignoreCancelToken !== undefined - ? ignoreCancelToken - : this.options.requestOptions?.ignoreCancelToken; - - !ignoreCancel && axiosCanceler.addPending(config); + const { requestOptions } = this.options; + const ignoreCancelToken = requestOptions?.ignoreCancelToken ?? true; + + !ignoreCancelToken && axiosCanceler.addPending(config); + if (requestInterceptors && isFunction(requestInterceptors)) { config = requestInterceptors(config, this.options); } @@ -111,8 +118,7 @@ export class VAxios { responseInterceptorsCatch && isFunction(responseInterceptorsCatch) && this.axiosInstance.interceptors.response.use(undefined, (error) => { - // @ts-ignore - return responseInterceptorsCatch(this.axiosInstance, error); + return responseInterceptorsCatch(axiosInstance, error); }); } diff --git a/src/utils/http/axios/axiosTransform.ts b/src/utils/http/axios/axiosTransform.ts index f65def928f3cc030bc4546e78e8e02db3ca62425..b0cc0afe216dfecc0ae7266c3fd513267779a121 100644 --- a/src/utils/http/axios/axiosTransform.ts +++ b/src/utils/http/axios/axiosTransform.ts @@ -1,7 +1,12 @@ /** * Data processing class, can be configured according to the project */ -import type { AxiosRequestConfig, AxiosResponse } from 'axios'; +import type { + AxiosInstance, + AxiosRequestConfig, + AxiosResponse, + InternalAxiosRequestConfig +} from 'axios'; import type { RequestOptions, Result } from '/#/axios'; export interface CreateAxiosOptions extends AxiosRequestConfig { @@ -12,8 +17,8 @@ export interface CreateAxiosOptions extends AxiosRequestConfig { export abstract class AxiosTransform { /** - * @description: Process configuration before request - * @description: Process configuration before request + * A function that is called before a request is sent. It can modify the request configuration as needed. + * 在发送请求之前调用的函数。它可以根据需要修改请求配置。 */ beforeRequestHook?: (config: AxiosRequestConfig, options: RequestOptions) => AxiosRequestConfig; @@ -31,9 +36,9 @@ export abstract class AxiosTransform { * @description: 请求之前的拦截器 */ requestInterceptors?: ( - config: AxiosRequestConfig, + config: InternalAxiosRequestConfig, options: CreateAxiosOptions, - ) => AxiosRequestConfig; + ) => InternalAxiosRequestConfig; /** * @description: 请求之后的拦截器 @@ -48,5 +53,5 @@ export abstract class AxiosTransform { /** * @description: 请求之后的拦截器错误处理 */ - responseInterceptorsCatch?: (axiosInstance: AxiosResponse, error: Error) => void; + responseInterceptorsCatch?: (axiosInstance: AxiosInstance, error: Error) => void; }