fix(core): fix reset logic for ArrayField/ObjectField

alibaba · Apr 21, 2021 · 909c590 · 909c590
1 parent 5e6be78
commit 909c590
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 1 deletion.
diff --git a/packages/core/src/__tests__/form.spec.ts b/packages/core/src/__tests__/form.spec.ts
@@ -854,3 +854,53 @@ test('devtools', () => {
   const form = attach(createForm())
   form.onUnmount()
 })
+
+test('reset array field', async () => {
+  const form = attach(
+    createForm({
+      values: {
+        array: [{ value: 123 }],
+      },
+    })
+  )
+  attach(
+    form.createArrayField({
+      name: 'array',
+      required: true,
+    })
+  )
+  expect(form.values).toEqual({
+    array: [{ value: 123 }],
+  })
+  await form.reset('*', {
+    forceClear: true,
+  })
+  expect(form.values).toEqual({
+    array: [],
+  })
+})
+
+test('reset object field', async () => {
+  const form = attach(
+    createForm({
+      values: {
+        object: { value: 123 },
+      },
+    })
+  )
+  attach(
+    form.createObjectField({
+      name: 'object',
+      required: true,
+    })
+  )
+  expect(form.values).toEqual({
+    object: { value: 123 },
+  })
+  await form.reset('*', {
+    forceClear: true,
+  })
+  expect(form.values).toEqual({
+    object: {},
+  })
+})
diff --git a/packages/core/src/models/Field.ts b/packages/core/src/models/Field.ts
@@ -55,6 +55,8 @@ import {
   modelStateGetter,
   isHTMLInputEvent,
   initFieldValue,
+  isArrayField,
+  isObjectField,
 } from '../shared'
 import { Query } from './Query'
 
@@ -747,7 +749,13 @@ export class Field<
     this.inputValue = undefined
     this.inputValues = []
     if (options?.forceClear) {
-      this.value = undefined
+      if (isArrayField(this)) {
+        this.value = [] as any
+      } else if (isObjectField(this)) {
+        this.value = {} as any
+      } else {
+        this.value = undefined
+      }
     } else {
       this.value = this.initialValue
     }