fix(comp:tree-select): do not deselect when reclicked (#1070)

IDuxFE · Aug 11, 2022 · 1a11051 · 1a11051
1 parent 3f8b5a5
commit 1a11051
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 29 deletions.
diff --git a/packages/components/tree-select/src/composables/useSelectedState.ts b/packages/components/tree-select/src/composables/useSelectedState.ts
@@ -47,6 +47,9 @@ export function useSelectedState(
   }
 
   const changeSelected = (value: VKey[]) => {
+    if (!props.multiple && !value.length) {
+      return
+    }
     setValue(value)
   }
 

diff --git a/packages/components/tree-select/src/content/Content.tsx b/packages/components/tree-select/src/content/Content.tsx
@@ -74,7 +74,10 @@ export default defineComponent({
 
     const handleSelect = (selected: boolean, node: TreeSelectNode) => {
       const { onSelect } = props
-      callEmit(onSelect, selected, node)
+
+      if (!props.multiple && selectedValue.value?.[0] !== node.key) {
+        callEmit(onSelect, selected, node)
+      }
       handleNodeClick()
     }
 
@@ -196,7 +199,6 @@ export default defineComponent({
           virtual={virtual}
           selectable={multiple ? 'multiple' : true}
           selectedKeys={selectedValue.value}
-          selectedClearable={false}
           searchValue={searchFn !== false ? inputValue.value : undefined}
           searchFn={isFunction(searchFn) ? searchFn : undefined}
           showLine={showLine}

diff --git a/packages/components/tree/__tests__/tree.spec.ts b/packages/components/tree/__tests__/tree.spec.ts
@@ -462,28 +462,6 @@ describe('Tree', () => {
     expect(allNodes[1].classes()).toContain('ix-tree-node-selected')
   })
 
-  test('selectedClearable work', async () => {
-    const onUpdateSelectedKeys = vi.fn()
-    const wrapper = TreeMount({
-      props: {
-        dataSource: simpleDataSource,
-        selectable: true,
-        selectedKeys: ['0'],
-        checkable: false,
-        'onUpdate:selectedKeys': onUpdateSelectedKeys,
-        selectedClearable: true,
-      },
-    })
-
-    const allNodes = wrapper.findAll('.ix-tree-node')
-    await allNodes[0].find('.ix-tree-node-content').trigger('click')
-    expect(onUpdateSelectedKeys).toBeCalledWith([])
-
-    await wrapper.setProps({ selectedClearable: false, selectedKeys: ['0'] })
-    await allNodes[0].find('.ix-tree-node-content').trigger('click')
-    expect(onUpdateSelectedKeys).toBeCalledWith(['0'])
-  })
-
   test('blocked work', async () => {
     const wrapper = TreeMount({
       props: { blocked: true },

diff --git a/packages/components/tree/src/composables/useSelectable.ts b/packages/components/tree/src/composables/useSelectable.ts
@@ -52,7 +52,7 @@ export function useSelectable(props: TreeProps, mergedNodeMap: ComputedRef<Map<V
     if (isMultiple.value) {
       selected ? tempKeys.splice(index, 1) : tempKeys.push(key)
     } else {
-      tempKeys = selected && props.selectedClearable ? [] : [key]
+      tempKeys = selected ? [] : [key]
     }
 
     handleChange(selected, currNode.rawNode, tempKeys)

diff --git a/packages/components/tree/src/types.ts b/packages/components/tree/src/types.ts
@@ -72,10 +72,6 @@ export const treeProps = {
     type: [Boolean, String] as PropType<boolean | 'multiple'>,
     default: true,
   },
-  selectedClearable: {
-    type: Boolean,
-    default: true,
-  },
   showLine: {
     type: Boolean,
     default: undefined,