diff --git a/src/select/option-props.ts b/src/select/option-props.ts index ebcf258fd..e3dd5e02a 100644 --- a/src/select/option-props.ts +++ b/src/select/option-props.ts @@ -32,6 +32,6 @@ export default { }, /** 选项值 */ value: { - type: [String, Number] as PropType, + type: [String, Number, Boolean] as PropType, }, }; diff --git a/src/select/select.tsx b/src/select/select.tsx index e97eaeeae..4062c17d8 100644 --- a/src/select/select.tsx +++ b/src/select/select.tsx @@ -278,7 +278,7 @@ export default defineComponent({ collapsedSelectedItems: values .map((item: any) => { const tmpValue = typeof item === 'object' ? item[props.keys?.value || 'value'] : item; - return props.options.find((t: OptionData) => t.value === tmpValue); + return props.options?.find((t: OptionData) => t.value === tmpValue); }) .slice(minCollapsedNum.value), count: values.length - minCollapsedNum.value, diff --git a/src/tag-input/hooks/useHover.ts b/src/tag-input/hooks/useHover.ts index 25d306439..b82843153 100644 --- a/src/tag-input/hooks/useHover.ts +++ b/src/tag-input/hooks/useHover.ts @@ -1,8 +1,8 @@ -import { ref, SetupContext } from '@vue/composition-api'; +import { ref, SetupContext, Ref } from '@vue/composition-api'; export interface UseHoverParams { - readonly: boolean; - disabled: boolean; + readonly: Ref; + disabled: Ref; onMouseenter: (context: { e: MouseEvent }) => void; onMouseleave: (context: { e: MouseEvent }) => void; } @@ -14,14 +14,14 @@ export default function useHover(props: UseHoverParams, { emit }: SetupContext) const isHover = ref(false); const addHover = (context: { e: MouseEvent }) => { - if (readonly || disabled) return; + if (readonly.value || disabled.value) return; isHover.value = true; onMouseenter?.(context); emit('mouseenter', context); }; const cancelHover = (context: { e: MouseEvent }) => { - if (readonly || disabled) return; + if (readonly.value || disabled.value) return; isHover.value = false; onMouseleave?.(context); emit('mouseleave', context); diff --git a/src/tag-input/tag-input.tsx b/src/tag-input/tag-input.tsx index 3a6995ee4..740774935 100644 --- a/src/tag-input/tag-input.tsx +++ b/src/tag-input/tag-input.tsx @@ -40,8 +40,8 @@ export default defineComponent({ } = toRefs(props); const { isHover, addHover, cancelHover } = useHover( { - readonly: props.readonly, - disabled: props.disabled, + readonly, + disabled, onMouseenter: props.onMouseenter, onMouseleave: props.onMouseleave, },