From 10ad965100a88e28cb528690f2e09070fefc8872 Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 24 Mar 2020 12:59:33 -0400 Subject: [PATCH] fix: fix option merge global mixins presence check --- packages/runtime-core/src/apiOptions.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/runtime-core/src/apiOptions.ts b/packages/runtime-core/src/apiOptions.ts index a33e62fb22d..8db8b20d027 100644 --- a/packages/runtime-core/src/apiOptions.ts +++ b/packages/runtime-core/src/apiOptions.ts @@ -516,9 +516,9 @@ export function resolveMergedOptions( const { __merged, mixins, extends: extendsOptions } = raw if (__merged) return __merged const globalMixins = instance.appContext.mixins - if (!globalMixins && !mixins && !extendsOptions) return raw + if (!globalMixins.length && !mixins && !extendsOptions) return raw const options = {} - globalMixins && globalMixins.forEach(m => mergeOptions(options, m, instance)) + globalMixins.forEach(m => mergeOptions(options, m, instance)) extendsOptions && mergeOptions(options, extendsOptions, instance) mixins && mixins.forEach(m => mergeOptions(options, m, instance)) mergeOptions(options, raw, instance)