瀏覽代碼

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

leo 1 年之前
父節點
當前提交
b43fe7adbc
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      src/utils/http/axios/Axios.ts

+ 6 - 2
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();