diff --git a/components/apolloTable/component/base/edit/container/index.tsx b/components/apolloTable/component/base/edit/container/index.tsx index 94a0e1060b1d85d27853506249f56a6a829df68b..66384faa6ee37e59c8d396ad66635a34dd5968e0 100644 --- a/components/apolloTable/component/base/edit/container/index.tsx +++ b/components/apolloTable/component/base/edit/container/index.tsx @@ -22,15 +22,16 @@ export default function CellContainer
(Comp) { }; this.container = React.createRef(); } - static getDerivedStateFromProps(nextProps: any, prevState: any) { - if (JSON.stringify(prevState.propsValue) !== JSON.stringify(nextProps.value)) { - return { - propsValue: nextProps.value, - value: nextProps.value, - }; - } - return null; - } + // 编辑单元格实时更新 + // static getDerivedStateFromProps(nextProps: any, prevState: any) { + // if (JSON.stringify(prevState.propsValue) !== JSON.stringify(nextProps.value)) { + // return { + // propsValue: nextProps.value, + // value: nextProps.value, + // }; + // } + // return null; + // } componentDidMount(): void { document.addEventListener('click', this.onBlur, false); } diff --git a/components/apolloTable/component/base/edit/input/index.tsx b/components/apolloTable/component/base/edit/input/index.tsx index b20f07482cdcaac34f866a21f6d315fd55fbcdb5..f7f2d65d9921ca86c73fa86a437c74a1f8a4e01c 100644 --- a/components/apolloTable/component/base/edit/input/index.tsx +++ b/components/apolloTable/component/base/edit/input/index.tsx @@ -19,6 +19,7 @@ export const ApolloInput = (props: ApolloInputProps) => { 'maxPopHeight', 'getPopupContainer', 'getCalendarContainer', + 'origin', ]); const [inputVal, setInputVal] = useState(value); useEffect(() => { diff --git a/components/apolloTable/component/base/edit/search/index.less b/components/apolloTable/component/base/edit/search/index.less index a536dd8011889d2b278e8ae593de8a3f8faf1768..0f1ae4ecd10c6c1daf97adacdba2d6be499f94a3 100644 --- a/components/apolloTable/component/base/edit/search/index.less +++ b/components/apolloTable/component/base/edit/search/index.less @@ -13,6 +13,9 @@ :global(.ant-select-selection__rendered) { width: 100%; } + :global(.ant-select-dropdown-menu) { + max-height: none; + } } .searchDropdown { overflow: auto; diff --git a/components/apolloTable/component/base/edit/text-link/index.tsx b/components/apolloTable/component/base/edit/text-link/index.tsx index fa236199c6733de817553a38ad0466f87397a9c0..02d7654808169cf82d04607df2f0e45cf7256b41 100644 --- a/components/apolloTable/component/base/edit/text-link/index.tsx +++ b/components/apolloTable/component/base/edit/text-link/index.tsx @@ -29,10 +29,9 @@ export const ApolloTextLink = (props: ApolloTextAreaProps) => { const [visible, setVisible] = useState(false); useEffect(() => { if (origin !== 'editForm') { - setCurValue(value); getMore(); } - }, [value]); + }, []); const [inputVal, setInputVal] = useState(value); useEffect(() => { setInputVal(value); diff --git a/components/apolloTable/component/base/edit/textarea/index.tsx b/components/apolloTable/component/base/edit/textarea/index.tsx index c6884a7be7f14ec067f65b7df5bd7335d242ca0d..29b8cb522bfbc854cb8ced401e2898d99fe4d14a 100644 --- a/components/apolloTable/component/base/edit/textarea/index.tsx +++ b/components/apolloTable/component/base/edit/textarea/index.tsx @@ -22,15 +22,15 @@ export const ApolloTextArea = (props: ApolloTextAreaProps) => { 'maxPopHeight', 'getPopupContainer', 'getCalendarContainer', + 'origin', ]); const [curValue, setCurValue] = useState(value); const [visible, setVisible] = useState(false); useEffect(() => { if (origin !== 'editForm') { - setCurValue(value); getMore(); } - }, [value]); + }, []); const [inputVal, setInputVal] = useState(value); useEffect(() => {