diff --git a/components/apolloTable/component/base/extra/dataEntry/textSelect/styles.less b/components/apolloTable/component/base/extra/dataEntry/textSelect/styles.less
index 092e7da9eb4fc0b6e6cb36027a158cd7dc55f678..2c205e51f835c021509f9ae5052ae688eda085d0 100644
--- a/components/apolloTable/component/base/extra/dataEntry/textSelect/styles.less
+++ b/components/apolloTable/component/base/extra/dataEntry/textSelect/styles.less
@@ -5,7 +5,7 @@
 }
 .overlayClassName {
     max-height: 300px;
-    //overflow: auto;
+    overflow: auto;
     margin-top: 20px;
     :global(.ant-dropdown-menu) {
         width: auto !important;
diff --git a/components/apolloTable/editFormV3/index.tsx b/components/apolloTable/editFormV3/index.tsx
index dbd8b724a05e283ff6071e525abbd884003f32c2..f0f96db1fef6dee3b7298d756084e1885c9ded89 100644
--- a/components/apolloTable/editFormV3/index.tsx
+++ b/components/apolloTable/editFormV3/index.tsx
@@ -22,6 +22,7 @@ import _ from 'lodash';
 const FormItem = Form.Item;
 
 class FormWrap extends Component {
+    wrapDom:any;
     handleSubmit = (e) => {
         e.preventDefault();
         e.stopPropagation();
@@ -129,6 +130,12 @@ class FormWrap extends Component {
                         origin="editForm"
                         form={this.props.form}
                         getInstanceDetail={getInstanceDetail}
+                        getCalendarContainer={() => {
+                            return this.wrapDom;
+                        }}
+                        getPopupContainer={() => {
+                            return this.wrapDom;
+                        }}
                     />,
                 )}
             </FormItem>