mirror of
https://github.com/vuejs/vue.git
synced 2024-11-22 04:39:46 +00:00
fix(core): skip mixins and extends if child is already merged (#8870)
fix #8865
This commit is contained in:
parent
374861f72b
commit
80f17fa498
@ -378,15 +378,22 @@ export function mergeOptions (
|
||||
normalizeProps(child, vm)
|
||||
normalizeInject(child, vm)
|
||||
normalizeDirectives(child)
|
||||
const extendsFrom = child.extends
|
||||
if (extendsFrom) {
|
||||
parent = mergeOptions(parent, extendsFrom, vm)
|
||||
}
|
||||
if (child.mixins) {
|
||||
for (let i = 0, l = child.mixins.length; i < l; i++) {
|
||||
parent = mergeOptions(parent, child.mixins[i], vm)
|
||||
|
||||
// Apply extends and mixins on the child options,
|
||||
// but only if it is a raw options object that isn't
|
||||
// the result of another mergeOptions call.
|
||||
// Only merged options has the _base property.
|
||||
if (!child._base) {
|
||||
if (child.extends) {
|
||||
parent = mergeOptions(parent, child.extends, vm)
|
||||
}
|
||||
if (child.mixins) {
|
||||
for (let i = 0, l = child.mixins.length; i < l; i++) {
|
||||
parent = mergeOptions(parent, child.mixins[i], vm)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const options = {}
|
||||
let key
|
||||
for (key in parent) {
|
||||
|
@ -71,6 +71,25 @@ describe('Global API: extend', () => {
|
||||
expect(calls).toEqual([1, 2, 3])
|
||||
})
|
||||
|
||||
it('should not merge nested mixins created with Vue.extend', () => {
|
||||
const A = Vue.extend({
|
||||
created: () => {}
|
||||
})
|
||||
const B = Vue.extend({
|
||||
mixins: [A],
|
||||
created: () => {}
|
||||
})
|
||||
const C = Vue.extend({
|
||||
extends: B,
|
||||
created: () => {}
|
||||
})
|
||||
const D = Vue.extend({
|
||||
mixins: [C],
|
||||
created: () => {}
|
||||
})
|
||||
expect(D.options.created.length).toBe(4)
|
||||
})
|
||||
|
||||
it('should merge methods', () => {
|
||||
const A = Vue.extend({
|
||||
methods: {
|
||||
|
Loading…
Reference in New Issue
Block a user