Browse Source

Pull request #1375: BI-67721 fix: color_chooser setValue为null

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '9001ba27b36a803a88077caafa65a15474bbd846':
  BI-67721 fix: color_chooser setValue为null
  Revert "BI-67618 refactor: number_editor支持min,max属性"
  BI-67618 refactor: number_editor支持min,max属性
es6
windy 4 years ago
parent
commit
88e5f9d0a2
  1. 3
      changelog.md
  2. 3
      src/case/colorchooser/colorchooser.js

3
changelog.md

@ -1,4 +1,7 @@
# 更新日志
2.0(2020-07)
- 修复了颜色选择器设置值为null的时候,trigger和popup表现不一致的问题
2.0(2020-06)
- 修复了复选下拉树半选节点的子节点未加载的时候,点选该半选节点是取消选中的问题
- 下拉树系列支持isNeedAdjustWidth以动态变化宽度

3
src/case/colorchooser/colorchooser.js

@ -19,6 +19,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
BI.ColorChooser.superclass._init.apply(this, arguments);
var self = this, o = this.options;
o.value = o.value || "";
this.combo = BI.createWidget({
type: "bi.combo",
element: this,
@ -89,7 +90,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
},
setValue: function (color) {
this.combo.setValue(color);
this.combo.setValue(color || "");
},
getValue: function () {

Loading…
Cancel
Save