feat(components): [select] Add max-collapse-tags prop (#11378)

* feat(components): [select] Add max-collapse-tags prop

closed #7429

* feat(components): [select]

* feat(components): update

* feat: update

* feat: update

* feat: update
This commit is contained in:
kooriookami
2023-03-10 15:18:21 +08:00
committed by GitHub
parent b112830d54
commit 4ea9fb344f
5 changed files with 198 additions and 108 deletions

View File

@ -118,7 +118,7 @@ If the binding value of Select is an object, make sure to assign `value-key` as
## Select Attributes
| Name | Description | Type | Accepted Values | Default |
| --------------------- | ---------------------------------------------------------------------------------------------------------------- | ------------------------------------------ | ------------------- | ---------------- |
| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------ | --------------------------------------------------------------------------------------------------------- | ---------------- |
| model-value / v-model | binding value | array / string / number / boolean / object | — | — |
| multiple | whether multiple-select is activated | boolean | true / false | false |
| disabled | whether Select is disabled | boolean | true / false | false |
@ -157,6 +157,7 @@ If the binding value of Select is an object, make sure to assign `value-key` as
| tag-type | tag type | string | success/info/warning/danger | info |
| validate-event | whether to trigger form validation | boolean | true / false | true |
| placement | position of dropdown | string | top/top-start/top-end/bottom/bottom-start/bottom-end/left/left-start/left-end/right/right-start/right-end | bottom-start |
| max-collapse-tags ^(2.3.0) | The max tags number to be shown. To use this, `collapse-tags` must be true | number | — | 1 |
:::warning

View File

@ -50,6 +50,25 @@
/>
</el-select>
</div>
<div class="m-4">
<p>use max-collapse-tags</p>
<el-select
v-model="value4"
multiple
collapse-tags
collapse-tags-tooltip
:max-collapse-tags="3"
placeholder="Select"
style="width: 240px"
>
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</div>
</template>
<script lang="ts" setup>
@ -58,6 +77,7 @@ import { ref } from 'vue'
const value1 = ref([])
const value2 = ref([])
const value3 = ref([])
const value4 = ref([])
const options = [
{
value: 'Option1',

View File

@ -1085,6 +1085,55 @@ describe('Select', () => {
expect(tags[3].textContent).toBe('蚵仔煎')
})
test('multiple select with maxCollapseTags', async () => {
wrapper = _mount(
`
<el-select v-model="selectedList" multiple collapseTags :max-collapse-tags="3" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
`,
() => ({
options: [
{
value: '选项1',
label: '黄金糕',
},
{
value: '选项2',
label: '双皮奶',
},
{
value: '选项3',
label: '蚵仔煎',
},
{
value: '选项4',
label: '龙须面',
},
{
value: '选项5',
label: '北京烤鸭',
},
],
selectedList: [],
})
)
await wrapper.find('.select-trigger').trigger('click')
const options = getOptions()
options[0].click()
await nextTick()
options[1].click()
await nextTick()
options[2].click()
await nextTick()
const triggerWrappers = wrapper.findAll('.el-tooltip__trigger')
expect(triggerWrappers[0]).toBeDefined()
const tags = document.querySelectorAll('.el-select__tags-text')
expect(tags.length).toBe(3)
})
test('multiple remove-tag', async () => {
wrapper = _mount(
`

View File

@ -36,27 +36,32 @@
:class="nsSelect.e('tags')"
:style="selectTagsStyle"
>
<span
<transition
v-if="collapseTags && selected.length"
@after-leave="resetInputHeight"
>
<span
:class="[
nsSelect.b('tags-wrapper'),
{ 'has-prefix': prefixWidth && selected.length },
]"
>
<el-tag
:closable="!selectDisabled && !selected[0].isDisabled"
v-for="item in showTagList"
:key="getValueKey(item)"
:closable="!selectDisabled && !item.isDisabled"
:size="collapseTagSize"
:hit="selected[0].hitState"
:hit="item.hitState"
:type="tagType"
disable-transitions
@close="deleteTag($event, selected[0])"
@close="deleteTag($event, item)"
>
<span :class="nsSelect.e('tags-text')" :style="tagTextStyle">
{{ selected[0].currentLabel }}
{{ item.currentLabel }}
</span>
</el-tag>
<el-tag
v-if="selected.length > 1"
v-if="selected.length > maxCollapseTags"
:closable="false"
:size="collapseTagSize"
:type="tagType"
@ -72,18 +77,17 @@
>
<template #default>
<span :class="nsSelect.e('tags-text')"
>+ {{ selected.length - 1 }}</span
>+ {{ selected.length - maxCollapseTags }}</span
>
</template>
<template #content>
<div :class="nsSelect.e('collapse-tags')">
<div
v-for="(item, idx) in selected.slice(1)"
:key="idx"
v-for="item in collapseTagList"
:key="getValueKey(item)"
:class="nsSelect.e('collapse-tag')"
>
<el-tag
:key="getValueKey(item)"
class="in-tooltip"
:closable="!selectDisabled && !item.isDisabled"
:size="collapseTagSize"
@ -106,11 +110,11 @@
</template>
</el-tooltip>
<span v-else :class="nsSelect.e('tags-text')"
>+ {{ selected.length - 1 }}</span
>+ {{ selected.length - maxCollapseTags }}</span
>
</el-tag>
</span>
<!-- <div> -->
</transition>
<transition v-if="!collapseTags" @after-leave="resetInputHeight">
<span
:class="[
@ -136,7 +140,6 @@
</el-tag>
</span>
</transition>
<!-- </div> -->
<input
v-if="filterable"
ref="input"
@ -380,6 +383,10 @@ export default defineComponent({
type: Boolean,
default: false,
},
maxCollapseTags: {
type: Number,
default: 1,
},
teleported: useTooltipContentProps.teleported,
persistent: {
type: Boolean,
@ -483,6 +490,8 @@ export default defineComponent({
groupQueryChange,
handleMouseEnter,
handleMouseLeave,
showTagList,
collapseTagList,
} = useSelect(props, states, ctx)
const { focus } = useFocus(reference)
@ -669,6 +678,8 @@ export default defineComponent({
tagTextStyle,
handleMouseEnter,
handleMouseLeave,
showTagList,
collapseTagList,
}
},
})

View File

@ -369,7 +369,6 @@ export const useSelect = (props, states: States, ctx) => {
// methods
const resetInputHeight = () => {
if (props.collapseTags && !props.filterable) return
nextTick(() => {
if (!reference.value) return
const input = reference.value.$el.querySelector(
@ -859,6 +858,14 @@ export const useSelect = (props, states: States, ctx) => {
.every((option) => option.disabled)
)
const showTagList = computed(() =>
states.selected.slice(0, props.maxCollapseTags)
)
const collapseTagList = computed(() =>
states.selected.slice(props.maxCollapseTags)
)
const navigateOptions = (direction) => {
if (!states.visible) {
states.visible = true
@ -941,6 +948,8 @@ export const useSelect = (props, states: States, ctx) => {
dropMenuVisible,
queryChange,
groupQueryChange,
showTagList,
collapseTagList,
// DOM ref
reference,