diff --git a/packages/checkbox/src/checkbox-group.vue b/packages/checkbox/src/checkbox-group.vue index 1ea7a9fa15..aa6c962d9d 100644 --- a/packages/checkbox/src/checkbox-group.vue +++ b/packages/checkbox/src/checkbox-group.vue @@ -44,7 +44,7 @@ export default defineComponent({ setup(props, ctx) { const { elFormItem, elFormItemSize, ELEMENT } = useCheckboxGroup() - const checkboxGroupSize = computed(() => props.size || elFormItemSize.value || (ELEMENT || {}).size) + const checkboxGroupSize = computed(() => props.size || elFormItemSize.value || ELEMENT?.size) const changeEvent = value => { ctx.emit(UPDATE_MODEL_EVENT, value) @@ -71,7 +71,7 @@ export default defineComponent({ }) watch(() => props.modelValue, val => { - elFormItem.changeEvent?.(val) + elFormItem?.changeEvent?.(val) }) }, }) diff --git a/packages/checkbox/src/checkbox.d.ts b/packages/checkbox/src/checkbox.d.ts index 6e925be45f..83f2786c3a 100644 --- a/packages/checkbox/src/checkbox.d.ts +++ b/packages/checkbox/src/checkbox.d.ts @@ -1,4 +1,5 @@ import { ComputedRef } from 'vue' +import { AnyFunction } from '@element-plus/utils/types' export interface ICheckboxGroupInstance { name?: string modelValue?: ComputedRef @@ -9,22 +10,20 @@ export interface ICheckboxGroupInstance { fill?: ComputedRef textColor?: ComputedRef checkboxGroupSize?: ComputedRef - changeEvent?: (val: any) => void + changeEvent?: AnyFunction } export interface ICheckboxProps { modelValue: string | boolean | number - label?:string | boolean | number + label?: string | boolean | number indeterminate?: boolean disabled?: boolean checked?: boolean name?: string - trueLabel?: string| number - falseLabel?: string| number + trueLabel?: string | number + falseLabel?: string | number id?: string controls?: string border?: boolean size?: string } - -export type PartialReturnType unknown> = Partial> diff --git a/packages/checkbox/src/checkbox.vue b/packages/checkbox/src/checkbox.vue index 05d55224b5..4ce0d5301d 100644 --- a/packages/checkbox/src/checkbox.vue +++ b/packages/checkbox/src/checkbox.vue @@ -60,9 +60,11 @@