fix(core): fix array remove can not auto clean initialValue (#2638)

* test(core): add some tests * fix(core): fix array remove can not auto clean initialValue
alibaba · Dec 17, 2021 · 2e6db17 · 2e6db17
1 parent fe10bfd
commit 2e6db17
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/packages/core/src/__tests__/array.spec.ts b/packages/core/src/__tests__/array.spec.ts
@@ -522,6 +522,7 @@ test('nest array remove', async () => {
   expect(form.fields['metrics.0.content.0.attr']).not.toBeUndefined()
   await metrics.remove(1)
   expect(form.fields['metrics.0.content.0.attr']).not.toBeUndefined()
+  expect(form.initialValues.metrics?.[1]?.content?.[0]?.attr).toBeUndefined()
 })
 
 test('incomplete insertion of array elements', async () => {

diff --git a/packages/core/src/models/BaseField.ts b/packages/core/src/models/BaseField.ts
@@ -7,7 +7,7 @@ import {
   FieldDecorator,
   FieldComponent,
 } from '../types'
-import { buildNodeIndexes, initFieldUpdate } from '../shared/internals'
+import { buildNodeIndexes, destroy, initFieldUpdate } from '../shared/internals'
 import { Form } from './Form'
 import { Query } from './Query'
 
@@ -282,8 +282,7 @@ export class BaseField<Decorator = any, Component = any, TextType = any> {
   }
 
   destroy = () => {
-    this.dispose()
-    delete this.form.fields[this.address.toString()]
+    destroy(this.form.fields, this.address.toString())
   }
 
   match = (pattern: FormPathPattern) => {

diff --git a/packages/core/src/shared/internals.ts b/packages/core/src/shared/internals.ts
@@ -150,8 +150,7 @@ export const patchFieldStates = (
 ) => {
   patches.forEach(({ type, address, oldAddress, payload }) => {
     if (type === 'remove') {
-      target[address]?.dispose()
-      delete target[address]
+      destroy(target, address)
     } else if (type === 'update') {
       if (payload) {
         target[address] = payload
@@ -164,6 +163,14 @@ export const patchFieldStates = (
   })
 }
 
+export const destroy = (
+  target: Record<string, GeneralField>,
+  address: string
+) => {
+  target[address]?.dispose()
+  delete target[address]
+}
+
 export const patchFormValues = (
   form: Form,
   path: Array<string | number>,
@@ -333,7 +340,8 @@ export const spliceArrayState = (
   }
   const address = field.address.toString()
   const addrLength = address.length
-  const fields = field.form.fields
+  const form = field.form
+  const fields = form.fields
   const fieldPatches: INodePatch<GeneralField>[] = []
   const offset = insertCount - deleteCount
   const isArrayChildren = (identifier: string) => {
@@ -389,6 +397,9 @@ export const spliceArrayState = (
           })
         }
         if (isInsertNode(identifier) || isDeleteNode(identifier)) {
+          if (isDataField(field)) {
+            form.deleteInitialValuesIn(field.path)
+          }
           fieldPatches.push({ type: 'remove', address: identifier })
         }
       }