From e5448de0b878176fb706cbd7f0fc094155729a29 Mon Sep 17 00:00:00 2001 From: chaishi <974383157@qq.com> Date: Sun, 25 Feb 2024 15:00:41 +0800 Subject: [PATCH 1/2] fix(table): expandedTreeNodes default expand --- src/_common | 2 +- src/table/hooks/useTreeDataExpand.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/_common b/src/_common index 742a90e47e..0be283e0f9 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit 742a90e47eed782f9d09ab7f981f60a950846c48 +Subproject commit 0be283e0f9ac607884dc13f1382c90cc483869f5 diff --git a/src/table/hooks/useTreeDataExpand.ts b/src/table/hooks/useTreeDataExpand.ts index 5fca7d8368..0e00f484eb 100644 --- a/src/table/hooks/useTreeDataExpand.ts +++ b/src/table/hooks/useTreeDataExpand.ts @@ -109,8 +109,8 @@ export function useTreeDataExpand( return [...data]; } - watch([tExpandedTreeNode], ([tExpandedTreeNode], [oldExpandedTreeNode]) => { - if (!store.value.treeDataMap.size) return; + watch([tExpandedTreeNode, data], ([tExpandedTreeNode], [oldExpandedTreeNode]) => { + if (!store.value.treeDataMap.size || !data.value.length) return; if (changedExpandTreeNode.value.type === 'user-reaction-change') { const { row, rowIndex } = changedExpandTreeNode.value || {}; dataSource.value = [...store.value.toggleExpandData({ row, rowIndex }, [...dataSource.value], rowDataKeys.value)]; From 305850c9f91c0f5647ad6fb3058b51c9c480499b Mon Sep 17 00:00:00 2001 From: chaishi <974383157@qq.com> Date: Sun, 25 Feb 2024 15:47:19 +0800 Subject: [PATCH 2/2] fix(table): table fixed columns in dialog --- src/table/hooks/useFixed.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/table/hooks/useFixed.ts b/src/table/hooks/useFixed.ts index 0df81be7bf..e873ba1b31 100644 --- a/src/table/hooks/useFixed.ts +++ b/src/table/hooks/useFixed.ts @@ -549,7 +549,7 @@ export default function useFixed( const timer = setTimeout(() => { refreshTable(); clearTimeout(timer); - }, 60); + }, 200); }); resizeObserver.observe(tableElement); tableRef.value = tableElement;