Browse Source

Pull request #3712: JSY-35428 feat:增加选色控件传递可选颜色色值

Merge in VISUAL/fineui from ~CLAIRE.TANG/fineui:master to master

* commit 'bc3a1372a86c10daace0208c191c42c01449d44d':
  JSY-35428 feat:增加选色控件传递可选颜色色值
research/test
Claire.Tang-唐锦霞 11 months ago
parent
commit
30f454d2e9
  1. 2
      packages/fineui/src/case/colorchooser/colorchooser.js
  2. 2
      packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js
  3. 4
      packages/fineui/typescript/case/colorchooser/colorchooser.ts

2
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;

2
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,

4
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;

Loading…
Cancel
Save