From 78dcc8ad5fbcfafe4db8163fca0c82bedb2201e8 Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Thu, 21 Dec 2023 16:46:43 +0800 Subject: [PATCH] =?UTF-8?q?JSY-35428=20feat:=E9=80=89=E8=89=B2=E6=9D=BF?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=AB=98=E5=BA=A6props=E4=BC=A0=E5=85=A5?= 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 | 3 ++- packages/fineui/typescript/case/colorchooser/colorchooser.ts | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/case/colorchooser/colorchooser.js b/packages/fineui/src/case/colorchooser/colorchooser.js index ac884db07..81d0594ea 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.js @@ -25,6 +25,7 @@ export class ColorChooser extends Widget { el: {}, simple: false, colorItems: null, + colorBoardHeight: 80, }); } @@ -64,6 +65,7 @@ export class ColorChooser extends Widget { { type: HexColorChooserPopup.xtype, colorItems: o.colorItems, + colorBoardHeight: o.colorBoardHeight, 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 14dec6a24..d653de37a 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js @@ -48,6 +48,7 @@ export class HexColorChooserPopup extends Widget { recommendColorsGetter: emptyFn, // 推荐色获取接口 simple: false, // 简单模式, popup中没有自动和透明 colorItems: null, + colorBoardHeight: 80, }; render() { @@ -189,7 +190,7 @@ export class HexColorChooserPopup extends Widget { bottom: 1, } ], - height: 80, + height: o.colorBoardHeight, } ], }, diff --git a/packages/fineui/typescript/case/colorchooser/colorchooser.ts b/packages/fineui/typescript/case/colorchooser/colorchooser.ts index 7787d78f2..ac429ef46 100644 --- a/packages/fineui/typescript/case/colorchooser/colorchooser.ts +++ b/packages/fineui/typescript/case/colorchooser/colorchooser.ts @@ -1,3 +1,4 @@ +import { Single } from 'typescript/base/single/single'; import { Widget } from '../../core/widget'; export declare class ColorChooser extends Widget { @@ -6,8 +7,10 @@ export declare class ColorChooser extends Widget { static EVENT_AFTER_POPUPVIEW: string; props: { + stopEvent?: boolean; + colorBoardHeight?: number; colorItems?: { value: string }[][]; - }; + } & Single["props"]; isViewVisible(): boolean;