From 21fda1e55fc3c7f44dfa9065e887ec66c4cd9ce5 Mon Sep 17 00:00:00 2001
From: xingyixiang <452282988@qq.com>
Date: Thu, 15 May 2025 23:58:19 +0800
Subject: [PATCH] fix(components): [tree-v2] set expanded keys requires
 multiple nextTick (#20725)

---
 .../tree-v2/src/composables/useTree.ts        | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/packages/components/tree-v2/src/composables/useTree.ts b/packages/components/tree-v2/src/composables/useTree.ts
index 1ab847a01f..bf5a47516f 100644
--- a/packages/components/tree-v2/src/composables/useTree.ts
+++ b/packages/components/tree-v2/src/composables/useTree.ts
@@ -1,4 +1,4 @@
-import { computed, nextTick, ref, shallowRef, watch } from 'vue'
+import { computed, ref, shallowRef, watch } from 'vue'
 import { isObject } from '@element-plus/utils'
 import {
   CURRENT_CHANGE,
@@ -35,26 +35,6 @@ export function useTree(
   const tree = shallowRef<Tree | undefined>()
   const listRef = ref<typeof FixedSizeList | undefined>()
 
-  watch(
-    () => props.currentNodeKey,
-    (key) => {
-      currentKey.value = key
-    },
-    {
-      immediate: true,
-    }
-  )
-
-  watch(
-    () => props.data,
-    (data: TreeData) => {
-      setData(data)
-    },
-    {
-      immediate: true,
-    }
-  )
-
   const {
     isIndeterminate,
     isChecked,
@@ -288,7 +268,7 @@ export function useTree(
   }
 
   function setData(data: TreeData) {
-    nextTick(() => (tree.value = createTree(data)))
+    tree.value = createTree(data)
   }
 
   function getNode(data: TreeKey | TreeNodeData) {
@@ -307,6 +287,26 @@ export function useTree(
     listRef.value?.scrollTo(offset)
   }
 
+  watch(
+    () => props.currentNodeKey,
+    (key) => {
+      currentKey.value = key
+    },
+    {
+      immediate: true,
+    }
+  )
+
+  watch(
+    () => props.data,
+    (data: TreeData) => {
+      setData(data)
+    },
+    {
+      immediate: true,
+    }
+  )
+
   return {
     tree,
     flattenTree,