merge master

components/apolloTable/component/base/edit/search/index.less

@@ -8,8 +8,15 @@
         border-radius: 0;
         display: flex;
         align-items: center;
+        height: auto;
     }
     :global(.ant-select-selection__rendered) {
         width: 100%;
     }
 }
+.searchDropdown {
+    overflow: auto;
+    :global(.ant-select-dropdown-menu) {
+        max-height: none;
+    }
+}

components/apolloTable/component/base/edit/search/index.tsx

@@ -7,7 +7,7 @@ import { onBlurFn } from '../onBlurFn';
 import s from './index.less';
 
 export const ApolloSearch = (props: ApolloSearchProps) => {
-    const { onChange, maxCount, isMultiple, request } = props;
+    const { onChange, maxCount, isMultiple, request, maxPopHeight } = props;
     const selfProps = antiAssign(props, [
         'columnConfig',
         'onChange',
@@ -19,6 +19,7 @@ export const ApolloSearch = (props: ApolloSearchProps) => {
         'tableId',
         'cellRenderProps',
         'getCalendarContainer',
+        'maxPopHeight',
     ]);
     const isOpen: any = useRef();
     if (isMultiple) {
@@ -56,6 +57,10 @@ export const ApolloSearch = (props: ApolloSearchProps) => {
             onDropdownVisibleChange={selfProps.mode === 'multiple' ? multipleBlurFn : singleBlurFn}
             onChange={changeValue}
             initDataType="onfocus"
+            dropdownClassName={s.searchDropdown}
+            dropdownStyle={{
+                maxHeight: maxPopHeight,
+            }}
         />
     );
 };

components/apolloTable/component/base/edit/select/index.tsx

@@ -47,6 +47,7 @@ export const ApolloSelect = (props: ApolloSelectProps) => {
             {...selfProps}
             onChange={changeValue}
             onDropdownVisibleChange={selfProps.mode === 'multiple' ? multipleBlurFn : singleBlurFn}
+            dropdownClassName={styles.selectDropdown}
             dropdownStyle={{
                 maxHeight: maxPopHeight,
             }}

components/apolloTable/component/base/edit/select/styles.less

@@ -18,3 +18,9 @@
         align-items: center;
     }
 }
+.selectDropdown{
+    overflow: auto;
+    :global(.ant-select-dropdown-menu) {
+        max-height: none;
+    }
+}

components/apolloTable/component/base/extra/associationSearch/index.tsx

@@ -227,7 +227,7 @@ class AssociationSearch extends React.Component<Props, State> {
 
     render() {
         const { data, value } = this.state;
-        const { selfCom, autoFocus, onChange, maxPopHeight, ...rest } = this.props;
+        const { selfCom, autoFocus, onChange, ...rest } = this.props;
         return (
             <Consumer>
                 {({ locale }: any) => {
@@ -243,9 +243,6 @@ class AssociationSearch extends React.Component<Props, State> {
                             onChange={this.handleChange}
                             onFocus={this.onFocus}
                             onBlur={this.onBlur}
-                            dropdownStyle={{
-                                maxHeight: maxPopHeight,
-                            }}
                         >
                             {data.map((d: any) => {
                                 return (

components/apolloTable/editFormV3/index.tsx

@@ -92,22 +92,8 @@ class FormWrap extends Component {
     };
 
     validateRequired = (item, rule, value, callback) => {
-        if (!item.requiredFlag) {
-            return callback();
-        }
-        if (!value) {
-            return callback('必填项不能为空');
-        }
-        if (Array.isArray(value)) {
-            if (value.length === 0) {
-                return callback('必填项不能为空');
-            }
-            const [first] = value;
-            if (!first.text && first.text !== 0 && !first.value && first.value !== 0) {
-                return callback('必填项不能为空');
-            }
-        }
-        if (typeof value === 'object') {
+        // 可输可选组件清空时数据格式有问题，单独处理一下
+        if (item.requiredFlag && Number(item.columnType) === 15 && typeof value === 'object') {
             if (
                 !value.label
                 && value.label !== 0