Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 32 additions & 16 deletions js/tree-v1/tree-node.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { isNull, isFunction, isNumber, uniqueId, isBoolean, isNil, get } from 'lodash-es';
import { get, isBoolean, isFunction, isNil, isNull, isNumber, uniqueId } from 'lodash-es';
import log from '../log';
import { createNodeModel, updateNodeModel } from './tree-node-model';
import { TreeStore } from './tree-store';
import {
TreeNodeValue,
import type {
TreeNodeState,
TreeNodeValue,
TypeIdMap,
TypeTreeItem,
TypeSettingOptions,
TypeTreeNodeModel,
TypeTreeItem,
TypeTreeNodeData,
TypeTreeNodeModel,
} from './types';
import { createNodeModel, updateNodeModel } from './tree-node-model';
import log from '../log';

const { hasOwnProperty } = Object.prototype;

Expand Down Expand Up @@ -318,7 +318,9 @@ export class TreeNode {
if (!Array.isArray(data)) {
list.push(data);
} else {
list.push(...data);
for (let i = 0; i < data.length; i++) {
list.push(data[i]);
}
}
if (list.length <= 0) {
return;
Expand Down Expand Up @@ -437,7 +439,17 @@ export class TreeNode {
}
});

const updateNodes = parentNode?.walk() || tree.children.map((item) => item.walk()).flat();
let updateNodes: TreeNode[] = [];
if (parentNode) {
updateNodes = parentNode.walk();
} else {
for (let i = 0; i < tree.children.length; i++) {
const childNodes = tree.children[i].walk();
for (let j = 0; j < childNodes.length; j++) {
updateNodes.push(childNodes[j]);
}
}
}
updateNodes.forEach((node) => {
node.update();
node.updateChecked();
Expand Down Expand Up @@ -1388,13 +1400,17 @@ export class TreeNode {
* @return TreeNode[] 遍历结果节点数组
*/
public walk(): TreeNode[] {
const { children } = this;
let list: TreeNode[] = [];
list.push(this);
if (Array.isArray(children) && children.length > 0) {
children.forEach((node) => {
list = list.concat(node.walk());
});
const list: TreeNode[] = [];
const stack: TreeNode[] = [this];
// 使用栈实现深度优先遍历,避免递归调用栈溢出
while (stack.length > 0) {
const node = stack.pop();
list.push(node);
if (Array.isArray(node.children) && node.children.length > 0) {
for (let i = node.children.length - 1; i >= 0; i--) {
stack.push(node.children[i]);
}
}
}
return list;
}
Expand Down
39 changes: 24 additions & 15 deletions js/tree-v1/tree-store.ts
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
import { isArray, isFunction, isNumber, isString, difference, camelCase, isPlainObject } from 'lodash-es';
import {
camelCase,
difference,
isArray,
isFunction,
isNumber,
isPlainObject,
isString,
} from 'lodash-es';
import mitt from 'mitt';

import { TreeNode } from './tree-node';
import {
import type {
TreeNodeValue,
TypeIdMap,
TypeTimer,
TypeRelatedNodesOptions,
TypeTargetNode,
TypeTreeNodeData,
TypeTreeItem,
TypeTreeStoreOptions,
TypeTimer,
TypeTreeEventState,
TypeTreeFilter,
TypeTreeFilterOptions,
TypeRelatedNodesOptions,
TypeTreeEventState,
TypeTreeItem,
TypeTreeNodeData,
TypeTreeStoreOptions,
} from './types';

// 构建一个树的数据模型
Expand Down Expand Up @@ -462,9 +470,12 @@ export class TreeStore {
public refreshNodes(): void {
const { children, nodes } = this;
nodes.length = 0;
// 使用迭代方式替代递归,避免栈溢出
children.forEach((node) => {
const list = node.walk();
Array.prototype.push.apply(nodes, list);
for (let i = 0; i < list.length; i++) {
nodes.push(list[i]);
}
});
}

Expand Down Expand Up @@ -865,14 +876,12 @@ export class TreeStore {
if (node) {
const parents = node.getParents().reverse();
const children = node.walk();
let related = [];
if (conf.withParents) {
related = parents.concat(children);
} else {
related = children;
parents.forEach((relatedNode) => {
map.set(relatedNode.value, relatedNode);
});
}
// 用 map 实现节点去重
related.forEach((relatedNode) => {
children.forEach((relatedNode) => {
map.set(relatedNode.value, relatedNode);
});
}
Expand Down