test/vue
1
0
Fork 0
mirror of https://gitee.com/vuejs/vue.git synced 2024-12-05 05:27:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(v-pre): skip compiling custom component tags in v-pre blocks (fix #8286) (#8376)

Browse Source
This commit is contained in:
Haoqun Jiang 2018-10-25 01:24:07 +08:00 committed by Evan You
parent 504d5da7ef
commit a71853bfc5
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/codegen/index.js
View File

@ -52,6 +52,10 @@ export function generate (
}
export function genElement (el: ASTElement, state: CodegenState): string {
if (el.parent) {
el.pre = el.pre || el.parent.pre
}
if (el.staticRoot && !el.staticProcessed) {
return genStatic(el, state)
} else if (el.once && !el.onceProcessed) {
@ -70,7 +74,10 @@ export function genElement (el: ASTElement, state: CodegenState): string {
if (el.component) {
code = genComponent(el.component, el, state)
} else {
const data = el.plain ? undefined : genData(el, state)
let data
if (!el.plain || el.pre) {
data = genData(el, state)
}
const children = el.inlineTemplate ? null : genChildren(el, state, true)
code = `_c('${el.tag}'${

2
src/core/vdom/create-element.js
View File

@ -102,7 +102,7 @@ export function _createElement (
config.parsePlatformTagName(tag), data, children,
undefined, undefined, context
)
} else if (isDef(Ctor = resolveAsset(context.$options, 'components', tag))) {
} else if ((!data || !data.pre) && isDef(Ctor = resolveAsset(context.$options, 'components', tag))) {
// component
vnode = createComponent(Ctor, data, context, children, tag)
} else {

15
test/unit/features/directives/pre.spec.js
View File

@ -7,7 +7,7 @@ describe('Directive v-pre', function () {
<div v-pre>{{ a }}</div>
<div>{{ a }}</div>
<div v-pre>
<component></component>
<component is="div"></component>
</div>
</div>`,
data: {
@ -17,7 +17,7 @@ describe('Directive v-pre', function () {
vm.$mount()
expect(vm.$el.firstChild.textContent).toBe('{{ a }}')
expect(vm.$el.children[1].textContent).toBe('123')
expect(vm.$el.lastChild.innerHTML).toBe('<component></component>')
expect(vm.$el.lastChild.innerHTML).toBe('<component is="div"></component>')
})
it('should not compile on root node', function () {
@ -31,4 +31,15 @@ describe('Directive v-pre', function () {
vm.$mount()
expect(vm.$el.firstChild.textContent).toBe('{{ a }}')
})
// #8286
it('should not compile custom component tags', function () {
Vue.component('vtest', { template: ` <div>Hello World</div>` })
const vm = new Vue({
template: '<div v-pre><vtest></vtest></div>',
replace: true
})
vm.$mount()
expect(vm.$el.firstChild.tagName).toBe('VTEST')
})
})