mirror/element-plus
2
0
Fork 0
mirror of https://github.com/element-plus/element-plus.git synced 2024-11-27 02:01:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(checkbox): fix checkbox when modelvalue length less than min limit (#1745)

Browse Source 
* fix(checkbox): fix checkbox when modelvalue length less than min limit

* fix

* fix something wrong while handling conflict
This commit is contained in:
神楽坂みずき 2021-10-30 21:30:52 +08:00 committed by GitHub
parent cd646824c2
commit 94c404b12a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
packages/components/checkbox/__tests__/checkbox.spec.ts
View File

@ -294,34 +294,43 @@ describe('check-button', () => {
`
<el-checkbox-group
v-model="checkList"
:min="1"
:max="2"
:min="2"
:max="3"
>
<el-checkbox-button label="a" ref="a"></el-checkbox-button>
<el-checkbox-button label="b" ref="b"></el-checkbox-button>
<el-checkbox-button label="c" ref="c"></el-checkbox-button>
<el-checkbox-button label="d" ref="d"></el-checkbox-button>
<el-checkbox-button label="e" ref="e"></el-checkbox-button>
</el-checkbox-group>
`,
() => ({
checkList: ['a'],
checkList: ['a', 'b'],
lastEvent: null,
})
)
const vm = wrapper.vm
expect(vm.checkList.length).toBe(1)
expect(vm.checkList.length).toBe(2)
await wrapper.findComponent({ ref: 'a' }).trigger('click')
vm.$nextTick(async () => {
expect(vm.checkList.length).toBe(1)
await wrapper.findComponent({ ref: 'b' }).trigger('click')
expect(vm.checkList.length).toBe(2)
await wrapper.findComponent({ ref: 'c' }).trigger('click')
expect(vm.checkList.length).toBe(2)
expect(vm.checkList).toEqual(['a', 'b'])
expect((wrapper.findComponent({ ref: 'c' }).vm as any).isDisabled).toBe(
expect(vm.checkList.length).toBe(3)
expect(vm.checkList).toEqual(['a', 'b', 'c'])
expect((wrapper.findComponent({ ref: 'd' }).vm as any).isDisabled).toBe(
true
)
expect((wrapper.findComponent({ ref: 'd' }).vm as any).isDisabled).toBe(
expect((wrapper.findComponent({ ref: 'e' }).vm as any).isDisabled).toBe(
true
)
vm.checkList = []
await vm.$nextTick()
await wrapper.findComponent({ ref: 'a' }).trigger('click')
await wrapper.findComponent({ ref: 'd' }).trigger('click')
expect(vm.checkList).toEqual(['a', 'd'])
await wrapper.findComponent({ ref: 'a' }).trigger('click')
expect(vm.checkList).toEqual(['a', 'd'])
expect((wrapper.findComponent({ ref: 'a' }).vm as any).isDisabled).toBe(
true
)
})

14
packages/components/checkbox/src/useCheckbox.ts
View File

@ -73,21 +73,9 @@ const useModel = (props: IUseCheckboxProps) => {
set(val: unknown) {
if (isGroup.value && Array.isArray(val)) {
isLimitExceeded.value = false
if (
checkboxGroup.min !== undefined &&
val.length < checkboxGroup.min.value
) {
isLimitExceeded.value = true
}
if (
isLimitExceeded.value =
checkboxGroup.max !== undefined &&
val.length > checkboxGroup.max.value
) {
isLimitExceeded.value = true
}
isLimitExceeded.value === false && checkboxGroup?.changeEvent?.(val)
} else {
emit(UPDATE_MODEL_EVENT, val)