From bc3a1372a86c10daace0208c191c42c01449d44d Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Thu, 21 Dec 2023 14:57:16 +0800 Subject: [PATCH] =?UTF-8?q?JSY-35428=20feat:=E5=A2=9E=E5=8A=A0=E9=80=89?= =?UTF-8?q?=E8=89=B2=E6=8E=A7=E4=BB=B6=E4=BC=A0=E9=80=92=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/colorchooser/colorchooser.js | 2 ++ .../fineui/src/case/colorchooser/colorchooser.popup.hex.js | 2 ++ packages/fineui/typescript/case/colorchooser/colorchooser.ts | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/packages/fineui/src/case/colorchooser/colorchooser.js b/packages/fineui/src/case/colorchooser/colorchooser.js index 7b075eae0..ac884db07 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.js @@ -24,6 +24,7 @@ export class ColorChooser extends Widget { height: 24, el: {}, simple: false, + colorItems: null, }); } @@ -62,6 +63,7 @@ export class ColorChooser extends Widget { el: extend( { type: HexColorChooserPopup.xtype, + colorItems: o.colorItems, recommendColorsGetter: o.recommendColorsGetter, ref: _ref => { this.colorPicker = _ref; diff --git a/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js b/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js index afde53a6a..14dec6a24 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js @@ -47,6 +47,7 @@ export class HexColorChooserPopup extends Widget { width: 300, recommendColorsGetter: emptyFn, // 推荐色获取接口 simple: false, // 简单模式, popup中没有自动和透明 + colorItems: null, }; render() { @@ -167,6 +168,7 @@ export class HexColorChooserPopup extends Widget { type: HexColorPicker.xtype, space: true, value: o.value, + items: o.colorItems, listeners: [ { eventName: ColorPicker.EVENT_CHANGE, diff --git a/packages/fineui/typescript/case/colorchooser/colorchooser.ts b/packages/fineui/typescript/case/colorchooser/colorchooser.ts index b58869e37..7787d78f2 100644 --- a/packages/fineui/typescript/case/colorchooser/colorchooser.ts +++ b/packages/fineui/typescript/case/colorchooser/colorchooser.ts @@ -5,6 +5,10 @@ export declare class ColorChooser extends Widget { static EVENT_CHANGE: string; static EVENT_AFTER_POPUPVIEW: string; + props: { + colorItems?: { value: string }[][]; + }; + isViewVisible(): boolean; hideView(): void;