diff --git a/src/table/TR.tsx b/src/table/TR.tsx index 8ac8b2430..111dac27e 100644 --- a/src/table/TR.tsx +++ b/src/table/TR.tsx @@ -113,6 +113,7 @@ export default function TR(props: TrProps) { } // eslint-disable-next-line }, [virtualConfig.isVirtualScroll, trRef, row]); + const columnVNodeList = props.columns?.map((col, colIndex) => { const cellSpans: RowspanColspan = {}; const params = { diff --git a/src/table/defaultProps.ts b/src/table/defaultProps.ts index 82a2ec0ab..3e0343bd7 100644 --- a/src/table/defaultProps.ts +++ b/src/table/defaultProps.ts @@ -40,7 +40,7 @@ export const primaryTableDefaultProps: Pick< columnControllerVisible: undefined, columns: [], expandIcon: true, - defaultExpandedRowKeys: undefined, + defaultExpandedRowKeys: [], multipleSort: false, reserveSelectedRowOnPaginate: true, defaultSelectedRowKeys: [], diff --git a/src/table/hooks/useRowExpand.tsx b/src/table/hooks/useRowExpand.tsx index eaca0a899..be9c2bfb1 100644 --- a/src/table/hooks/useRowExpand.tsx +++ b/src/table/hooks/useRowExpand.tsx @@ -29,22 +29,19 @@ export default function useRowExpand(props: TdPrimaryTableProps) { defaultExpandedRowKeys: props.defaultExpandedRowKeys || [], }); - // 用于在可展开收起的场景给各行添加类名使用,如果没有配置则不加相关类名 - const innerExpandedRowKeys = props.expandedRowKeys || props.defaultExpandedRowKeys ? tExpandedRowKeys : undefined; + const showExpandedRow = Boolean(expandedRow); const getExpandedRowClass = useCallback( (params) => { - if (!innerExpandedRowKeys) return null; + if (!showExpandedRow) return null; const { row } = params; const { rowKey } = row; const currentRowKey = get(row, rowKey || 'id'); return tableExpandClasses[tExpandedRowKeys?.includes(currentRowKey) ? 'rowExpanded' : 'rowFolded']; }, - [tExpandedRowKeys, innerExpandedRowKeys, tableExpandClasses], + [tExpandedRowKeys, tableExpandClasses, showExpandedRow], ); - const showExpandedRow = Boolean(expandedRow); - const showExpandIconColumn = props.expandIcon !== false && showExpandedRow; const isFirstColumnFixed = props.columns?.[0]?.fixed === 'left'; @@ -131,7 +128,6 @@ export default function useRowExpand(props: TdPrimaryTableProps) { getExpandColumn, renderExpandedRow, onInnerExpandRowClick, - innerExpandedRowKeys, getExpandedRowClass, }; }