Skip to content

Commit

Permalink
Merge branch 'Tencent:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
myronliu347 authored Aug 27, 2024
2 parents 8eab666 + 36b4393 commit 0fa8d0a
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/color-picker/panel/format/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -74,9 +75,10 @@ export default defineComponent({
<t-select
size="small"
class={`${baseClassName}__format-mode-select`}
{...selectInputProps}
selectInputProps={{ ...selectInputProps }}
popupProps={{
overlayClassName: `${baseClassName}__select-options`,
...(selectInputProps as TdSelectInputProps).popupProps,
}}
v-model={this.formatModel}
onChange={handleModeChange}
Expand Down

0 comments on commit 0fa8d0a

Please sign in to comment.