From f8cd4402f2847e54419bc2348b2cc5a7add59d7e Mon Sep 17 00:00:00 2001 From: taninsist Date: Sat, 24 Aug 2024 20:22:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(color-picker):=E4=BF=AE=E5=A4=8DColorPi?= =?UTF-8?q?cker=E9=80=8F=E4=BC=A0SelectInputProps=E6=97=A0=E6=95=88?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/color-picker/panel/format/index.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/color-picker/panel/format/index.tsx b/src/color-picker/panel/format/index.tsx index 2e34005ec..6ea7aa388 100644 --- a/src/color-picker/panel/format/index.tsx +++ b/src/color-picker/panel/format/index.tsx @@ -11,6 +11,7 @@ import { Select as TSelect, Option as TOption } from '../../../select'; import { Input as TInput } from '../../../input'; import FormatInputs from './inputs'; import { useBaseClassName } from '../../hooks'; +import type { TdSelectInputProps } from '../../../select-input/type'; export default defineComponent({ name: 'FormatPanel', @@ -77,6 +78,7 @@ export default defineComponent({ {...selectInputProps} popupProps={{ overlayClassName: `${baseClassName}__select-options`, + ...(selectInputProps as TdSelectInputProps).popupProps, }} v-model={this.formatModel} onChange={handleModeChange} From 2d6a4196656b91e584defa9b47ced11b9c32fa89 Mon Sep 17 00:00:00 2001 From: taninsist Date: Mon, 26 Aug 2024 19:46:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(color-picker):=20=E4=BF=AE=E5=A4=8Dcolo?= =?UTF-8?q?r-picker=E7=BB=84=E4=BB=B6=E7=9A=84selectInputProps=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/color-picker/panel/format/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/color-picker/panel/format/index.tsx b/src/color-picker/panel/format/index.tsx index 6ea7aa388..2f5e6e056 100644 --- a/src/color-picker/panel/format/index.tsx +++ b/src/color-picker/panel/format/index.tsx @@ -75,7 +75,7 @@ export default defineComponent({