theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: fix option merge global mixins presence check

Browse Source
This commit is contained in:
Evan You 2020-03-24 12:59:33 -04:00
parent dbbd9990e0
commit 10ad965100
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/runtime-core/src/apiOptions.ts
View File

@ -516,9 +516,9 @@ export function resolveMergedOptions(
const { __merged, mixins, extends: extendsOptions } = raw const { __merged, mixins, extends: extendsOptions } = raw
if (__merged) return __merged if (__merged) return __merged
const globalMixins = instance.appContext.mixins const globalMixins = instance.appContext.mixins
if (!globalMixins && !mixins && !extendsOptions) return raw if (!globalMixins.length && !mixins && !extendsOptions) return raw
const options = {} const options = {}
globalMixins && globalMixins.forEach(m => mergeOptions(options, m, instance)) globalMixins.forEach(m => mergeOptions(options, m, instance))
extendsOptions && mergeOptions(options, extendsOptions, instance) extendsOptions && mergeOptions(options, extendsOptions, instance)
mixins && mixins.forEach(m => mergeOptions(options, m, instance)) mixins && mixins.forEach(m => mergeOptions(options, m, instance))
mergeOptions(options, raw, instance) mergeOptions(options, raw, instance)