Browse Source

Merge pull request #3112 in VISUAL/fineui from DEC/fineui:release/11.0 to master

* commit '1eea6a9ddff65e724cc7ba2695f8329eb1295d30':
  无JIRA任务 编译错
  REPORT-80202 fix: combo.textvalue hideView时把参数传下去
es6
Aeolus.Zhang-张敬峥 2 years ago
parent
commit
d977dcce4e
  1. 2
      src/base/combination/combo.js
  2. 4
      src/case/combo/textvaluecombo/combo.textvalue.js

2
src/base/combination/combo.js

@ -153,7 +153,7 @@
o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName()); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName());
this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW, e);
}, },
_popupView: function (e) { _popupView: function (e) {

4
src/case/combo/textvaluecombo/combo.textvalue.js

@ -88,7 +88,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
const value = this.popup.getValue(); const value = this.popup.getValue();
this.setValue(value); this.setValue(value);
if (o.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) { if (o.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) {
this.combo.hideView(); this.combo.hideView(...args);
this.fireEvent(BI.TextValueCombo.EVENT_CHANGE, ...args); this.fireEvent(BI.TextValueCombo.EVENT_CHANGE, ...args);
} }
if (o.chooseType === BI.ButtonGroup.CHOOSE_TYPE_MULTI && BI.isEmptyArray(value)) { if (o.chooseType === BI.ButtonGroup.CHOOSE_TYPE_MULTI && BI.isEmptyArray(value)) {
@ -126,7 +126,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
listeners: [ listeners: [
{ {
eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW, eventName: BI.Combo.EVENT_BEFORE_POPUPVIEW,
action: (...args) => { action: () => {
changeTag = false; changeTag = false;
} }
}, { }, {

Loading…
Cancel
Save