From 600754aa617096ead793710b7d03db8e7f0728c6 Mon Sep 17 00:00:00 2001 From: Young Date: Fri, 10 Nov 2017 16:33:34 +0800 Subject: [PATCH] BI-10839 combo --- bi/base.js | 47 ++++++++++++++++++------ bi/case.js | 2 ++ demo/js/case/combo/demo.icon_combo.js | 2 ++ dist/base.js | 47 ++++++++++++++++++------ dist/bundle.js | 49 ++++++++++++++++++++------ dist/case.js | 2 ++ dist/demo.js | 2 ++ src/base/combination/combo.js | 47 ++++++++++++++++++------ src/case/combo/iconcombo/combo.icon.js | 2 ++ 9 files changed, 160 insertions(+), 40 deletions(-) diff --git a/bi/base.js b/bi/base.js index d0d2e54780..4fa6511538 100644 --- a/bi/base.js +++ b/bi/base.js @@ -3008,6 +3008,19 @@ BI.Combo = BI.inherit(BI.Widget, { e.stopPropagation(); } }; + + var enterPopup = false; + + function hide() { + if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { + self._hideView(); + self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); + self.fireEvent(BI.Combo.EVENT_COLLAPSE); + } + self.popupView && self.popupView.element.off("mouseenter." + self.getName()).off("mouseleave." + self.getName()); + enterPopup = false; + } + BI.each(evs, function (i, ev) { switch (ev) { case "hover": @@ -3019,11 +3032,18 @@ BI.Combo = BI.inherit(BI.Widget, { } }); self.element.on("mouseleave." + self.getName(), function (e) { - if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { - self._hideView(); - self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); - self.fireEvent(BI.Combo.EVENT_COLLAPSE); - } + self.popupView.element.on("mouseenter." + self.getName(), function (e) { + enterPopup = true; + self.popupView.element.on("mouseleave." + self.getName(), function (e) { + hide(); + }); + self.popupView.element.off("mouseenter." + self.getName()); + }); + BI.defer(function () { + if (!enterPopup) { + hide(); + } + }, 50); }); break; case "click": @@ -3069,11 +3089,18 @@ BI.Combo = BI.inherit(BI.Widget, { st(e); }); self.element.on("mouseleave." + self.getName(), function (e) { - if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { - self._hideView(); - self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); - self.fireEvent(BI.Combo.EVENT_COLLAPSE); - } + self.popupView.element.on("mouseenter." + self.getName(), function (e) { + enterPopup = true; + self.popupView.element.on("mouseleave." + self.getName(), function (e) { + hide(); + }); + self.popupView.element.off("mouseenter." + self.getName()); + }); + BI.defer(function () { + if (!enterPopup) { + hide(); + } + }, 50); }); break; } diff --git a/bi/case.js b/bi/case.js index 969681289e..db11d57789 100644 --- a/bi/case.js +++ b/bi/case.js @@ -5260,6 +5260,8 @@ BI.IconCombo = BI.inherit(BI.Widget, { type: "bi.combo", element: this, direction: o.direction, + trigger: o.trigger, + container: o.container, adjustLength: o.adjustLength, adjustXOffset: o.adjustXOffset, adjustYOffset: o.adjustYOffset, diff --git a/demo/js/case/combo/demo.icon_combo.js b/demo/js/case/combo/demo.icon_combo.js index 060f0da72a..f75004a0f0 100644 --- a/demo/js/case/combo/demo.icon_combo.js +++ b/demo/js/case/combo/demo.icon_combo.js @@ -15,6 +15,8 @@ Demo.IconCombo = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.icon_combo", + trigger: "click-hover", + container: "body", ref:function(_ref){ self.refs=_ref; }, diff --git a/dist/base.js b/dist/base.js index d0d2e54780..4fa6511538 100644 --- a/dist/base.js +++ b/dist/base.js @@ -3008,6 +3008,19 @@ BI.Combo = BI.inherit(BI.Widget, { e.stopPropagation(); } }; + + var enterPopup = false; + + function hide() { + if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { + self._hideView(); + self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); + self.fireEvent(BI.Combo.EVENT_COLLAPSE); + } + self.popupView && self.popupView.element.off("mouseenter." + self.getName()).off("mouseleave." + self.getName()); + enterPopup = false; + } + BI.each(evs, function (i, ev) { switch (ev) { case "hover": @@ -3019,11 +3032,18 @@ BI.Combo = BI.inherit(BI.Widget, { } }); self.element.on("mouseleave." + self.getName(), function (e) { - if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { - self._hideView(); - self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); - self.fireEvent(BI.Combo.EVENT_COLLAPSE); - } + self.popupView.element.on("mouseenter." + self.getName(), function (e) { + enterPopup = true; + self.popupView.element.on("mouseleave." + self.getName(), function (e) { + hide(); + }); + self.popupView.element.off("mouseenter." + self.getName()); + }); + BI.defer(function () { + if (!enterPopup) { + hide(); + } + }, 50); }); break; case "click": @@ -3069,11 +3089,18 @@ BI.Combo = BI.inherit(BI.Widget, { st(e); }); self.element.on("mouseleave." + self.getName(), function (e) { - if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { - self._hideView(); - self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); - self.fireEvent(BI.Combo.EVENT_COLLAPSE); - } + self.popupView.element.on("mouseenter." + self.getName(), function (e) { + enterPopup = true; + self.popupView.element.on("mouseleave." + self.getName(), function (e) { + hide(); + }); + self.popupView.element.off("mouseenter." + self.getName()); + }); + BI.defer(function () { + if (!enterPopup) { + hide(); + } + }, 50); }); break; } diff --git a/dist/bundle.js b/dist/bundle.js index 0e32da68e3..9a01da5cbb 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -28749,6 +28749,19 @@ BI.Combo = BI.inherit(BI.Widget, { e.stopPropagation(); } }; + + var enterPopup = false; + + function hide() { + if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { + self._hideView(); + self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); + self.fireEvent(BI.Combo.EVENT_COLLAPSE); + } + self.popupView && self.popupView.element.off("mouseenter." + self.getName()).off("mouseleave." + self.getName()); + enterPopup = false; + } + BI.each(evs, function (i, ev) { switch (ev) { case "hover": @@ -28760,11 +28773,18 @@ BI.Combo = BI.inherit(BI.Widget, { } }); self.element.on("mouseleave." + self.getName(), function (e) { - if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { - self._hideView(); - self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); - self.fireEvent(BI.Combo.EVENT_COLLAPSE); - } + self.popupView.element.on("mouseenter." + self.getName(), function (e) { + enterPopup = true; + self.popupView.element.on("mouseleave." + self.getName(), function (e) { + hide(); + }); + self.popupView.element.off("mouseenter." + self.getName()); + }); + BI.defer(function () { + if (!enterPopup) { + hide(); + } + }, 50); }); break; case "click": @@ -28810,11 +28830,18 @@ BI.Combo = BI.inherit(BI.Widget, { st(e); }); self.element.on("mouseleave." + self.getName(), function (e) { - if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { - self._hideView(); - self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); - self.fireEvent(BI.Combo.EVENT_COLLAPSE); - } + self.popupView.element.on("mouseenter." + self.getName(), function (e) { + enterPopup = true; + self.popupView.element.on("mouseleave." + self.getName(), function (e) { + hide(); + }); + self.popupView.element.off("mouseenter." + self.getName()); + }); + BI.defer(function () { + if (!enterPopup) { + hide(); + } + }, 50); }); break; } @@ -67626,6 +67653,8 @@ BI.IconCombo = BI.inherit(BI.Widget, { type: "bi.combo", element: this, direction: o.direction, + trigger: o.trigger, + container: o.container, adjustLength: o.adjustLength, adjustXOffset: o.adjustXOffset, adjustYOffset: o.adjustYOffset, diff --git a/dist/case.js b/dist/case.js index 969681289e..db11d57789 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5260,6 +5260,8 @@ BI.IconCombo = BI.inherit(BI.Widget, { type: "bi.combo", element: this, direction: o.direction, + trigger: o.trigger, + container: o.container, adjustLength: o.adjustLength, adjustXOffset: o.adjustXOffset, adjustYOffset: o.adjustYOffset, diff --git a/dist/demo.js b/dist/demo.js index e261b48f91..cc31af03e9 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -1734,6 +1734,8 @@ Demo.IconCombo = BI.inherit(BI.Widget, { type: "bi.horizontal_auto", items: [{ type: "bi.icon_combo", + trigger: "click-hover", + container: "body", ref:function(_ref){ self.refs=_ref; }, diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index 9526764ff2..14d892a1f8 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -105,6 +105,19 @@ BI.Combo = BI.inherit(BI.Widget, { e.stopPropagation(); } }; + + var enterPopup = false; + + function hide() { + if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { + self._hideView(); + self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); + self.fireEvent(BI.Combo.EVENT_COLLAPSE); + } + self.popupView && self.popupView.element.off("mouseenter." + self.getName()).off("mouseleave." + self.getName()); + enterPopup = false; + } + BI.each(evs, function (i, ev) { switch (ev) { case "hover": @@ -116,11 +129,18 @@ BI.Combo = BI.inherit(BI.Widget, { } }); self.element.on("mouseleave." + self.getName(), function (e) { - if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { - self._hideView(); - self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); - self.fireEvent(BI.Combo.EVENT_COLLAPSE); - } + self.popupView.element.on("mouseenter." + self.getName(), function (e) { + enterPopup = true; + self.popupView.element.on("mouseleave." + self.getName(), function (e) { + hide(); + }); + self.popupView.element.off("mouseenter." + self.getName()); + }); + BI.defer(function () { + if (!enterPopup) { + hide(); + } + }, 50); }); break; case "click": @@ -166,11 +186,18 @@ BI.Combo = BI.inherit(BI.Widget, { st(e); }); self.element.on("mouseleave." + self.getName(), function (e) { - if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid() && o.toggle === true) { - self._hideView(); - self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo); - self.fireEvent(BI.Combo.EVENT_COLLAPSE); - } + self.popupView.element.on("mouseenter." + self.getName(), function (e) { + enterPopup = true; + self.popupView.element.on("mouseleave." + self.getName(), function (e) { + hide(); + }); + self.popupView.element.off("mouseenter." + self.getName()); + }); + BI.defer(function () { + if (!enterPopup) { + hide(); + } + }, 50); }); break; } diff --git a/src/case/combo/iconcombo/combo.icon.js b/src/case/combo/iconcombo/combo.icon.js index 75666fc6ca..96a022d583 100644 --- a/src/case/combo/iconcombo/combo.icon.js +++ b/src/case/combo/iconcombo/combo.icon.js @@ -55,6 +55,8 @@ BI.IconCombo = BI.inherit(BI.Widget, { type: "bi.combo", element: this, direction: o.direction, + trigger: o.trigger, + container: o.container, adjustLength: o.adjustLength, adjustXOffset: o.adjustXOffset, adjustYOffset: o.adjustYOffset,