From d7b0c15619e89d31c74f8db7a680b4c6a0009add Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期五, 09 八月 2024 16:51:34 +0800
Subject: [PATCH] 工艺路线行为上料选择更新
---
src/utils/http/axios/Axios.ts | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts
index 38b9a59..fe226a0 100644
--- a/src/utils/http/axios/Axios.ts
+++ b/src/utils/http/axios/Axios.ts
@@ -5,14 +5,14 @@
AxiosError,
InternalAxiosRequestConfig,
} from 'axios';
-import type { RequestOptions, Result, UploadFileParams } from '/#/axios';
+import type { RequestOptions, Result, UploadFileParams } from '#/axios';
import type { CreateAxiosOptions } from './axiosTransform';
import axios from 'axios';
import qs from 'qs';
import { AxiosCanceler } from './axiosCancel';
-import { isFunction } from '/@/utils/is';
+import { isFunction } from '@/utils/is';
import { cloneDeep } from 'lodash-es';
-import { ContentTypeEnum, RequestEnum } from '/@/enums/httpEnum';
+import { ContentTypeEnum, RequestEnum } from '@/enums/httpEnum';
export * from './axiosTransform';
@@ -89,7 +89,8 @@
// Request interceptor configuration processing
this.axiosInstance.interceptors.request.use((config: InternalAxiosRequestConfig) => {
// If cancel repeat request is turned on, then cancel repeat request is prohibited
- const { requestOptions } = this.options;
+ const requestOptions =
+ (config as unknown as any).requestOptions ?? this.options.requestOptions;
const ignoreCancelToken = requestOptions?.ignoreCancelToken ?? true;
!ignoreCancelToken && axiosCanceler.addPending(config);
@@ -203,6 +204,10 @@
conf.cancelToken = config.cancelToken;
}
+ if (config.signal) {
+ conf.signal = config.signal;
+ }
+
const transform = this.getTransform();
const { requestOptions } = this.options;
--
Gitblit v1.9.3