Skip to content

fix: tree组件单元测试，tree组件folder部分嵌套div便于控制 #106

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

Merged
merged 1 commit into from
Dec 31, 2021
Merged

fix: tree组件单元测试，tree组件folder部分嵌套div便于控制 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions packages/devui-vue/devui/tree/__tests__/tree.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,19 +169,19 @@ describe('tree', () => {
})

it('should expand and collapse correctly', async () => {
const firstNode: Element = wrapper.element.firstElementChild
const firstNode = wrapper.get('.devui-tree-node:first-child')

// 初始状态，节点是展开的
expect(firstNode.classList).toContain('devui-tree-node__open')

expect(firstNode.classes()).toContain('devui-tree-node__open')
// 点击之后，节点收起
await wrapper.find('.devui-tree-node').trigger('click')
await wrapper.get('.devui-tree-node__folder:first-child').trigger('click')
await nextTick()
expect(firstNode.classList).not.toContain('devui-tree-node__open')
expect(firstNode.classes()).not.toContain('devui-tree-node__open')

// 再次点击，节点展开
await wrapper.find('.devui-tree-node').trigger('click')
await wrapper.get('.devui-tree-node__folder:first-child').trigger('click')
await nextTick()
expect(firstNode.classList).toContain('devui-tree-node__open')
expect(firstNode.classes()).toContain('devui-tree-node__open')
})
})
30 changes: 10 additions & 20 deletions packages/devui-vue/devui/tree/src/tree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,16 @@ export default defineComponent({
return toggle(target, item)
}
return (
isParent || children && children.length
? open
? <IconOpen class="mr-xs" onClick={handleClick} />
: <IconClose class="mr-xs" onClick={handleClick} />
: <Indent />
<div class="devui-tree-node__folder" onClick={handleClick} >
{
isParent || children && children.length
? open
? <IconOpen class="mr-xs" />
: <IconClose class="mr-xs" />
: <Indent />
}
</div>

)
}
const checkState = CHECK_CONFIG[selected.value[id] ?? 'none']
Expand Down Expand Up @@ -134,24 +139,9 @@ export default defineComponent({
</div>
)
}
const renderTree = (tree) => {
return tree.map(item => {
if (!item.children) {
return renderNode(item)
} else {
return (
<>
{renderNode(item)}
{renderTree(item.children)}
</>
)
}
})
}
return () => {
return (
<div class="devui-tree">
{/* { renderTree(data.value) } */}
{ openedData.value.map(item => renderNode(item)) }
</div>
)
Expand Down