Browse Source

Pull request #2791: 无jira任务 提供样式设置

Merge in VISUAL/fineui from ~IMP/fineui_fui:master to master

* commit 'c6c0ca50cfb84fd46cf815fa2f8485ad02559082':
  无jira任务 提供样式设置
es6
imp 2 years ago
parent
commit
9004dbae3e
  1. 2
      src/case/colorchooser/colorchooser.js
  2. 3
      src/case/colorchooser/colorchooser.simple.js

2
src/case/colorchooser/colorchooser.js

@ -13,6 +13,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
value: "",
height: 24,
el: {},
simple: false
});
},
@ -30,6 +31,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
isNeedAdjustHeight: false,
el: BI.extend({
type: o.width <= 24 ? "bi.color_chooser_trigger" : "bi.long_color_chooser_trigger",
simple: o.simple,
ref: function (_ref) {
self.trigger = _ref;
},

3
src/case/colorchooser/colorchooser.simple.js

@ -20,6 +20,7 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({
type: "bi.color_chooser",
simple: o.simple,
element: this,
container: o.container,
value: o.value,
@ -61,4 +62,4 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, {
});
BI.SimpleColorChooser.EVENT_CHANGE = "EVENT_CHANGE";
BI.SimpleColorChooser.EVENT_AFTER_POPUPVIEW = "EVENT_AFTER_POPUPVIEW";
BI.shortcut("bi.simple_color_chooser", BI.SimpleColorChooser);
BI.shortcut("bi.simple_color_chooser", BI.SimpleColorChooser);

Loading…
Cancel
Save