From 0f2181abc3f67fe87885fa758e893673bfefcd71 Mon Sep 17 00:00:00 2001 From: Aex Date: Sun, 1 Aug 2021 16:04:30 +0800 Subject: [PATCH] fix(input): Improve inputStyle reference (#2780) --- packages/input/src/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/input/src/index.vue b/packages/input/src/index.vue index ae66a9311f..d92375cc65 100644 --- a/packages/input/src/index.vue +++ b/packages/input/src/index.vue @@ -251,6 +251,7 @@ export default defineComponent({ const validateState = computed(() => elFormItem.validateState || '') const validateIcon = computed(() => VALIDATE_STATE_MAP[validateState.value]) const computedTextareaStyle = computed(() => ({ + ...props.inputStyle, ..._textareaCalcStyle.value, resize: props.resize, })) @@ -294,12 +295,10 @@ export default defineComponent({ const minRows = isObject(autosize) ? autosize.minRows : void 0 const maxRows = isObject(autosize) ? autosize.maxRows : void 0 _textareaCalcStyle.value = { - ...props.inputStyle, ...calcTextareaHeight(textarea.value, minRows, maxRows), } } else { _textareaCalcStyle.value = { - ...props.inputStyle, minHeight: calcTextareaHeight(textarea.value).minHeight, } }