From d5018723aa1ea2c171326c6c98c3099d3e1cec6e Mon Sep 17 00:00:00 2001 From: imp Date: Mon, 8 Jul 2019 20:07:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?BI-47435=20fix:=20combo=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/combo.js | 4 ++++ src/widget/downlist/combo.downlist.js | 1 - src/widget/multilayerdownlist/combo.downlist.js | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index c8faff2a5..586378c55 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -266,6 +266,10 @@ BI.Combo = BI.inherit(BI.Widget, { if ((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的公式弹框需要特殊处理下 + if (this.options.direction.indexOf("innerLeft") > -1 || this.options.direction.indexOf("innerRight") > -1) { + this.adjustWidth(); + this.adjustHeight(); + } return; } var isHide = this.options.hideChecker.apply(this, [e]); diff --git a/src/widget/downlist/combo.downlist.js b/src/widget/downlist/combo.downlist.js index 654f85d4a..0171e89f6 100644 --- a/src/widget/downlist/combo.downlist.js +++ b/src/widget/downlist/combo.downlist.js @@ -54,7 +54,6 @@ BI.DownListCombo = BI.inherit(BI.Widget, { }), popup: { el: this.popupview, - stopPropagation: true, maxHeight: 1000, minWidth: 140 } diff --git a/src/widget/multilayerdownlist/combo.downlist.js b/src/widget/multilayerdownlist/combo.downlist.js index cdbea543b..fac278cd1 100644 --- a/src/widget/multilayerdownlist/combo.downlist.js +++ b/src/widget/multilayerdownlist/combo.downlist.js @@ -54,7 +54,6 @@ BI.DownListCombo = BI.inherit(BI.Widget, { }), popup: { el: this.popupview, - stopPropagation: true, maxHeight: 1000 } }); From 68b12a37e0c74cb19e3fbf6d75bc68985b5914e5 Mon Sep 17 00:00:00 2001 From: imp Date: Tue, 9 Jul 2019 10:16:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?BI-47435=20fix:=20combo=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/combo.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index 586378c55..0a963ce8c 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -266,7 +266,9 @@ BI.Combo = BI.inherit(BI.Widget, { if ((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的公式弹框需要特殊处理下 - if (this.options.direction.indexOf("innerLeft") > -1 || this.options.direction.indexOf("innerRight") > -1) { + var directions = this.options.direction.split(","); + if (BI.contains(directions, "innerLeft") || BI.contains(directions, "innerRight")) { + // popup可以出现的trigger内部的combo，滚动时不需要消失，而是调整位置 this.adjustWidth(); this.adjustHeight(); }