From 6cfcde17d697793f4af3ce589f8621fe42cbf31d Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 20 Jan 2022 17:34:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feature:=20=E6=B0=94=E6=B3=A1=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=93=81=E7=89=8C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/combo.js | 6 +++--- src/case/combo/bubblecombo/combo.bubble.js | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index 58f1b23cd..d07e75c91 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -144,7 +144,7 @@ delete needHideWhenAnotherComboOpen[this.getName()]; delete currentOpenedCombos[this.getName()]; - 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()); this.fireEvent(BI.Combo.EVENT_AFTER_HIDEVIEW); }, @@ -170,11 +170,11 @@ this.element.addClass(this.options.comboClass); o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName()); - BI.Widget._renderEngine.createElement(document).unbind("mousewheel." + this.getName()); + o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).unbind("mousewheel." + this.getName()); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).unbind("blur." + this.getName()); o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); - BI.Widget._renderEngine.createElement(document).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); + o.hideWhenClickOutside && BI.Widget._renderEngine.createElement(document).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this)); BI.EVENT_BLUR && o.hideWhenBlur && BI.Widget._renderEngine.createElement(window).bind("blur." + this.getName(), BI.bind(this._hideIf, this)); this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW); }, diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index dbd42e84d..a6f20bbbd 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -17,6 +17,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { direction: "bottom,left", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right isDefaultInit: false, destroyWhenHide: false, + hideWhenClickOutside: true, hideWhenBlur: true, isNeedAdjustHeight: true, // 是否需要高度调整 isNeedAdjustWidth: true, @@ -43,6 +44,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { direction: o.direction, isDefaultInit: o.isDefaultInit, hideWhenBlur: o.hideWhenBlur, + hideWhenClickOutside: o.hideWhenClickOutside, destroyWhenHide: o.destroyWhenHide, hideWhenAnotherComboOpen: o.hideWhenAnotherComboOpen, isNeedAdjustHeight: o.isNeedAdjustHeight, From 90363dce9c0cd0ddf14d99e61b896d9e21e4aae7 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 20 Jan 2022 17:46:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feature:=20=E6=B0=94=E6=B3=A1=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=93=81=E7=89=8C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsy.lessconfig.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jsy.lessconfig.json b/jsy.lessconfig.json index 8e2974193..2ac35b60a 100644 --- a/jsy.lessconfig.json +++ b/jsy.lessconfig.json @@ -1,4 +1,5 @@ { + "@background-color-primary": "#003D4D", "@color-primary": "#00acbe", "font-color-normal": "#0d1540", "font-color-light-gray": "#0d1540", @@ -17,4 +18,4 @@ "border-color-disabled": "#e8eaed", "border-color-success": "#28b668", "border-color-negative": "#e65251" -} \ No newline at end of file +}