소스 검색

fix: fix option merge global mixins presence check

Evan You 6 년 전
부모
커밋
10ad965100
1개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 2 2
      packages/runtime-core/src/apiOptions.ts

+ 2 - 2
packages/runtime-core/src/apiOptions.ts

@@ -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)