[use] 修复 useRequest 使用了 resetOnExecute: false 并请求失败后, response …

…和 `data` 未重置的问题
MoomFE · Oct 23, 2024 · 007896c · 007896c
1 parent 08ed711
commit 007896c
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## [Unreleased]
+  - 🐞 [@mixte/use] 修复 `useRequest` 使用了 `resetOnExecute: false` 并请求失败后, `response` 和 `data` 未重置的问题
 
 ## [v2.5.0-beta.1]
   - 📅 2024-08-19

diff --git a/packages/use/src/useRequest/index.test.ts b/packages/use/src/useRequest/index.test.ts
@@ -716,14 +716,14 @@ describe.concurrent('useRequest', () => {
 
         await expect(() => result).rejects.toThrow('???');
 
-        expect(data.response.value).toStrictEqual({ data: 1294 });
-        expect(data.data.value).toBe(1294);
+        expect(data.response.value).toBeUndefined();
+        expect(data.data.value).toBeUndefined();
         expect(data.error.value).toStrictEqual(new Error('???'));
 
         result = data.execute();
 
-        expect(data.response.value).toStrictEqual({ data: 1294 });
-        expect(data.data.value).toBe(1294);
+        expect(data.response.value).toBeUndefined();
+        expect(data.data.value).toBeUndefined();
         expect(data.error.value).toStrictEqual(new Error('???'));
 
         await expect(() => result).rejects.toThrow('???');
@@ -787,14 +787,14 @@ describe.concurrent('useRequest', () => {
 
             await expect(() => result).rejects.toThrow('???');
 
-            expect(data.response.value).toStrictEqual({ data: 1294 });
-            expect(data.data.value).toBe(1294);
+            expect(data.response.value).toBeUndefined();
+            expect(data.data.value).toBeUndefined();
             expect(data.error.value).toStrictEqual(new Error('???'));
 
             result = data.execute();
 
-            expect(data.response.value).toStrictEqual({ data: 1294 });
-            expect(data.data.value).toBe(1294);
+            expect(data.response.value).toBeUndefined();
+            expect(data.data.value).toBeUndefined();
             expect(data.error.value).toStrictEqual(new Error('???'));
 
             await expect(() => result).rejects.toThrow('???');
@@ -910,14 +910,14 @@ describe.concurrent('useRequest', () => {
 
             await expect(() => result).rejects.toThrow('???');
 
-            expect(data.response.value).toStrictEqual({ data: 1294 });
-            expect(data.data.value).toBe(1294);
+            expect(data.response.value).toBeUndefined();
+            expect(data.data.value).toBeUndefined();
             expect(data.error.value).toStrictEqual(new Error('???'));
 
             result = data.execute();
 
-            expect(data.response.value).toStrictEqual({ data: 1294 });
-            expect(data.data.value).toBe(1294);
+            expect(data.response.value).toBeUndefined();
+            expect(data.data.value).toBeUndefined();
             expect(data.error.value).toStrictEqual(new Error('???'));
 
             await expect(() => result).rejects.toThrow('???');

diff --git a/packages/use/src/useRequest/index.ts b/packages/use/src/useRequest/index.ts
@@ -115,10 +115,13 @@ export function useRequest<
       if (currentExecuteCount !== executeCount)
         throw e;
 
+      response.value = undefined;
+      data.value = undefined;
+      error.value = e;
+
       isLoading.value = false;
       isFinished.value = true;
       isSuccess.value = false;
-      error.value = e;
       errorEvent.trigger(e);
       finallyEvent.trigger();
       throw e;