From 4c93b47a058a42056015c7e99024b1cf6bbd030d Mon Sep 17 00:00:00 2001 From: acyza <101238421+acyza@users.noreply.github.com> Date: Sun, 23 Apr 2023 15:12:46 +0800 Subject: [PATCH] fix(components): [select] correct update selectSize (#11973) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 尝试恢复pr * chore: update * chore: update --- packages/components/select/__tests__/select.test.ts | 6 ++++++ packages/components/select/src/useSelect.ts | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/components/select/__tests__/select.test.ts b/packages/components/select/__tests__/select.test.ts index 2a6b461e75..3b0df0436f 100644 --- a/packages/components/select/__tests__/select.test.ts +++ b/packages/components/select/__tests__/select.test.ts @@ -2048,6 +2048,12 @@ describe('Select', () => { }, }) + Object.defineProperty(inputEl, 'clientHeight', { + get() { + return Number.parseInt(getComputedStyle(inputEl).height) + }, + }) + for (const size in sizeMap) { await wrapper.setProps({ size, diff --git a/packages/components/select/src/useSelect.ts b/packages/components/select/src/useSelect.ts index 59e52a27a9..a909948a52 100644 --- a/packages/components/select/src/useSelect.ts +++ b/packages/components/select/src/useSelect.ts @@ -383,7 +383,9 @@ export const useSelect = (props, states: States, ctx) => { const gotSize = getComponentSize(selectSize.value || form?.size) const sizeInMap = - gotSize === originClientHeight || originClientHeight <= 0 + selectSize.value || + gotSize === originClientHeight || + originClientHeight <= 0 ? gotSize : originClientHeight