Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(Tree): fix nil value filter bug #3233

Merged
merged 3 commits into from
Jul 11, 2024
Merged

fix(Tree): fix nil value filter bug #3233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25c6a22
fix(Tree): fix nil value filter bug
uyarn Jul 11, 2024
ed53fb5
chore: revert change
uyarn Jul 11, 2024
7b3673b
chore: add test
uyarn Jul 11, 2024
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
2 changes: 2 additions & 0 deletions src/tree/__tests__/index.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ describe('Tree:init', () => {

it('可以传递一个树结构的数据来完成初始化', () => {
const data = [
{ value: 0 },
{
value: 't1',
children: [
Expand Down Expand Up @@ -89,6 +90,7 @@ describe('Tree:init', () => {
}),
);
expect(wrapper.find('.tree-empty').exists()).toBe(false);
expect(wrapper.find('[data-value="0"]').exists()).toBe(true);
expect(wrapper.find('[data-value="t1"]').exists()).toBe(true);
expect(wrapper.find('[data-value="t1.1"]').exists()).toBe(false);
expect(wrapper.find('[data-value="t2"]').exists()).toBe(true);
Expand Down
4 changes: 3 additions & 1 deletion src/tree/hooks/useTreeNodes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import isUndefined from 'lodash/isUndefined';
import {
ref, watch, TypeCreateElement, privateKey, TypeVNode,
} from '../adapt';
Expand Down Expand Up @@ -26,13 +27,14 @@ export default function useTreeNodes(state: TypeTreeState) {
const list: TypeTreeNode[] = [];
// 非虚拟滚动，缓存曾经展示过的节点
let hasVisibleNode = false;

allNodes.value.forEach((node: TypeTreeNode) => {
if (node.visible) {
// 曾经展示过的节点加入缓存，避免再次创建
hasVisibleNode = true;
cacheMap.set(node.value, node.value);
}
if (cacheMap.get(node.value)) {
if (!isUndefined(cacheMap.get(node.value))) {
// 创建的节点是缓存的节点
list.push(node);
}
Expand Down
Loading