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

fix(runtime-core): fix user attched public instance properties that start with "$"

Browse Source
This commit is contained in:
Evan You 2020-04-17 10:23:10 -04:00
parent 99fd158d09
commit d7ca1c5c6e
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/runtime-core/__tests__/componentProxy.spec.ts
View File

@ -117,6 +117,11 @@ describe('component: proxy', () => {
instanceProxy.foo = 1 instanceProxy.foo = 1
expect(instanceProxy.foo).toBe(1) expect(instanceProxy.foo).toBe(1)
expect(instance!.ctx.foo).toBe(1) expect(instance!.ctx.foo).toBe(1)
// should also allow properties that start with $
const obj = (instanceProxy.$store = {})
expect(instanceProxy.$store).toBe(obj)
expect(instance!.ctx.$store).toBe(obj)
}) })
test('globalProperties', () => { test('globalProperties', () => {

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

@ -184,6 +184,10 @@ export const PublicInstanceProxyHandlers: ProxyHandler<any> = {
(cssModule = cssModule[key]) (cssModule = cssModule[key])
) { ) {
return cssModule return cssModule
} else if (ctx !== EMPTY_OBJ && hasOwn(ctx, key)) {
// user may set custom properties to `this` that start with `$`
accessCache![key] = AccessTypes.CONTEXT
return ctx[key]
} else if ( } else if (
// global properties // global properties
((globalProperties = appContext.config.globalProperties), ((globalProperties = appContext.config.globalProperties),