fix: useRequest plugin onFinally prevent after cancel

alibaba · Nov 23, 2021 · 277ebbf · 277ebbf
1 parent ea9155a
commit 277ebbf
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/packages/hooks/src/useRequest/src/Fetch.ts b/packages/hooks/src/useRequest/src/Fetch.ts
@@ -93,7 +93,10 @@ export default class Fetch<TData, TParams extends any[]> {
       this.runPluginHandler('onSuccess', res, params);
 
       this.options.onFinally?.(params, res, undefined);
-      this.runPluginHandler('onFinally', params, res, undefined);
+
+      if (currentCount === this.count) {
+        this.runPluginHandler('onFinally', params, res, undefined);
+      }
 
       return res;
     } catch (error) {
@@ -111,7 +114,10 @@ export default class Fetch<TData, TParams extends any[]> {
       this.runPluginHandler('onError', error, params);
 
       this.options.onFinally?.(params, undefined, error);
-      this.runPluginHandler('onFinally', params, undefined, error);
+
+      if (currentCount === this.count) {
+        this.runPluginHandler('onFinally', params, undefined, error);
+      }
 
       throw error;
     }