|
@@ -18,6 +18,7 @@ import { useI18n } from '/@/hooks/web/useI18n';
|
|
|
import { joinTimestamp, formatRequestDate } from './helper';
|
|
|
import { useUserStoreWithOut } from '/@/store/modules/user';
|
|
|
import { AxiosRetry } from '/@/utils/http/axios/axiosRetry';
|
|
|
+import axios from 'axios';
|
|
|
|
|
|
const globSetting = useGlobSetting();
|
|
|
const urlPrefix = globSetting.urlPrefix;
|
|
@@ -111,7 +112,11 @@ const transform: AxiosTransform = {
|
|
|
} else {
|
|
|
if (!isString(params)) {
|
|
|
formatDate && formatRequestDate(params);
|
|
|
- if (Reflect.has(config, 'data') && config.data && (Object.keys(config.data).length > 0 || config.data instanceof FormData)) {
|
|
|
+ if (
|
|
|
+ Reflect.has(config, 'data') &&
|
|
|
+ config.data &&
|
|
|
+ (Object.keys(config.data).length > 0 || config.data instanceof FormData)
|
|
|
+ ) {
|
|
|
config.data = data;
|
|
|
config.params = params;
|
|
|
} else {
|
|
@@ -169,6 +174,10 @@ const transform: AxiosTransform = {
|
|
|
const err: string = error?.toString?.() ?? '';
|
|
|
let errMessage = '';
|
|
|
|
|
|
+ if (axios.isCancel(error)) {
|
|
|
+ return Promise.reject(error);
|
|
|
+ }
|
|
|
+
|
|
|
try {
|
|
|
if (code === 'ECONNABORTED' && message.indexOf('timeout') !== -1) {
|
|
|
errMessage = t('sys.api.apiTimeoutMessage');
|