Skip to content

Commit 4665770

Browse files
author
yichao.li.ext
committed
fix get parent key
1 parent 3814d27 commit 4665770

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-virtual-tree",
3-
"version": "4.0.4",
3+
"version": "4.0.5",
44
"description": "Tree component for large amount of data, base on Vue3",
55
"scripts": {
66
"serve": "vue-cli-service serve --port 4200",

src/components/VirtualTree/service.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {NodeKey, TreeNodeOptions} from "./types";
1+
import {NodeKey, TreeNodeOptions, TypeWithNull} from "./types";
22
import {ref} from "vue";
33
import {SelectionModel} from "../selections";
44

@@ -23,20 +23,19 @@ class TreeService {
2323
defaultCheckedKeys: NodeKey[],
2424
defaultExpandedKeys: NodeKey[],
2525
defaultDisabledKeys: NodeKey[],
26-
parent: Required<TreeNodeOptions> | null = null
26+
parent: TypeWithNull<Required<TreeNodeOptions>> = null
2727
): Required<TreeNodeOptions>[] {
2828

2929
this.defaultSelectedKey = defaultSelectedKey;
3030
this.defaultCheckedKeys = defaultCheckedKeys;
3131
this.defaultExpandedKeys = defaultExpandedKeys;
3232
this.defaultDisabledKeys = defaultDisabledKeys;
33-
console.log('defaultCheckedKeys 22 :>> ', defaultCheckedKeys);
3433
const result: Required<TreeNodeOptions>[] = [];
35-
const recursion = (list: TreeNodeOptions[], level = 0, parent: Required<TreeNodeOptions> | null = null) => {
34+
const recursion = (list: TreeNodeOptions[], parent: TypeWithNull<Required<TreeNodeOptions>> = null) => {
3635
return list.map(item => {
3736
const flatNode: Required<TreeNodeOptions> = {
3837
...item,
39-
level: item.level || level + 1,
38+
level: parent ? parent.level + 1 : item.level || 0,
4039
loading: false,
4140
hasChildren: item.hasChildren || false,
4241
parentKey: parent?.nodeKey || null,
@@ -64,7 +63,7 @@ class TreeService {
6463
this.selectedNodes.value.select(flatNode);
6564
}
6665
if (item.children?.length) {
67-
flatNode.children = recursion(item.children, level + 1, flatNode);
66+
flatNode.children = recursion(item.children, flatNode);
6867
}
6968
}
7069

@@ -75,7 +74,7 @@ class TreeService {
7574
});
7675
}
7776

78-
recursion(source, parent?.level);
77+
recursion(source, parent);
7978
return result;
8079
}
8180

0 commit comments

Comments
 (0)