mirror of https://github.com/vuejs/core.git
chore: update
This commit is contained in:
parent
a866b288b6
commit
3cc3dde909
|
@ -51,7 +51,7 @@ export function renderComponentRoot(
|
||||||
vnode,
|
vnode,
|
||||||
proxy,
|
proxy,
|
||||||
withProxy,
|
withProxy,
|
||||||
propsOptions: [propsOptions],
|
propsOptions: [propsOption],
|
||||||
slots,
|
slots,
|
||||||
attrs,
|
attrs,
|
||||||
emit,
|
emit,
|
||||||
|
@ -158,15 +158,12 @@ export function renderComponentRoot(
|
||||||
const keys = Object.keys(fallthroughAttrs)
|
const keys = Object.keys(fallthroughAttrs)
|
||||||
if (keys.length) {
|
if (keys.length) {
|
||||||
if (isElementRoot(root)) {
|
if (isElementRoot(root)) {
|
||||||
if (propsOptions && keys.some(isModelListener)) {
|
if (propsOption && keys.some(isModelListener)) {
|
||||||
// If a v-model listener (onUpdate:xxx) has a corresponding declared
|
// If a v-model listener (onUpdate:xxx) has a corresponding declared
|
||||||
// prop, it indicates this component expects to handle v-model and
|
// prop, it indicates this component expects to handle v-model and
|
||||||
// it should not fallthrough.
|
// it should not fallthrough.
|
||||||
// related: #1543, #1643, #1989
|
// related: #1543, #1643, #1989
|
||||||
fallthroughAttrs = filterModelListeners(
|
fallthroughAttrs = filterModelListeners(fallthroughAttrs, propsOption)
|
||||||
fallthroughAttrs,
|
|
||||||
propsOptions,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
root = cloneVNode(root, fallthroughAttrs, false, true)
|
root = cloneVNode(root, fallthroughAttrs, false, true)
|
||||||
} else if (__DEV__ && !accessedAttrs && root.type !== Comment) {
|
} else if (__DEV__ && !accessedAttrs && root.type !== Comment) {
|
||||||
|
|
Loading…
Reference in New Issue