File tree Expand file tree Collapse file tree 2 files changed +17
-27
lines changed
packages/devui-vue/devui/tree Expand file tree Collapse file tree 2 files changed +17
-27
lines changed Original file line number Diff line number Diff line change @@ -169,19 +169,19 @@ describe('tree', () => {
169
169
} )
170
170
171
171
it ( 'should expand and collapse correctly' , async ( ) => {
172
- const firstNode : Element = wrapper . element . firstElementChild
172
+ const firstNode = wrapper . get ( '.devui-tree-node:first-child' )
173
173
174
174
// 初始状态,节点是展开的
175
- expect ( firstNode . classList ) . toContain ( 'devui-tree-node__open' )
176
-
175
+ expect ( firstNode . classes ( ) ) . toContain ( 'devui-tree-node__open' )
176
+
177
177
// 点击之后,节点收起
178
- await wrapper . find ( '.devui-tree-node ' ) . trigger ( 'click' )
178
+ await wrapper . get ( '.devui-tree-node__folder:first-child ' ) . trigger ( 'click' )
179
179
await nextTick ( )
180
- expect ( firstNode . classList ) . not . toContain ( 'devui-tree-node__open' )
180
+ expect ( firstNode . classes ( ) ) . not . toContain ( 'devui-tree-node__open' )
181
181
182
182
// 再次点击,节点展开
183
- await wrapper . find ( '.devui-tree-node ' ) . trigger ( 'click' )
183
+ await wrapper . get ( '.devui-tree-node__folder:first-child ' ) . trigger ( 'click' )
184
184
await nextTick ( )
185
- expect ( firstNode . classList ) . toContain ( 'devui-tree-node__open' )
185
+ expect ( firstNode . classes ( ) ) . toContain ( 'devui-tree-node__open' )
186
186
} )
187
187
} )
Original file line number Diff line number Diff line change @@ -102,11 +102,16 @@ export default defineComponent({
102
102
return toggle ( target , item )
103
103
}
104
104
return (
105
- isParent || children && children . length
106
- ? open
107
- ? < IconOpen class = "mr-xs" onClick = { handleClick } />
108
- : < IconClose class = "mr-xs" onClick = { handleClick } />
109
- : < Indent />
105
+ < div class = "devui-tree-node__folder" onClick = { handleClick } >
106
+ {
107
+ isParent || children && children . length
108
+ ? open
109
+ ? < IconOpen class = "mr-xs" />
110
+ : < IconClose class = "mr-xs" />
111
+ : < Indent />
112
+ }
113
+ </ div >
114
+
110
115
)
111
116
}
112
117
const checkState = CHECK_CONFIG [ selected . value [ id ] ?? 'none' ]
@@ -134,24 +139,9 @@ export default defineComponent({
134
139
</ div >
135
140
)
136
141
}
137
- const renderTree = ( tree ) => {
138
- return tree . map ( item => {
139
- if ( ! item . children ) {
140
- return renderNode ( item )
141
- } else {
142
- return (
143
- < >
144
- { renderNode ( item ) }
145
- { renderTree ( item . children ) }
146
- </ >
147
- )
148
- }
149
- } )
150
- }
151
142
return ( ) => {
152
143
return (
153
144
< div class = "devui-tree" >
154
- { /* { renderTree(data.value) } */ }
155
145
{ openedData . value . map ( item => renderNode ( item ) ) }
156
146
</ div >
157
147
)
You can’t perform that action at this time.
0 commit comments