diff --git a/src/cascader/cascader.vue b/src/cascader/cascader.vue index 7b456bd65..77d6b3d70 100644 --- a/src/cascader/cascader.vue +++ b/src/cascader/cascader.vue @@ -218,8 +218,7 @@ export default defineComponent({ childrenInfo.value = e; childrenInfo.level = level; } else { - setCascaderValue(item[(keys as Ref).value?.value ?? 'value']); - props.onChange?.( + setCascaderValue( item[(keys as Ref).value?.value ?? 'value'], items.map((item, index) => toRaw(item?.[selectedIndexes[index]])), ); diff --git a/src/shared/useVModel/index.ts b/src/shared/useVModel/index.ts index ab3a701d9..4835e0d4a 100644 --- a/src/shared/useVModel/index.ts +++ b/src/shared/useVModel/index.ts @@ -1,4 +1,5 @@ import { ref, Ref, getCurrentInstance, ComponentInternalInstance } from 'vue'; +import kebabCase from 'lodash/kebabCase'; export type ChangeHandler = (value: T, ...args: any[]) => void; @@ -10,12 +11,18 @@ export function useVModel( propName = 'value', // emit 和 eventName 用于支持 v-model 和 xxx.sync 语法糖 ): [Ref, ChangeHandler] { - const { emit } = getCurrentInstance() as ComponentInternalInstance; + const { emit, vnode } = getCurrentInstance() as ComponentInternalInstance; const internalValue = ref() as Ref; internalValue.value = defaultValue; - + const vProps = vnode.props || {}; + const isVM = + Object.prototype.hasOwnProperty.call(vProps, 'modelValue') || + Object.prototype.hasOwnProperty.call(vProps, 'model-value'); + const isVMP = + Object.prototype.hasOwnProperty.call(vProps, propName) || + Object.prototype.hasOwnProperty.call(vProps, kebabCase(propName)); // 受控模式 v-model:propName - if (typeof value.value !== 'undefined') { + if (isVMP || typeof value.value !== 'undefined') { return [ value, (newValue, ...args) => { @@ -26,7 +33,7 @@ export function useVModel( } // 受控模式:modelValue v-model - if (typeof modelValue.value !== 'undefined') { + if (isVM || typeof modelValue.value !== 'undefined') { return [ modelValue, (newValue, ...args) => {