Browse Source

Pull request #1564: DEC-15275 fix: 平台菜单栏竟然不是移出不消失的,反人类

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '2add8a4ed741e745f727542a5863536f4f51ec69':
  DEC-15275 fix: 平台菜单栏竟然不是移出不消失的,反人类
es6
parent
commit
49279ac757
  1. 12
      src/base/combination/combo.js

12
src/base/combination/combo.js

@ -81,7 +81,7 @@
element: this element: this
}, BI.LogicFactory.createLogic("vertical", BI.extend(o.logic, { }, BI.LogicFactory.createLogic("vertical", BI.extend(o.logic, {
items: [ items: [
{el: this.combo} { el: this.combo }
] ]
})))); }))));
o.isDefaultInit && (this._assertPopupView()); o.isDefaultInit && (this._assertPopupView());
@ -117,7 +117,7 @@
var enterPopup = false; var enterPopup = false;
function hide (e) { function hide(e) {
if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) {
self._hideView(e); self._hideView(e);
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo);
@ -181,6 +181,9 @@
}); });
break; break;
case "click-hover": case "click-hover":
case "click-blur":
// IE走click-hover逻辑
if (BI.isIE() || ev === "click-hover") {
var debounce = BI.debounce(function (e) { var debounce = BI.debounce(function (e) {
if (self.combo.element.__isMouseInBounds__(e)) { if (self.combo.element.__isMouseInBounds__(e)) {
if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) { if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
@ -219,7 +222,8 @@
} }
}); });
break; break;
case "click-blur": }
var debounce = BI.debounce(function (e) { var debounce = BI.debounce(function (e) {
if (self.combo.element.__isMouseInBounds__(e)) { if (self.combo.element.__isMouseInBounds__(e)) {
if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) { if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
@ -295,7 +299,7 @@
scrolly: false, scrolly: false,
element: this.options.container || this, element: this.options.container || this,
items: [ items: [
{el: this.popupView} { el: this.popupView }
] ]
}); });
this._rendered = true; this._rendered = true;

Loading…
Cancel
Save