@@ -366,6 +366,7 @@ type CustomTableProps<RecordType> = Omit<TableProps<RecordType>, "components" |
366
366
columnsStyle :TableColumnStyleType ;
367
367
fixedHeader :boolean ;
368
368
height ?:number ;
369
+ autoHeight ?:boolean ;
369
370
} ;
370
371
371
372
function TableCellView ( props :{
@@ -539,7 +540,9 @@ function ResizeableTable<RecordType extends object>(props: CustomTableProps<Reco
539
540
columns = { columns }
540
541
scroll = { {
541
542
x :COL_MIN_WIDTH * columns . length ,
542
- y :props . fixedHeader && props . height ?`${ props . height - 100 } px` :undefined ,
543
+ y :props . fixedHeader && props . height && ! props . autoHeight
544
+ ?`${ props . height - 100 } px`
545
+ :undefined ,
543
546
} }
544
547
> </ Table >
545
548
) ;
@@ -581,6 +584,7 @@ export function TableCompView(props: {
581
584
( ) => compChildren . dynamicColumnConfig . getView ( ) ,
582
585
[ compChildren . dynamicColumnConfig ]
583
586
) ;
587
+ const autoHeight = compChildren . autoHeight . getView ( ) ;
584
588
const columnsAggrData = comp . columnAggrData ;
585
589
const expansion = useMemo ( ( ) => compChildren . expansion . getView ( ) , [ compChildren . expansion ] ) ;
586
590
const antdColumns = useMemo (
@@ -705,6 +709,7 @@ export function TableCompView(props: {
705
709
size = { compChildren . size . getView ( ) }
706
710
tableLayout = "fixed"
707
711
height = { height }
712
+ autoHeight = { autoHeight }
708
713
loading = {
709
714
loading ||
710
715
// fixme isLoading type