fix(TreeNode): update expand logic to handle child nodes

Author: RylanBot

js/tree-v1/tree-node.ts

@@ -237,7 +237,7 @@ export class TreeNode {
     if (this.isLeaf()) {
       // initExpanded 时，子节点没有完全加载，无法依赖 isLeaf 状态判断
       this.expanded = false;
-      tree.expandedMap.delete(this.value);
+      this.tree.expandedMap.delete(this.value);
     }
 
     // checked 状态依赖于子节点状态
@@ -323,6 +323,9 @@ export class TreeNode {
     if (list.length <= 0) {
       return;
     }
+
+    const wasLeaf = this.isLeaf();
+
     if (!Array.isArray(this.children)) {
       this.children = [];
     }
@@ -337,6 +340,13 @@ export class TreeNode {
         children.push(node);
       }
     });
+
+    // 如果之前是叶子节点，现在有了子节点，且 expandAll 为 true，则展开
+    if (wasLeaf && tree.config.expandAll && !this.isLeaf()) {
+      tree.expandedMap.set(this.value, true);
+      this.expanded = true;
+    }
+
     tree.reflow(this);
     this.updateRelated();
   }
@@ -867,8 +877,7 @@ export class TreeNode {
         // 如果 valueMode 为 all、parentFirst，则视为选中
         valueMode !== 'onlyLeaf'
         // 如果 valueMode 为 onlyLeaf 并且当前节点是叶子节点，则视为选中
-        || this.isLeaf()
-      )
+        || this.isLeaf())
     ) {
       return true;
     }

js/tree/tree-node.ts

@@ -234,7 +234,7 @@ export class TreeNode {
     if (this.isLeaf()) {
       // initExpanded 时，子节点没有完全加载，无法依赖 isLeaf 状态判断
       this.expanded = false;
-      tree.expandedMap.delete(this.value);
+      this.tree.expandedMap.delete(this.value);
     }
 
     // 节点的选中状态同时依赖于子节点状态与父节点状态
@@ -320,6 +320,9 @@ export class TreeNode {
     if (list.length <= 0) {
       return;
     }
+
+    const wasLeaf = this.isLeaf();
+
     if (!Array.isArray(this.children)) {
       this.children = [];
     }
@@ -334,6 +337,13 @@ export class TreeNode {
         children.push(node);
       }
     });
+
+    // 如果之前是叶子节点，现在有了子节点，且 expandAll 为 true，则展开
+    if (wasLeaf && tree.config.expandAll && !this.isLeaf()) {
+      tree.expandedMap.set(this.value, true);
+      this.expanded = true;
+    }
+
     tree.reflow(this);
     this.updateRelated();
   }

test/unit/tree/append.test.js

@@ -631,6 +631,9 @@ describe('tree:append', () => {
         }]
       }, {
         value: 't2',
+        children: [{
+          value: 't2.1',
+        }]
       }]);
       await delay(0);
       tree.setExpanded(['t1', 't2']);