Browse Source

Pull request #1519: BI-73804 fix: allvaluechoosercombo全选不使用assist直接从items取

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

* commit '62ec81335e015429ebdfdf14167c1bb21ebaa07b':
  update
  根据comment修改
  BI-73804 fix: 全选不使用assist直接从items取
es6
windy 4 years ago
parent
commit
f4ecab9f4e
  1. 11
      src/component/allvaluechooser/combo.allvaluechooser.js
  2. 2
      src/component/treevaluechooser/pane.treevaluechooser.js

11
src/component/allvaluechooser/combo.allvaluechooser.js

@ -52,11 +52,16 @@ BI.AllValueChooserCombo = BI.inherit(BI.AbstractAllValueChooser, {
}, },
getValue: function () { getValue: function () {
return this.getAllValue();
},
getAllValue: function () {
var val = this.combo.getValue() || {}; var val = this.combo.getValue() || {};
if (val.type === BI.Selection.All) { if (val.type === BI.Selection.Multi) {
return val.assist;
}
return val.value || []; return val.value || [];
}
return BI.difference(BI.map(this.items, "value"), val.value || []);
}, },
populate: function (items) { populate: function (items) {

2
src/component/treevaluechooser/pane.treevaluechooser.js

@ -46,7 +46,7 @@ BI.TreeValueChooserPane = BI.inherit(BI.AbstractTreeValueChooser, {
}, },
getAllValue: function() { getAllValue: function() {
return this.buildCompleteTree(this.combo.getValue()); return this.buildCompleteTree(this.pane.getValue());
}, },
populate: function (items) { populate: function (items) {

Loading…
Cancel
Save