From 82e494d3082bc199ab1db161567652246dbb7c76 Mon Sep 17 00:00:00 2001
From: cuiwenlong7 <cuiwenlong7@jd.com>
Date: Mon, 20 Dec 2021 17:21:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20select=E5=88=97=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8F=92=E4=BB=B6=E8=B7=9F=E9=9A=8Fbody?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formFields/any/index.tsx             | 2 +-
 src/components/formFields/datetime/index.tsx        | 8 ++++----
 src/components/formFields/datetimeRange/index.tsx   | 8 ++++----
 src/components/formFields/select/multiple/index.tsx | 2 +-
 src/components/formFields/select/single/index.tsx   | 2 +-
 src/steps/table/index.tsx                           | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/formFields/any/index.tsx b/src/components/formFields/any/index.tsx
index 939ec22..76f33c5 100644
--- a/src/components/formFields/any/index.tsx
+++ b/src/components/formFields/any/index.tsx
@@ -18,7 +18,7 @@ export default class AnyFieldComponent extends AnyField {
       <Select
         value={props.type}
         onChange={(type) => props.onChange(type)}
-        getPopupContainer={() => document.getElementById('ccms-antd') || document.body}
+        getPopupContainer={(ele) =>  ele.parentElement || document.body}
       >
         <Select.Option value="null">空</Select.Option>
         <Select.Option value="string">字符串</Select.Option>
diff --git a/src/components/formFields/datetime/index.tsx b/src/components/formFields/datetime/index.tsx
index b71cd06..ed869fa 100644
--- a/src/components/formFields/datetime/index.tsx
+++ b/src/components/formFields/datetime/index.tsx
@@ -21,7 +21,7 @@ export default class DatetimeFieldComponent extends DatetimeField {
           locale={pickerLocale}
           placeholder={placeholder}
           onChange={async (time) => await props.onChange(time)}
-          getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+          getPopupContainer={(ele) => ele.parentElement || document.body}
         />
       )
     } else if (mode === 'date') {
@@ -33,7 +33,7 @@ export default class DatetimeFieldComponent extends DatetimeField {
           locale={pickerLocale}
           placeholder={placeholder}
           onChange={async (time) => await props.onChange(time)}
-          getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+          getPopupContainer={(ele) => ele.parentElement || document.body}
         />
       )
     } else if (mode === 'datetime') {
@@ -46,7 +46,7 @@ export default class DatetimeFieldComponent extends DatetimeField {
           placeholder={placeholder}
           showTime={true}
           onChange={async (time) => await props.onChange(time)}
-          getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+          getPopupContainer={(ele) => ele.parentElement || document.body}
         />
       )
     } else {
@@ -59,7 +59,7 @@ export default class DatetimeFieldComponent extends DatetimeField {
           locale={pickerLocale}
           placeholder={placeholder}
           onChange={async (time) => await props.onChange(time)}
-          getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+          getPopupContainer={(ele) => ele.parentElement || document.body}
         />)
     }
   }
diff --git a/src/components/formFields/datetimeRange/index.tsx b/src/components/formFields/datetimeRange/index.tsx
index f89852c..410245e 100644
--- a/src/components/formFields/datetimeRange/index.tsx
+++ b/src/components/formFields/datetimeRange/index.tsx
@@ -26,7 +26,7 @@ export default class DatetimeRangeFieldComponent extends DatetimeRangeField {
           format={props.format}
           locale={pickerLocale}
           onChange={async (time) => await props.onChange(time ? [time[0] as moment.Moment, time[1] as moment.Moment] : [undefined, undefined])}
-          getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+          getPopupContainer={(ele) => ele.parentElement || document.body}
         />
       )
     } else if (mode === 'date') {
@@ -37,7 +37,7 @@ export default class DatetimeRangeFieldComponent extends DatetimeRangeField {
           format={props.format}
           locale={pickerLocale}
           onChange={async (time) => await props.onChange(time ? [time[0] as moment.Moment, time[1] as moment.Moment] : [undefined, undefined])}
-          getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+          getPopupContainer={(ele) => ele.parentElement || document.body}
         />
       )
     } else if (mode === 'datetime') {
@@ -49,7 +49,7 @@ export default class DatetimeRangeFieldComponent extends DatetimeRangeField {
           locale={pickerLocale}
           showTime={true}
           onChange={async (time) => await props.onChange(time ? [time[0] as moment.Moment, time[1] as moment.Moment] : [undefined, undefined])}
-          getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+          getPopupContainer={(ele) => ele.parentElement || document.body}
         />
       )
     } else {
@@ -61,7 +61,7 @@ export default class DatetimeRangeFieldComponent extends DatetimeRangeField {
           picker={mode}
           locale={pickerLocale}
           onChange={async (time) => await props.onChange(time ? [time[0] as moment.Moment, time[1] as moment.Moment] : [undefined, undefined])}
-          getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+          getPopupContainer={(ele) => ele.parentElement || document.body}
         />
       )
     }
diff --git a/src/components/formFields/select/multiple/index.tsx b/src/components/formFields/select/multiple/index.tsx
index 09874a7..26a2d0d 100644
--- a/src/components/formFields/select/multiple/index.tsx
+++ b/src/components/formFields/select/multiple/index.tsx
@@ -18,7 +18,7 @@ export default class SelectSingleFieldComponent extends SelectMultipleField {
     
     return (
       <Select
-        getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+        getPopupContainer={(ele) => ele.parentElement || document.body}
         disabled={disabled}
         placeholder={placeholder}
         value={value}
diff --git a/src/components/formFields/select/single/index.tsx b/src/components/formFields/select/single/index.tsx
index 9317466..5f2ad85 100644
--- a/src/components/formFields/select/single/index.tsx
+++ b/src/components/formFields/select/single/index.tsx
@@ -18,7 +18,7 @@ export default class SelectSingleFieldComponent extends SelectSingleField {
 
     return (
       <Select
-        getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+        getPopupContainer={(ele) => ele.parentElement || document.body}
         disabled={disabled}
         placeholder={placeholder}
         value={value as any}
diff --git a/src/steps/table/index.tsx b/src/steps/table/index.tsx
index 6c2e350..0c3995c 100644
--- a/src/steps/table/index.tsx
+++ b/src/steps/table/index.tsx
@@ -97,7 +97,7 @@ export default class TableStepComponent extends TableStep {
     } = props
     return (
       <Dropdown
-        getPopupContainer={(node) => document.getElementById('ccms-antd') || node.parentElement || document.body}
+        getPopupContainer={(node) => node.parentElement || document.body}
         overlay={(
           <Menu>
             {children}
@@ -159,7 +159,7 @@ export default class TableStepComponent extends TableStep {
 
     return (
       <Dropdown
-        getPopupContainer={(ele) => document.getElementById('ccms-antd') || ele.parentElement || document.body}
+        getPopupContainer={(ele) => ele.parentElement || document.body}
         overlay={(
           <Menu>
             {children}
-- 
Gitee


From 02c6ddb035004fea7413de8ef4b631cdcd230b15 Mon Sep 17 00:00:00 2001
From: cuiwenlong7 <cuiwenlong7@jd.com>
Date: Tue, 21 Dec 2021 18:10:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20formItem=E5=BC=82=E5=B8=B8=E4=B8=8B?=
 =?UTF-8?q?=E8=BE=B9=E8=B7=9D=E9=97=AE=E9=A2=98?=
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 e52991c..f00c863 100644
--- a/src/components/formFields/importSubform/index.tsx
+++ b/src/components/formFields/importSubform/index.tsx
@@ -43,7 +43,7 @@ export default class ImportSubformFieldComponent extends ImportSubformField {
       formItemLayout.labelCol = { span: 24 }
       formItemLayout.wrapperCol = { span: 24 }
     } else {
-      formItemLayout.labelCol = { span: 6 }
+      formItemLayout.labelCol = { span: 24 }
       formItemLayout.wrapperCol = { span: 18 }
     }
 
-- 
Gitee