fix(axios): get等方法配置ignoreCancelToken无效 (#3040)

vbenjs · Sep 18, 2023 · b43fe7a · b43fe7a
1 parent 4aaddef
commit b43fe7a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts
@@ -88,8 +88,8 @@ export class VAxios {
 
     // 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;
+      // If cancel repeat request is turned on, then cancel repeat request is prohibited     
+      const requestOptions =  (config as unknown as any).requestOptions ?? this.options.requestOptions;
       const ignoreCancelToken = requestOptions?.ignoreCancelToken ?? true;
 
       !ignoreCancelToken && axiosCanceler.addPending(config);
@@ -202,6 +202,10 @@ export class VAxios {
     if (config.cancelToken) {
       conf.cancelToken = config.cancelToken;
     }
+
+    if (config.signal) {
+      conf.signal = config.signal;
+    }
 
     const transform = this.getTransform();