Browse Source

Pull request #1961: BI-88256 fix: nashorn导出只导出一半的兼容

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

* commit '45c3717d230b3d13ebc389931d96e3ad8ea60dad':
  BI-88256 fix: nashorn导出只导出一半的兼容
es6
windy 3 years ago
parent
commit
391449c4f9
  1. 3
      src/widget/multiselect/multiselect.loader.js
  2. 2
      src/widget/multiselect/multiselect.loader.nobar.js
  3. 2
      src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js

3
src/widget/multiselect/multiselect.loader.js

@ -172,7 +172,10 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
}, },
populate: function (items) { populate: function (items) {
// arguments.length为0时对arguments[0]赋值后不同环境对其length的取值不同(nashorn)
if (BI.isNotNull(items)) {
arguments[0] = this._createItems(items); arguments[0] = this._createItems(items);
}
this.button_group.populate.apply(this.button_group, arguments); this.button_group.populate.apply(this.button_group, arguments);
}, },

2
src/widget/multiselect/multiselect.loader.nobar.js

@ -161,7 +161,9 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
}, },
populate: function (items) { populate: function (items) {
if (BI.isNotNull(items)) {
arguments[0] = this._createItems(items); arguments[0] = this._createItems(items);
}
this.button_group.populate.apply(this.button_group, arguments); this.button_group.populate.apply(this.button_group, arguments);
}, },

2
src/widget/searchmultitextvaluecombo/multitextvalue.loader.search.js

@ -158,7 +158,9 @@ BI.SearchMultiSelectLoader = BI.inherit(BI.Widget, {
}, },
populate: function (items) { populate: function (items) {
if (BI.isNotNull(items)) {
arguments[0] = this._createItems(items); arguments[0] = this._createItems(items);
}
this.button_group.populate.apply(this.button_group, arguments); this.button_group.populate.apply(this.button_group, arguments);
}, },

Loading…
Cancel
Save