feat(core): support disable forceClear to clearFormGraph (#3122)

alibaba · May 12, 2022 · d24168b · d24168b
1 parent 9eb7306
commit d24168b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/packages/core/src/__tests__/form.spec.ts b/packages/core/src/__tests__/form.spec.ts
@@ -1597,3 +1597,21 @@ test('form clearFormGraph need clear field values', () => {
   form.clearFormGraph('*')
   expect(form.values.aa).toBeUndefined()
 })
+
+test('form clearFormGraph not clear field values', () => {
+  const form = attach(
+    createForm({
+      values: {
+        aa: '123',
+      },
+    })
+  )
+  attach(
+    form.createField({
+      name: 'aa',
+    })
+  )
+  expect(form.values.aa).toEqual('123')
+  form.clearFormGraph('*', false)
+  expect(form.values.aa).toEqual('123')
+})
diff --git a/packages/core/src/models/Form.ts b/packages/core/src/models/Form.ts
@@ -593,9 +593,9 @@ export class Form<ValueType extends object = any> {
     this.graph.setGraph(graph)
   }
 
-  clearFormGraph = (pattern: FormPathPattern = '*') => {
+  clearFormGraph = (pattern: FormPathPattern = '*', forceClear = true) => {
     this.query(pattern).forEach((field) => {
-      field.destroy()
+      field.destroy(forceClear)
     })
   }