From d5d7e8700e4d1da19faa5fb041624d9d73635a7d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 5 Sep 2020 12:18:08 +0800 Subject: [PATCH] fix(checkbox): fix warn about lacking default value of inject --- packages/checkbox/src/useCheckbox.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/checkbox/src/useCheckbox.ts b/packages/checkbox/src/useCheckbox.ts index d691d48e0a..8cba8a2954 100644 --- a/packages/checkbox/src/useCheckbox.ts +++ b/packages/checkbox/src/useCheckbox.ts @@ -13,9 +13,9 @@ import { ICheckboxGroupInstance, ICheckboxProps } from './checkbox' export const useCheckboxGroup = () => { //todo: ELEMENT const ELEMENT = null - const elForm = inject('elForm') - const elFormItem = inject('elFormItem') - const checkboxGroup = inject('CheckboxGroup') + const elForm = inject('elForm', {}) + const elFormItem = inject('elFormItem', {}) + const checkboxGroup = inject('CheckboxGroup', {}) const isGroup = computed(() => checkboxGroup && checkboxGroup?.name === 'ElCheckboxGroup') const elFormItemSize = computed(() => { return elFormItem?.elFormItemSize @@ -71,7 +71,7 @@ const useModel = (props: ICheckboxProps) => { const useCheckboxStatus = (props: ICheckboxProps, { model }: PartialReturnType) => { const { isGroup, checkboxGroup, elFormItemSize, ELEMENT } = useCheckboxGroup() const focus = ref(false) - const size = computed(() => checkboxGroup?.checkboxGroupSize?.value || elFormItemSize.value || ELEMENT?.size) + const size = computed(() => checkboxGroup?.checkboxGroupSize?.value || elFormItemSize.value || ELEMENT?.size) const isChecked = computed(() => { const value = model.value if (toTypeString(value) === '[object Boolean]') { @@ -110,7 +110,7 @@ const useDisabled = ( }) const isDisabled = computed(() => { return isGroup.value - ? checkboxGroup?.disabled?.value || props.disabled || elForm?.disabled?.value || isLimitDisabled.value + ? checkboxGroup?.disabled?.value || props.disabled || elForm?.disabled?.value || isLimitDisabled.value : props.disabled || elForm?.disabled?.value })