Browse Source

Merge pull request #70390 in DEC/fineui from master to feature/x

* commit '9004dbae3e3fddeebd47f29c16252def78cf366f':
  无jira任务 提供样式设置
es6
superman 2 years ago
parent
commit
84e1dde695
  1. 2
      src/case/colorchooser/colorchooser.js
  2. 1
      src/case/colorchooser/colorchooser.simple.js

2
src/case/colorchooser/colorchooser.js

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

1
src/case/colorchooser/colorchooser.simple.js

@ -20,6 +20,7 @@ BI.SimpleColorChooser = BI.inherit(BI.Widget, {
this.combo = BI.createWidget({ this.combo = BI.createWidget({
type: "bi.color_chooser", type: "bi.color_chooser",
simple: o.simple,
element: this, element: this,
container: o.container, container: o.container,
value: o.value, value: o.value,

Loading…
Cancel
Save