From 71adc685b17bb35b3d54ec2ef633a4a893a61c2a Mon Sep 17 00:00:00 2001
From: cuiwenlong7 <cuiwenlong7@jd.com>
Date: Tue, 14 Dec 2021 18:21:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=EF=BC=9A=E9=85=8D=E7=BD=AEwithConfig?=
 =?UTF-8?q?=E5=90=8E=E5=88=9D=E5=A7=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formFields/importSubform/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/formFields/importSubform/index.tsx b/src/components/formFields/importSubform/index.tsx
index 6e0fc46..df98fc6 100644
--- a/src/components/formFields/importSubform/index.tsx
+++ b/src/components/formFields/importSubform/index.tsx
@@ -159,7 +159,7 @@ export default class ImportSubformField extends Field<ImportSubformFieldConfig,
         }
         value = await formField.set(value)
         if (source !== value) {
-          this.props.onValueSet(formFieldConfig.field, value, true)
+          this.props.onValueSet(this.getFullpath(formFieldConfig.field), value, true)
         }
         
         if (value !== undefined) {
-- 
Gitee


From 7e013452ab41d8f9c7245496d83a0408f9468e33 Mon Sep 17 00:00:00 2001
From: cuiwenlong7 <cuiwenlong7@jd.com>
Date: Tue, 14 Dec 2021 18:43:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20getFullpath=E8=A6=86=E7=9B=96?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formFields/importSubform/index.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/formFields/importSubform/index.tsx b/src/components/formFields/importSubform/index.tsx
index df98fc6..594e20a 100644
--- a/src/components/formFields/importSubform/index.tsx
+++ b/src/components/formFields/importSubform/index.tsx
@@ -83,15 +83,15 @@ export default class ImportSubformField extends Field<ImportSubformFieldConfig,
         const formField = this.formFields[formFieldIndex]
         if (formField) {
           const value = await formField.get()
-          data = setValue(data, formFieldConfig.field, value)
+          data = setValue(data, this.getFullpath(formFieldConfig.field), value)
         }
       }
     }
 
     if (this.props.config.withConfig?.enable && this.props.config.withConfig?.dataField && this.props.config.withConfig?.configField) {
-      const { dataField, configField} = this.props.config.withConfig
+      const { configField } = this.props.config.withConfig
       return {
-        [dataField]: data,
+        ...data,
         [configField]: this.state.fields
       }
     }
@@ -152,7 +152,7 @@ export default class ImportSubformField extends Field<ImportSubformFieldConfig,
       if (formField) {
         const formFieldConfig = this.state.fields[formFieldIndex]
 
-        let value = getValue(this.props.value, formFieldConfig.field)
+        let value = getValue(this.props.value, this.getFullpath(formFieldConfig.field))
         const source = value
         if ((formFieldConfig.defaultValue) && value === undefined) {
           value = await formField.reset()
-- 
Gitee