Browse Source

Merge pull request #1149 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '44beeca589248d131a4e13d4c15b6deac5c4ae0f':
  update
  无JIRA任务 fix: expanded[0]是node对象, 比较取value
master
windy 5 years ago
parent
commit
c833b1f704
  1. 1
      changelog.md
  2. 3
      src/case/colorchooser/colorchooser.js
  3. 2
      src/component/treevaluechooser/abstract.treevaluechooser.js

1
changelog.md

@ -1,5 +1,6 @@
# 更新日志
2.0(2019-09)
- 修复tree_value_chooser选中节点的唯一子节点后搜索该子节点,无法取消选中的问题
- button的bubble创建的popup在收起的时候会destroy
- 修复了dynamic_date_pane在切换静态时间和动态时间的时候不会发事件的问题

3
src/case/colorchooser/colorchooser.js

@ -10,7 +10,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-color-chooser",
value: ""
value: "",
height: 24
});
},

2
src/component/treevaluechooser/abstract.treevaluechooser.js

@ -220,7 +220,7 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
path.push(split);
childrenCount.push(expanded.length);
// 如果只有一个值且取消的就是这个值
if (i === parents.length - 1 && expanded.length === 1 && expanded[0] === notSelectedValue) {
if (i === parents.length - 1 && expanded.length === 1 && expanded[0].value === notSelectedValue) {
for (var j = childrenCount.length - 1; j >= 0; j--) {
if (childrenCount[j] === 1) {
self._deleteNode(selectedValues, path[j]);

Loading…
Cancel
Save