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

fix(runtome-core): do not cache property access in beforeCreate hook

Browse Source 
fix #1756
This commit is contained in:
Evan You 2020-08-03 17:04:45 -04:00
parent d4c17fb48b
commit f6afe7000e
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,6 +364,8 @@ function createDuplicateChecker() {
type DataFn = (vm: ComponentPublicInstance) => any type DataFn = (vm: ComponentPublicInstance) => any
export let isInBeforeCreate = false
export function applyOptions( export function applyOptions(
instance: ComponentInternalInstance, instance: ComponentInternalInstance,
options: ComponentOptions, options: ComponentOptions,
@ -407,7 +409,9 @@ export function applyOptions(
// applyOptions is called non-as-mixin once per instance // applyOptions is called non-as-mixin once per instance
if (!asMixin) { if (!asMixin) {
isInBeforeCreate = true
callSyncHook('beforeCreate', options, publicThis, globalMixins) callSyncHook('beforeCreate', options, publicThis, globalMixins)
isInBeforeCreate = false
// global mixins are applied first // global mixins are applied first
applyMixins(instance, globalMixins, deferredData, deferredWatch) applyMixins(instance, globalMixins, deferredData, deferredWatch)
} }

5
packages/runtime-core/src/componentProxy.ts
View File

@ -26,7 +26,8 @@ import {
ComponentOptionsMixin, ComponentOptionsMixin,
OptionTypesType, OptionTypesType,
OptionTypesKeys, OptionTypesKeys,
resolveMergedOptions resolveMergedOptions,
isInBeforeCreate
} from './componentOptions' } from './componentOptions'
import { normalizePropsOptions } from './componentProps' import { normalizePropsOptions } from './componentProps'
import { EmitsOptions, EmitFn } from './componentEmits' import { EmitsOptions, EmitFn } from './componentEmits'
@ -254,7 +255,7 @@ export const PublicInstanceProxyHandlers: ProxyHandler<any> = {
} else if (ctx !== EMPTY_OBJ && hasOwn(ctx, key)) { } else if (ctx !== EMPTY_OBJ && hasOwn(ctx, key)) {
accessCache![key] = AccessTypes.CONTEXT accessCache![key] = AccessTypes.CONTEXT
return ctx[key] return ctx[key]
} else { } else if (!__FEATURE_OPTIONS_API__ || !isInBeforeCreate) {
accessCache![key] = AccessTypes.OTHER accessCache![key] = AccessTypes.OTHER
} }
} }