fix(comp:tree): data display error after search clearing (#952)

IDuxFE · Jun 14, 2022 · 2f502f6 · 2f502f6
1 parent e3a8dd2
commit 2f502f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/components/tree/__tests__/tree.spec.ts b/packages/components/tree/__tests__/tree.spec.ts
@@ -902,6 +902,12 @@ describe('Tree', () => {
     allNodes = wrapper.findAll('.ix-tree-node')
     expect(allNodes.length).toBe(1)
     expect(wrapper.html()).toMatchSnapshot()
+
+    await allNodes[0].find('.ix-tree-node-expand').trigger('click')
+
+    allNodes = wrapper.findAll('.ix-tree-node')
+    expect(allNodes.length).toBe(4)
+    expect(wrapper.html()).toMatchSnapshot()
   })
 
   test('searchFn work', async () => {

diff --git a/packages/components/tree/src/composables/useDataSource.ts b/packages/components/tree/src/composables/useDataSource.ts
@@ -194,7 +194,7 @@ function hiddenIrrelevantNodes(mergedNodes: MergedNode[] = [], searchedKeysMap:
     // isFirst 和 isLast控制连接线，每次需要先复原，最后通过result里面的数据再重新设置
     node.isFirst = index === 0
     node.isLast = index === mergedNodesLength - 1
-    if (searchedKeysMap.has(node.key)) {
+    if (searchedKeysMap.has(node.key) || searchedKeysMap.size == 0) {
       node.hidden = false
       result.push(node)
     } else {
@@ -221,9 +221,8 @@ function hiddenIrrelevantNodes(mergedNodes: MergedNode[] = [], searchedKeysMap:
 function flatNode(mergedNodes: MergedNode[], expandedKeysMap: Map<VKey, number>, searchedKeysMap: Map<VKey, number>) {
   const flattedNodes: MergedNode[] = []
   const stack: MergedNode[] = []
-  if (searchedKeysMap.size) {
-    hiddenIrrelevantNodes(mergedNodes, searchedKeysMap)
-  }
+
+  hiddenIrrelevantNodes(mergedNodes, searchedKeysMap)
 
   mergedNodes.forEach(node => {
     stack.push(node)