diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index c8faff2a5..0a963ce8c 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -266,6 +266,12 @@ 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的公式弹框需要特殊处理下 + var directions = this.options.direction.split(","); + if (BI.contains(directions, "innerLeft") || BI.contains(directions, "innerRight")) { + // popup可以出现的trigger内部的combo,滚动时不需要消失,而是调整位置 + 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 } });