Browse Source

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

* commit '5e9f3fbf98998d42e132ca1468e1eb674db4a0cd':
  BI-60554 fix: populate的时候只需要刷新右上角的计数
  BI-60558 fix: IE11下title显示两次的问题
es6
windy 5 years ago
parent
commit
79c4496189
  1. 2
      src/widget/multiselect/multiselect.combo.js
  2. 2
      src/widget/multiselect/multiselect.combo.nobar.js
  3. 2
      src/widget/multiselect/multiselect.insert.combo.js
  4. 2
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  5. 4
      src/widget/multiselect/trigger/switcher.checkselected.js
  6. 23
      src/widget/numberinterval/numberinterval.js
  7. 5
      src/widget/numberinterval/singleeditor/single.editor.js

2
src/widget/multiselect/multiselect.combo.js

@ -424,7 +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); this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments);
} }
}); });

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

@ -420,7 +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); this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments);
} }
}); });

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

@ -441,7 +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); this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments);
} }
}); });

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

@ -438,7 +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); this.numberCounter.populateSwitcher.apply(this.numberCounter, arguments);
} }
}); });

4
src/widget/multiselect/trigger/switcher.checkselected.js

@ -96,6 +96,10 @@ BI.MultiSelectCheckSelectedSwitcher = BI.inherit(BI.Widget, {
populate: function (items) { populate: function (items) {
this.switcher.populate.apply(this.switcher, arguments); this.switcher.populate.apply(this.switcher, arguments);
},
populateSwitcher: function () {
this.button.populate.apply(this.switcher, arguments);
} }
}); });

23
src/widget/numberinterval/numberinterval.js

@ -80,8 +80,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
watermark: o.watermark, watermark: o.watermark,
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
value: o.max, value: o.max,
level: "warning",
tipType: "success",
title: function () { title: function () {
return self.bigEditor && self.bigEditor.getValue(); return self.bigEditor && self.bigEditor.getValue();
}, },
@ -113,22 +111,6 @@ BI.NumberInterval = BI.inherit(BI.Single, {
right: 5 right: 5
}] }]
}); });
// this.smallCombo = BI.createWidget({
// type: "bi.number_interval_combo",
// cls: "number-interval-small-combo",
// height: o.height,
// value: o.closemin ? 1 : 0,
// offsetStyle: "left"
// });
//
// this.bigCombo = BI.createWidget({
// type: "bi.number_interval_combo",
// cls: "number-interval-big-combo",
// height: o.height,
// value: o.closemax ? 1 : 0,
// offsetStyle: "left"
// });
this.smallCombo = BI.createWidget({ this.smallCombo = BI.createWidget({
type: "bi.icon_combo", type: "bi.icon_combo",
cls: "number-interval-small-combo bi-border-top bi-border-bottom bi-border-right", cls: "number-interval-small-combo bi-border-top bi-border-bottom bi-border-right",
@ -301,10 +283,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
}, },
_setTitle: function (v) { _setTitle: function (v) {
var self = this; this.label.setTitle(v);
self.bigEditor.setTitle(v);
self.smallEditor.setTitle(v);
self.label.setTitle(v);
}, },
_setFocusEvent: function (w) { _setFocusEvent: function (w) {

5
src/widget/numberinterval/singleeditor/single.editor.js

@ -19,7 +19,6 @@ BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
watermark: o.watermark, watermark: o.watermark,
allowBlank: o.allowBlank, allowBlank: o.allowBlank,
value: o.value, value: o.value,
level: o.level,
quitChecker: o.quitChecker, quitChecker: o.quitChecker,
validationChecker: o.validationChecker, validationChecker: o.validationChecker,
listeners: [{ listeners: [{
@ -70,10 +69,6 @@ BI.NumberIntervalSingleEidtor = BI.inherit(BI.Single, {
return this.editor.getValue(); return this.editor.getValue();
}, },
setTitle: function (v) {
return this.editor.setTitle(v);
},
setValue: function (v) { setValue: function (v) {
return this.editor.setValue(v); return this.editor.setValue(v);
} }

Loading…
Cancel
Save