Commit0c703e3

authored and

committed

fix(v-model): v-if / v-else not working with :type + v-model (vuejs#6955)

1 parentbdcc05a commit0c703e3Copy full SHA for 0c703e3

File tree

+51

-0

lines changed

+51

-0

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ function preTransformNode (el: ASTElement, options: CompilerOptions) {`
`29`	`29`	`consttypeBinding:any=getBindingAttr(el,'type')`
`30`	`30`	`constifCondition=getAndRemoveAttr(el,'v-if',true)`
`31`	`31`	constifConditionExtra=ifCondition ?`&&(${ifCondition})` :``
	`32`	`+consthasElse=getAndRemoveAttr(el,'v-else',true)!=null`
	`33`	`+constelseIfCondition=getAndRemoveAttr(el,'v-else-if',true)`
`32`	`34`	`// 1. checkbox`
`33`	`35`	`constbranch0=cloneASTElement(el)`
`34`	`36`	`// process for on the main node`
`@@ -59,6 +61,13 @@ function preTransformNode (el: ASTElement, options: CompilerOptions) {`
`59`	`61`	`exp:ifCondition,`
`60`	`62`	`block:branch2`
`61`	`63`	`})`
	`64`	`+`
	`65`	`+if(hasElse){`
	`66`	`+branch0.else=true`
	`67`	`+}elseif(elseIfCondition){`
	`68`	`+branch0.elseif=elseIfCondition`
	`69`	`+}`
	`70`	`+`
`62`	`71`	`returnbranch0`
`63`	`72`	`}`
`64`	`73`	`}`

Lines changed: 42 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,48 @@ describe('Directive v-model dynamic input type', () => {`
`40`	`40`	`assertInputWorks(vm,chain).then(done)`
`41`	`41`	`})`
`42`	`42`
	`43`	`+it('with v-else',done=>{`
	`44`	`+constdata={`
	`45`	`+ok:true,`
	`46`	`+type:null,`
	`47`	`+test:'b'`
	`48`	`+}`
	`49`	`+constvm=newVue({`
	`50`	`+ data,`
	`51`	+template:`<div v-if="ok">haha</div><input v-else :type="type" v-model="test">`
	`52`	`+}).$mount()`
	`53`	`+document.body.appendChild(vm.$el)`
	`54`	`+expect(vm.$el.textContent).toBe('haha')`
	`55`	`+`
	`56`	`+vm.ok=false`
	`57`	`+assertInputWorks(vm).then(done)`
	`58`	`+})`
	`59`	`+`
	`60`	`+it('with v-else-if',done=>{`
	`61`	`+constvm=newVue({`
	`62`	`+data:{`
	`63`	`+foo:true,`
	`64`	`+bar:false,`
	`65`	`+type:null,`
	`66`	`+test:'b'`
	`67`	`+},`
	`68`	+template:`<div v-if="foo">text</div><input v-else-if="bar" :type="type" v-model="test">`
	`69`	`+}).$mount()`
	`70`	`+document.body.appendChild(vm.$el)`
	`71`	`+`
	`72`	`+constchain=waitForUpdate(()=>{`
	`73`	`+expect(vm.$el.textContent).toBe('text')`
	`74`	`+}).then(()=>{`
	`75`	`+vm.foo=false`
	`76`	`+}).then(()=>{`
	`77`	`+expect(vm._vnode.isComment).toBe(true)`
	`78`	`+}).then(()=>{`
	`79`	`+vm.bar=true`
	`80`	`+})`
	`81`	`+`
	`82`	`+assertInputWorks(vm,chain).then(done)`
	`83`	`+})`
	`84`	`+`
`43`	`85`	`it('with v-for',done=>{`
`44`	`86`	`constvm=newVue({`
`45`	`87`	`data:{`

Comments

(0)