From 14e3fff72c7a5ea467ca61d8330123bdcf6accae Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 17 Jul 2020 10:04:37 +0800 Subject: [PATCH] =?UTF-8?q?DEC-14232=20fix:=20=E6=90=9C=E7=B4=A2=E9=9D=A2?= =?UTF-8?q?=E6=9D=BF=E4=B8=AD=E6=BB=9A=E5=8A=A8=E4=BC=9A=E6=94=B6=E8=B5=B7?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/combo.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index 3a17ba0ff..6c3ee9751 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -267,7 +267,7 @@ // return; // } // BI-10290 公式combo双击公式内容会收起 - if (e && ((!skipTriggerChecker && this.element.find(e.target).length > 0) + if (e && ((skipTriggerChecker !== true && this.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0) || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0)) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 var directions = this.options.direction.split(","); @@ -276,11 +276,12 @@ this.adjustWidth(); this.adjustHeight(); } - return false; + + return; } var isHide = this.options.hideChecker.apply(this, [e]); if (isHide === false) { - return false; + return; } this._hideView(); return true; @@ -310,7 +311,7 @@ this.popupView.visible(); BI.each(needHideWhenAnotherComboOpen, function (i, combo) { if (i !== self.getName()) { - if (combo && combo._hideIf(e, true)) { + if (combo && combo._hideIf(e, true) === true) { delete needHideWhenAnotherComboOpen[i]; } }