Merge branch 'main' into next

This commit is contained in:
GitHub Actions Bot 2024-09-14 07:42:58 +00:00
commit 0d061a6c58

View File

@ -726,9 +726,9 @@ export const Table: any = withDynamicSchemaProps(
const scroll = useMemo(() => { const scroll = useMemo(() => {
return { return {
x: 'max-content', x: 'max-content',
y: tableHeight, y: dataSource.length > 0 ? tableHeight : undefined,
}; };
}, [tableHeight, maxContent]); }, [tableHeight, maxContent, dataSource]);
const rowClassName = useCallback( const rowClassName = useCallback(
(record) => (selectedRow.includes(record[rowKey]) ? highlightRow : ''), (record) => (selectedRow.includes(record[rowKey]) ? highlightRow : ''),
@ -766,6 +766,9 @@ export const Table: any = withDynamicSchemaProps(
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.ant-table-expanded-row-fixed {
min-height: ${tableHeight}px;
}
.ant-table-body { .ant-table-body {
min-height: ${tableHeight}px; min-height: ${tableHeight}px;
} }