Browse Source

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

* commit '4c30241b8c2096a1844316e7ca7aa431bf1ff451':
  update
  BI-58124 fix: 调用控件的populate不会刷新右上角计数
master
windy 5 years ago
parent
commit
0cae1bd234
  1. 1
      src/widget/multiselect/multiselect.combo.js
  2. 1
      src/widget/multiselect/multiselect.combo.nobar.js
  3. 1
      src/widget/multiselect/multiselect.insert.combo.js
  4. 1
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  5. 22
      src/widget/multiselect/trigger/button.checkselected.js

1
src/widget/multiselect/multiselect.combo.js

@ -424,6 +424,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
populate: function () { populate: function () {
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
this.numberCounter.populate.apply(this.numberCounter, arguments);
} }
}); });

1
src/widget/multiselect/multiselect.combo.nobar.js

@ -420,6 +420,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
populate: function () { populate: function () {
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
this.numberCounter.populate.apply(this.numberCounter, arguments);
} }
}); });

1
src/widget/multiselect/multiselect.insert.combo.js

@ -441,6 +441,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
populate: function () { populate: function () {
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
this.numberCounter.populate.apply(this.numberCounter, arguments);
} }
}); });

1
src/widget/multiselect/multiselect.insert.combo.nobar.js

@ -438,6 +438,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
populate: function () { populate: function () {
this.combo.populate.apply(this.combo, arguments); this.combo.populate.apply(this.combo, arguments);
this.numberCounter.populate.apply(this.numberCounter, arguments);
} }
}); });

22
src/widget/multiselect/trigger/button.checkselected.js

@ -45,11 +45,8 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
} }
}, },
setValue: function (ob) { _populate: function (ob) {
var self = this, o = this.options; var self = this, o = this.options;
ob || (ob = {});
ob.type || (ob.type = BI.Selection.Multi);
ob.value || (ob.value = []);
if (ob.type === BI.Selection.All) { if (ob.type === BI.Selection.All) {
o.itemsCreator({ o.itemsCreator({
type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH type: BI.MultiSelectCombo.REQ_GET_DATA_LENGTH
@ -68,6 +65,23 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
}); });
}, },
_assertValue: function (ob) {
ob || (ob = {});
ob.type || (ob.type = BI.Selection.Multi);
ob.value || (ob.value = []);
return ob;
},
setValue: function (ob) {
ob = this._assertValue(ob);
this.options.value = ob;
this._populate(ob);
},
populate: function () {
this._populate(this._assertValue(this.options.value));
},
getValue: function () { getValue: function () {
} }

Loading…
Cancel
Save