fix(table): enhanced tree table can not expand with expected (#2661)

Tencent · Jan 11, 2024 · 1fe2813 · 1fe2813
1 parent 199ca4f
commit 1fe2813
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/table/_example/tree-select.jsx b/src/table/_example/tree-select.jsx
@@ -142,6 +142,9 @@ export default function TableSingleSort() {
     });
   };
 
+  // 树节点展开，受控示例
+  // const [expandedTreeNodes, setExpandedTreeNodes] = useState(['first_level_0']);
+
   return (
     <Space direction="vertical">
       <Space>
@@ -174,6 +177,8 @@ export default function TableSingleSort() {
         onExpandChange={onExpandChange}
         onRowClick={onRowClick}
         lazyLoad
+        // expandedTreeNodes={expandedTreeNodes}
+        // onExpandedTreeNodesChange={setExpandedTreeNodes}
       />
     </Space>
   );

diff --git a/src/table/hooks/useTreeData.tsx b/src/table/hooks/useTreeData.tsx
@@ -88,7 +88,7 @@ export default function useTreeData(props: TdEnhancedTableProps) {
     const defaultNeedExpand = Boolean(!isDefaultExpandedTreeNodesExecute && defaultExpandedTreeNodes?.length);
     const needExpandAll = Boolean(tree?.defaultExpandAll && !isDefaultExpandAllExecute);
     if ((tExpandedTreeNode?.length && !!(expandedTreeNodes || defaultNeedExpand)) || needExpandAll) {
-      updateExpandOnDataChange(data);
+      updateExpandOnDataChange([...data]);
       setIsDefaultExpandedTreeNodesExecute(true);
     } else {
       setDataSource([...data]);

diff --git a/src/table/hooks/useTreeDataExpand.ts b/src/table/hooks/useTreeDataExpand.ts
@@ -121,7 +121,7 @@ export function useTreeDataExpand(
       const newData = store.toggleExpandData({ row, rowIndex }, dataSource, rowDataKeys);
       setDataSource([...newData]);
     } else if (changedExpandTreeNode.type === 'props-change') {
-      updateExpandState(dataSource, tExpandedTreeNode, oldExpandedTreeNode);
+      updateExpandState([...dataSource], tExpandedTreeNode, oldExpandedTreeNode);
     }
     if (changedExpandTreeNode.type !== 'props-change') {
       setChangedExpandTreeNode({ type: 'props-change' });
@@ -136,7 +136,7 @@ export function useTreeDataExpand(
     } else if (tExpandedTreeNode?.length) {
       setTimeout(() => {
         const newData = updateExpandState([...data], tExpandedTreeNode, []);
-        setDataSource(newData);
+        setDataSource([...newData]);
       });
     }
   };