From 2ebf594fc33b892a03bb138b6ed9f9ac1414474e Mon Sep 17 00:00:00 2001
From: New-Lanke <51505088+New-Lanke@users.noreply.github.com>
Date: Mon, 27 Jan 2025 11:04:03 +0800
Subject: [PATCH] fix(tree): cannot expand #6725

---
 CHANGELOG.en-US.md    | 6 ++++++
 CHANGELOG.zh-CN.md    | 6 ++++++
 src/tree/src/Tree.tsx | 8 ++++----
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
index ba3d5ba01e6..c0e944e2e40 100644
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## NEXT_VERSION
+
+### Fixes
+
+- Fix: When the 'expanded keys' attribute of' n-tree 'contains a' key 'that does not exist in the tree, the component cannot expand
+
 ## 2.41.0
 
 `2025-01-05`
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
index aee800ad1d2..65d2b538c96 100644
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## NEXT_VERSION
+
+### Fixes
+
+- 修复 `n-tree` 的 `expanded-keys` 属性包含不存在于树中的 `key` 时，组件无法展开
+
 ## 2.41.0
 
 `2025-01-05`
diff --git a/src/tree/src/Tree.tsx b/src/tree/src/Tree.tsx
index 8ee3cafb78f..229d03fed29 100644
--- a/src/tree/src/Tree.tsx
+++ b/src/tree/src/Tree.tsx
@@ -86,9 +86,9 @@ export function createTreeMateOptions<T>(
 ): TreeMateOptions<T, T, T> {
   const settledGetChildren: GetChildren
     = getChildren
-    || ((node: T) => {
-      return (node as any)[childrenField]
-    })
+      || ((node: T) => {
+        return (node as any)[childrenField]
+      })
   return {
     getIsGroup() {
       return false
@@ -770,7 +770,6 @@ export default defineComponent({
           )
         }
       }
-      aipRef.value = true
       afNodesRef.value
         = displayTreeMateRef.value.getFlattenedNodes(baseExpandedKeys)
       if (addedKey !== null) {
@@ -782,6 +781,7 @@ export default defineComponent({
             .children
           // sometimes user will pass leaf keys in
           if (children) {
+            aipRef.value = true
             const expandedChildren = flatten(children, value)
             afNodesRef.value.splice(expandedNodeIndex + 1, 0, {
               __motion: true,