fix(table): defaultExpandAll (#2478)

Tencent · Aug 31, 2023 · 4c7a065 · 4c7a065
1 parent b7ef776
commit 4c7a065
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/table/hooks/useTreeData.tsx b/src/table/hooks/useTreeData.tsx
@@ -39,10 +39,14 @@ export default function useTreeData(props: TdEnhancedTableProps) {
   );
 
   const [isDefaultExpandedTreeNodesExecute, setIsDefaultExpandedTreeNodesExecute] = useState(false);
-  const { tExpandedTreeNode, expandAll, foldAll, updateExpandOnDataChange, onExpandFoldIconClick } = useTreeDataExpand(
-    props,
-    { store, dataSource, rowDataKeys, setDataSource },
-  );
+  const {
+    tExpandedTreeNode,
+    isDefaultExpandAllExecute,
+    expandAll,
+    foldAll,
+    updateExpandOnDataChange,
+    onExpandFoldIconClick,
+  } = useTreeDataExpand(props, { store, dataSource, rowDataKeys, setDataSource });
 
   const checkedColumn = useMemo(() => columns.find((col) => col.colKey === 'row-select'), [columns]);
 
@@ -82,7 +86,8 @@ export default function useTreeData(props: TdEnhancedTableProps) {
     const { columns, expandedTreeNodes, defaultExpandedTreeNodes } = props;
     store.initialTreeStore(data, columns, rowDataKeys);
     const defaultNeedExpand = Boolean(!isDefaultExpandedTreeNodesExecute && defaultExpandedTreeNodes?.length);
-    if (tExpandedTreeNode?.length && !!(expandedTreeNodes || defaultNeedExpand)) {
+    const needExpandAll = Boolean(tree?.defaultExpandAll && !isDefaultExpandAllExecute);
+    if ((tExpandedTreeNode?.length && !!(expandedTreeNodes || defaultNeedExpand)) || needExpandAll) {
       updateExpandOnDataChange(data);
       setIsDefaultExpandedTreeNodesExecute(true);
     } else {

diff --git a/src/table/hooks/useTreeDataExpand.ts b/src/table/hooks/useTreeDataExpand.ts
@@ -143,6 +143,7 @@ export function useTreeDataExpand(
 
   return {
     tExpandedTreeNode,
+    isDefaultExpandAllExecute,
     expandAll,
     foldAll,
     onExpandFoldIconClick,