fix(TreeData): findNodePath、findNodePaths 的结果应包含当前节点

fjc0k · Dec 11, 2020 · 53edbb2 · 53edbb2
1 parent 3f21cf7
commit 53edbb2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/utils/TreeData.ts b/src/utils/TreeData.ts
@@ -332,7 +332,7 @@ export class TreeData<TNode extends TreeDataNode> {
     let path: TNode[] | undefined
     this.traverse(payload => {
       if (predicate(payload.node)) {
-        path = payload.path
+        path = payload.path.concat(payload.node)
         payload.exit()
       }
     })
@@ -348,7 +348,7 @@ export class TreeData<TNode extends TreeDataNode> {
     const paths: Array<TNode[]> = []
     this.traverse(payload => {
       if (predicate(payload.node)) {
-        paths.push(payload.path)
+        paths.push(payload.path.concat(payload.node))
       }
     })
     return paths

diff --git a/src/utils/__snapshots__/TreeData.test.ts.snap b/src/utils/__snapshots__/TreeData.test.ts.snap
@@ -56,6 +56,10 @@ Array [
     ],
     "id": "1",
   },
+  Object {
+    "children": Array [],
+    "id": "1.1",
+  },
 ]
 `;
 
@@ -109,6 +113,10 @@ Array [
       ],
       "id": "1",
     },
+    Object {
+      "children": Array [],
+      "id": "1.1",
+    },
   ],
 ]
 `;