image/tdesign-vue-next-starter
1
0
Fork 1
mirror of https://github.com/Tencent/tdesign-vue-next-starter.git synced 2024-12-23 00:16:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修正接口请求出错进行重试后成功会两次回调且回调数据不一致而导致无法正确处理的问题 (#458)

Browse Source
This commit is contained in:
PDeer 2023-03-29 14:29:33 +08:00 committed by GitHub
parent 73bca056a7
commit 4293d30180
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request/Axios.ts
View File

@ -93,7 +93,7 @@ export class VAxios {
// 响应错误处理 // 响应错误处理
if (responseInterceptorsCatch && isFunction(responseInterceptorsCatch)) { if (responseInterceptorsCatch && isFunction(responseInterceptorsCatch)) {
this.instance.interceptors.response.use(undefined, responseInterceptorsCatch); this.instance.interceptors.response.use(undefined, (error) => responseInterceptorsCatch(error, this.instance));
} }
} }

4
src/utils/request/AxiosTransform.ts
View File

@ -1,4 +1,4 @@
import type { AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse } from 'axios'; import type { AxiosRequestConfig, InternalAxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios';
import { AxiosError } from 'axios'; import { AxiosError } from 'axios';
import type { RequestOptions, Result } from '@/types/axios'; import type { RequestOptions, Result } from '@/types/axios';
@ -33,5 +33,5 @@ export abstract class AxiosTransform {
requestInterceptorsCatch?: (error: AxiosError) => void; requestInterceptorsCatch?: (error: AxiosError) => void;
// 请求后的拦截器错误处理 // 请求后的拦截器错误处理
responseInterceptorsCatch?: (error: AxiosError) => void; responseInterceptorsCatch?: (error: AxiosError, instance: AxiosInstance) => void;
} }

6
src/utils/request/index.ts
View File

@ -1,7 +1,7 @@
// axios配置 可自行根据项目进行更改，只需更改该文件即可，其他文件可以不动 // axios配置 可自行根据项目进行更改，只需更改该文件即可，其他文件可以不动
import isString from 'lodash/isString'; import isString from 'lodash/isString';
import merge from 'lodash/merge'; import merge from 'lodash/merge';
import type { InternalAxiosRequestConfig } from 'axios'; import type { AxiosInstance, InternalAxiosRequestConfig } from 'axios';
import type { AxiosTransform, CreateAxiosOptions } from './AxiosTransform'; import type { AxiosTransform, CreateAxiosOptions } from './AxiosTransform';
import { VAxios } from './Axios'; import { VAxios } from './Axios';
import { joinTimestamp, formatRequestDate, setObjToUrlParams } from './utils'; import { joinTimestamp, formatRequestDate, setObjToUrlParams } from './utils';
@ -127,7 +127,7 @@ const transform: AxiosTransform = {
}, },
// 响应错误处理 // 响应错误处理
responseInterceptorsCatch: (error: any) => { responseInterceptorsCatch: (error: any, instance: AxiosInstance) => {
const { config } = error; const { config } = error;
if (!config || !config.requestOptions.retry) return Promise.reject(error); if (!config || !config.requestOptions.retry) return Promise.reject(error);
@ -143,7 +143,7 @@ const transform: AxiosTransform = {
}, config.requestOptions.retry.delay || 1); }, config.requestOptions.retry.delay || 1);
}); });
config.headers = { ...config.headers, 'Content-Type': ContentTypeEnum.Json }; config.headers = { ...config.headers, 'Content-Type': ContentTypeEnum.Json };
return backoff.then((config) => request.request(config)); return backoff.then((config) => instance.request(config));
}, },
}; };