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

fix(compat): convertLegacyVModelProps should merge model option in mixins (#5251)

Browse Source
This commit is contained in:
Soha Jin 2022-01-21 15:02:02 +08:00 committed by GitHub
parent 92e04a651f
commit 72130ac7b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/runtime-core/src/compat/componentVModel.ts
View File

@ -1,4 +1,4 @@
import { ShapeFlags } from '@vue/shared' import { extend, ShapeFlags } from '@vue/shared'
import { ComponentInternalInstance, ComponentOptions } from '../component' import { ComponentInternalInstance, ComponentOptions } from '../component'
import { callWithErrorHandling, ErrorCodes } from '../errorHandling' import { callWithErrorHandling, ErrorCodes } from '../errorHandling'
import { VNode } from '../vnode' import { VNode } from '../vnode'
@ -15,6 +15,7 @@ const warnedTypes = new WeakSet()
export function convertLegacyVModelProps(vnode: VNode) { export function convertLegacyVModelProps(vnode: VNode) {
const { type, shapeFlag, props, dynamicProps } = vnode const { type, shapeFlag, props, dynamicProps } = vnode
const comp = type as ComponentOptions
if (shapeFlag & ShapeFlags.COMPONENT && props && 'modelValue' in props) { if (shapeFlag & ShapeFlags.COMPONENT && props && 'modelValue' in props) {
if ( if (
!isCompatEnabled( !isCompatEnabled(
@ -28,17 +29,19 @@ export function convertLegacyVModelProps(vnode: VNode) {
return return
} }
if (__DEV__ && !warnedTypes.has(type as ComponentOptions)) { if (__DEV__ && !warnedTypes.has(comp)) {
pushWarningContext(vnode) pushWarningContext(vnode)
warnDeprecation(DeprecationTypes.COMPONENT_V_MODEL, { type } as any, type) warnDeprecation(DeprecationTypes.COMPONENT_V_MODEL, { type } as any, comp)
popWarningContext() popWarningContext()
warnedTypes.add(type as ComponentOptions) warnedTypes.add(comp)
} }
// v3 compiled model code -> v2 compat props // v3 compiled model code -> v2 compat props
// modelValue -> value // modelValue -> value
// onUpdate:modelValue -> onModelCompat:input // onUpdate:modelValue -> onModelCompat:input
const { prop = 'value', event = 'input' } = (type as any).model || {} const model = comp.model || {}
applyModelFromMixins(model, comp.mixins)
const { prop = 'value', event = 'input' } = model
if (prop !== 'modelValue') { if (prop !== 'modelValue') {
props[prop] = props.modelValue props[prop] = props.modelValue
delete props.modelValue delete props.modelValue
@ -52,6 +55,15 @@ export function convertLegacyVModelProps(vnode: VNode) {
} }
} }
function applyModelFromMixins(model: any, mixins?: ComponentOptions[]) {
if (mixins) {
mixins.forEach(m => {
if (m.model) extend(model, m.model)
if (m.mixins) applyModelFromMixins(model, m.mixins)
})
}
}
export function compatModelEmit( export function compatModelEmit(
instance: ComponentInternalInstance, instance: ComponentInternalInstance,
event: string, event: string,