diff --git a/components/apolloTable/component/base/edit/editInterface.tsx b/components/apolloTable/component/base/edit/editInterface.tsx index 669908305933bbde1a3a352ae7c8ad3b75fe3dfe..48bd8864dcf8d3e6709ab153c0b6b3b71a91ad60 100644 --- a/components/apolloTable/component/base/edit/editInterface.tsx +++ b/components/apolloTable/component/base/edit/editInterface.tsx @@ -40,6 +40,7 @@ export interface ApolloInputSearchProps extends SelectProps, CommonProps { export interface ApolloSelectProps extends SelectProps, CommonProps { isMultiple?: boolean; options?: any[]; + maxPopHeight?:boolean; } export interface ApolloNumberProps extends InputNumberProps, CommonProps {} export interface ApolloCheckboxProps extends CheckboxProps, CommonProps { diff --git a/components/apolloTable/component/base/edit/search/index.less b/components/apolloTable/component/base/edit/search/index.less index af0f82d60a3254e136440190e022e0a45d0abb1f..0b0908b5be956342972621038b63bf95783e0a60 100644 --- a/components/apolloTable/component/base/edit/search/index.less +++ b/components/apolloTable/component/base/edit/search/index.less @@ -1,6 +1,7 @@ .search { width: 100%; - height: 100%; + //height: 100%; + display: flex; :global(.ant-select-selection) { width: 100%; min-height: 100%; @@ -8,7 +9,7 @@ display: flex; align-items: center; } - :global(.ant-select-selection__rendered){ + :global(.ant-select-selection__rendered) { width: 100%; } } diff --git a/components/apolloTable/component/base/edit/search/index.tsx b/components/apolloTable/component/base/edit/search/index.tsx index 2dc9bcad0c5833a25c3c020d1aee63e63e19748a..e454a328ecbde4cc6056d63a60c03c1af2fcec8d 100644 --- a/components/apolloTable/component/base/edit/search/index.tsx +++ b/components/apolloTable/component/base/edit/search/index.tsx @@ -7,9 +7,9 @@ import { onBlurFn } from '../onBlurFn'; import s from './index.less'; export const ApolloSearch = (props: ApolloSearchProps) => { - const { onChange, maxCount, isMultiple, request, origin } = props; + const { onChange, maxCount, isMultiple, request } = props; const selfProps = antiAssign(props, ['columnConfig', 'onChange', 'isMultiple', 'options', 'request', 'maxCount']); - const isOpen = useRef(); + const isOpen: any = useRef(); if (isMultiple) { selfProps.mode = 'multiple'; } @@ -35,23 +35,16 @@ export const ApolloSearch = (props: ApolloSearchProps) => { onBlurFn(props); } }; + return ( - origin === 'editForm' ? - : + ); }; diff --git a/components/apolloTable/component/base/edit/select/index.tsx b/components/apolloTable/component/base/edit/select/index.tsx index 5680dfccca7e291a4c3b627f6bd278dd9af9ab47..328a9e88741579c5cd3b90c33933e5aa95f50893 100644 --- a/components/apolloTable/component/base/edit/select/index.tsx +++ b/components/apolloTable/component/base/edit/select/index.tsx @@ -6,7 +6,7 @@ import { antiAssign } from '../../../../utils/utils'; import styles from './styles.less'; export const ApolloSelect = (props: ApolloSelectProps) => { - const { options = [], onChange, isMultiple, origin, maxPopHeight } = props; + const { options = [], onChange, isMultiple, maxPopHeight } = props; const selfProps = antiAssign(props, ['columnConfig', 'onChange', 'isMultiple', 'options', 'maxPopHeight']); const isOpen: any = useRef(); @@ -31,7 +31,7 @@ export const ApolloSelect = (props: ApolloSelectProps) => { } }; - return origin === 'editForm' ? ( + return ( - ) : ( - ); }; diff --git a/components/apolloTable/component/base/edit/select/styles.less b/components/apolloTable/component/base/edit/select/styles.less index 20aca23a9c99b915a02c9f28eb6697beba646387..ed123d1a7341958c76fbf05f0d51286b846daca1 100644 --- a/components/apolloTable/component/base/edit/select/styles.less +++ b/components/apolloTable/component/base/edit/select/styles.less @@ -1,18 +1,20 @@ .select { width: 100%; - height: 100%; + display: flex; :global(.ant-select-selector) { height: 100% !important; align-items: center; } :global(.ant-select-selection) { width: 100%; - min-height: 100%; + height: auto; border-radius: 0; display: flex; align-items: center; } - :global(.ant-select-selection__rendered){ + :global(.ant-select-selection__rendered) { width: 100%; + display: flex; + align-items: center; } } diff --git a/components/apolloTable/component/base/extra/associationSearch/index.less b/components/apolloTable/component/base/extra/associationSearch/index.less deleted file mode 100644 index a4901bf6aa80014146c06bc39a00573196aa6a32..0000000000000000000000000000000000000000 --- a/components/apolloTable/component/base/extra/associationSearch/index.less +++ /dev/null @@ -1,10 +0,0 @@ -.searchContainer { - width: 100%; - height: 100%; - :global(.ant-select-selection__rendered) { - width: 100%; - } - :global(.ant-select-selection) { - min-height: 100%; - } -} diff --git a/components/apolloTable/component/base/extra/dataEntry/readme.md b/components/apolloTable/component/base/extra/dataEntry/readme.md deleted file mode 100644 index 0eb58a687a67c0d05c7c801ee141bf67942154f8..0000000000000000000000000000000000000000 --- a/components/apolloTable/component/base/extra/dataEntry/readme.md +++ /dev/null @@ -1 +0,0 @@ -## 此组件用于组合数据录入空间几何 \ No newline at end of file