From 241c54164f2b8f26c5e626d1b4e267c20900b682 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com> Date: Tue, 26 Nov 2024 23:02:23 +0800 Subject: [PATCH 1/5] fix(colorPicker): fix colorMode i18n --- src/color-picker/panel/header.tsx | 33 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/color-picker/panel/header.tsx b/src/color-picker/panel/header.tsx index 00f3f0152..b8c560a67 100644 --- a/src/color-picker/panel/header.tsx +++ b/src/color-picker/panel/header.tsx @@ -6,6 +6,7 @@ import { COLOR_MODES } from '../const'; import { RadioGroup as TRadioGroup, RadioButton as TRadioButton } from '../../radio'; import { TdColorHandler, TdColorModes } from '../interfaces'; import { useBaseClassName } from '../hooks'; +import { useConfig } from '../../hooks'; export default defineComponent({ name: 'PanelHeader', @@ -28,6 +29,7 @@ export default defineComponent({ }, }, setup(props) { + const { globalConfig } = useConfig('colorPicker'); const baseClassName = useBaseClassName(); const modeValue = ref(props.mode); watch( @@ -37,6 +39,7 @@ export default defineComponent({ }, ); return { + globalConfig, baseClassName, modeValue, }; @@ -49,23 +52,19 @@ export default defineComponent({ return (
- {this.colorModes?.length === 1 ? ( - COLOR_MODES[this.colorModes[0]] - ) : ( - - {Object.keys(COLOR_MODES).map((key) => ( - - {COLOR_MODES[key]} - - ))} - - )} + + {this.colorModes.map((key) => ( + + {Reflect.get(this.globalConfig, COLOR_MODES[key as keyof typeof COLOR_MODES])} + + ))} +
); From 00837d2c895944ec54bc15a193f2b21edf2590fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com> Date: Tue, 26 Nov 2024 23:26:29 +0800 Subject: [PATCH 2/5] feat: use common constants --- src/color-picker/const.ts | 6 ------ src/color-picker/panel/format/index.tsx | 5 ++--- src/color-picker/panel/header.tsx | 2 +- src/color-picker/panel/index.tsx | 2 +- src/color-picker/panel/linear-gradient.tsx | 2 +- src/color-picker/panel/saturation.tsx | 5 ++++- src/color-picker/panel/slider.tsx | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 src/color-picker/const.ts diff --git a/src/color-picker/const.ts b/src/color-picker/const.ts deleted file mode 100644 index 7749223bc..000000000 --- a/src/color-picker/const.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { TdColorPickerProps } from '.'; - -export * from '../_common/js/color-picker/constants'; - -// 非透明色格式化类型 -export const FORMATS: TdColorPickerProps['format'][] = ['HEX', 'RGB', 'HSL', 'HSV', 'CMYK', 'CSS']; diff --git a/src/color-picker/panel/format/index.tsx b/src/color-picker/panel/format/index.tsx index 2f5e6e056..c4c63c5fe 100644 --- a/src/color-picker/panel/format/index.tsx +++ b/src/color-picker/panel/format/index.tsx @@ -5,7 +5,7 @@ import upperCase from 'lodash/upperCase'; import { TdColorHandler } from '../../../color-picker/interfaces'; import { TdColorPickerProps } from '../../type'; import props from '../../props'; -import { FORMATS } from '../../const'; +import { FORMATS } from '../../../_common/js/color-picker/constants'; import { Color } from '../../utils'; import { Select as TSelect, Option as TOption } from '../../../select'; import { Input as TInput } from '../../../input'; @@ -60,7 +60,6 @@ export default defineComponent({ }; }, render(h) { - const formats: TdColorPickerProps['format'][] = [...FORMATS]; const { baseClassName, handleModeChange } = this; const newProps = { ...this.$props, @@ -84,7 +83,7 @@ export default defineComponent({ onChange={handleModeChange} disabled={this.disabled} > - {formats.map((item) => ( + {FORMATS.map((item) => ( ))} diff --git a/src/color-picker/panel/header.tsx b/src/color-picker/panel/header.tsx index b8c560a67..33e30caac 100644 --- a/src/color-picker/panel/header.tsx +++ b/src/color-picker/panel/header.tsx @@ -2,7 +2,7 @@ import { defineComponent, PropType, ref, watch, } from '@vue/composition-api'; import props from '../props'; -import { COLOR_MODES } from '../const'; +import { COLOR_MODES } from '../../_common/js/color-picker/constants'; import { RadioGroup as TRadioGroup, RadioButton as TRadioButton } from '../../radio'; import { TdColorHandler, TdColorModes } from '../interfaces'; import { useBaseClassName } from '../hooks'; diff --git a/src/color-picker/panel/index.tsx b/src/color-picker/panel/index.tsx index cb4032613..92358c08f 100644 --- a/src/color-picker/panel/index.tsx +++ b/src/color-picker/panel/index.tsx @@ -9,7 +9,7 @@ import { DEFAULT_LINEAR_GRADIENT, TD_COLOR_USED_COLORS_MAX_SIZE, DEFAULT_SYSTEM_SWATCH_COLORS, -} from '../const'; +} from '../../_common/js/color-picker/constants'; import PanelHeader from './header'; import LinearGradient from './linear-gradient'; import SaturationPanel from './saturation'; diff --git a/src/color-picker/panel/linear-gradient.tsx b/src/color-picker/panel/linear-gradient.tsx index 25e6fa8e1..21e2dd497 100644 --- a/src/color-picker/panel/linear-gradient.tsx +++ b/src/color-picker/panel/linear-gradient.tsx @@ -2,7 +2,7 @@ import { computed, defineComponent, onBeforeUnmount, onMounted, reactive, ref, watch, } from '@vue/composition-api'; import cloneDeep from 'lodash/cloneDeep'; -import { GRADIENT_SLIDER_DEFAULT_WIDTH } from '../const'; +import { GRADIENT_SLIDER_DEFAULT_WIDTH } from '../../_common/js/color-picker/constants'; import { genGradientPoint, gradientColors2string, GradientColorPoint } from '../utils'; import { InputNumber as TInputNumber } from '../../input-number'; import { useBaseClassName } from '../hooks'; diff --git a/src/color-picker/panel/saturation.tsx b/src/color-picker/panel/saturation.tsx index 7aa05062f..a1d1fa4fc 100644 --- a/src/color-picker/panel/saturation.tsx +++ b/src/color-picker/panel/saturation.tsx @@ -1,7 +1,10 @@ import { computed, defineComponent, nextTick, onBeforeUnmount, onMounted, reactive, ref, } from '@vue/composition-api'; -import { SATURATION_PANEL_DEFAULT_HEIGHT, SATURATION_PANEL_DEFAULT_WIDTH } from '../const'; +import { + SATURATION_PANEL_DEFAULT_HEIGHT, + SATURATION_PANEL_DEFAULT_WIDTH, +} from '../../_common/js/color-picker/constants'; import { Select as TSelect, Option as TOption } from '../../select'; import { Draggable, Coordinate } from '../utils'; import { useBaseClassName } from '../hooks'; diff --git a/src/color-picker/panel/slider.tsx b/src/color-picker/panel/slider.tsx index 1be5e3d3b..0c98a76bb 100644 --- a/src/color-picker/panel/slider.tsx +++ b/src/color-picker/panel/slider.tsx @@ -1,7 +1,7 @@ import { computed, defineComponent, onBeforeUnmount, onMounted, PropType, reactive, ref, } from '@vue/composition-api'; -import { SLIDER_DEFAULT_WIDTH } from '../const'; +import { SLIDER_DEFAULT_WIDTH } from '../../_common/js/color-picker/constants'; import { Select as TSelect, Option as TOption } from '../../select'; import { Draggable, Coordinate } from '../utils'; import { useBaseClassName } from '../hooks'; From c57f32bc94c9ca11b6731ff30e0f53889c84a734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E4=BC=9F=E6=9D=B0?= <674416404@qq.com> Date: Wed, 27 Nov 2024 09:14:53 +0800 Subject: [PATCH 3/5] chore: update common --- src/_common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_common b/src/_common index 02c55e8fc..94e21e27e 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit 02c55e8fc35facdf53e19c6d5a2661ab12d2a468 +Subproject commit 94e21e27e2aba45cc0da263d424537f453055180 From fac7406b4dfffcbc2abafbb6517c3e09a7525d0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 6 Dec 2024 06:04:32 +0000 Subject: [PATCH 4/5] chore: update common --- src/_common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_common b/src/_common index 94e21e27e..324c0c06d 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit 94e21e27e2aba45cc0da263d424537f453055180 +Subproject commit 324c0c06d832122f6dcdf516a615d31257024d83 From d61488501a3c64542eb37c69af128d8ad6050389 Mon Sep 17 00:00:00 2001 From: Uyarn Date: Mon, 9 Dec 2024 19:00:55 +0800 Subject: [PATCH 5/5] chore: update common --- src/_common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_common b/src/_common index 324c0c06d..94e21e27e 160000 --- a/src/_common +++ b/src/_common @@ -1 +1 @@ -Subproject commit 324c0c06d832122f6dcdf516a615d31257024d83 +Subproject commit 94e21e27e2aba45cc0da263d424537f453055180