fix(v-model): respect checkbox true-value/false-value on initial render
fix #2694
This commit is contained in:
parent
085bbd5fe0
commit
48f00c0f1b
@ -280,7 +280,7 @@ describe('vModel', () => {
|
||||
it('should work with checkbox and true-value/false-value', async () => {
|
||||
const component = defineComponent({
|
||||
data() {
|
||||
return { value: null }
|
||||
return { value: 'yes' }
|
||||
},
|
||||
render() {
|
||||
return [
|
||||
@ -301,23 +301,26 @@ describe('vModel', () => {
|
||||
const input = root.querySelector('input')
|
||||
const data = root._vnode.component.data
|
||||
|
||||
input.checked = true
|
||||
triggerEvent('change', input)
|
||||
await nextTick()
|
||||
expect(data.value).toEqual('yes')
|
||||
|
||||
data.value = 'no'
|
||||
await nextTick()
|
||||
expect(input.checked).toEqual(false)
|
||||
|
||||
data.value = 'yes'
|
||||
await nextTick()
|
||||
// DOM checked state should respect initial true-value/false-value
|
||||
expect(input.checked).toEqual(true)
|
||||
|
||||
input.checked = false
|
||||
triggerEvent('change', input)
|
||||
await nextTick()
|
||||
expect(data.value).toEqual('no')
|
||||
|
||||
data.value = 'yes'
|
||||
await nextTick()
|
||||
expect(input.checked).toEqual(true)
|
||||
|
||||
data.value = 'no'
|
||||
await nextTick()
|
||||
expect(input.checked).toEqual(false)
|
||||
|
||||
input.checked = true
|
||||
triggerEvent('change', input)
|
||||
await nextTick()
|
||||
expect(data.value).toEqual('yes')
|
||||
})
|
||||
|
||||
it('should work with checkbox and true-value/false-value with object values', async () => {
|
||||
|
@ -99,8 +99,7 @@ export const vModelText: ModelDirective<
|
||||
}
|
||||
|
||||
export const vModelCheckbox: ModelDirective<HTMLInputElement> = {
|
||||
created(el, binding, vnode) {
|
||||
setChecked(el, binding, vnode)
|
||||
created(el, _, vnode) {
|
||||
el._assign = getModelAssigner(vnode)
|
||||
addEventListener(el, 'change', () => {
|
||||
const modelValue = (el as any)._modelValue
|
||||
@ -130,6 +129,8 @@ export const vModelCheckbox: ModelDirective<HTMLInputElement> = {
|
||||
}
|
||||
})
|
||||
},
|
||||
// set initial checked on mount to wait for true-value/false-value
|
||||
mounted: setChecked,
|
||||
beforeUpdate(el, binding, vnode) {
|
||||
el._assign = getModelAssigner(vnode)
|
||||
setChecked(el, binding, vnode)
|
||||
|
Loading…
x
Reference in New Issue
Block a user