Merge pull request #997 in VISUAL/fineui from ~IMP/fineui_fui:master to master

* commit '68b12a37e0c74cb19e3fbf6d75bc68985b5914e5':
  BI-47435 fix: combo逻辑优化
  BI-47435 fix: combo逻辑优化

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]);

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
             }

src/widget/multilayerdownlist/combo.downlist.js

@@ -54,7 +54,6 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
             }),
             popup: {
                 el: this.popupview,
-                stopPropagation: true,
                 maxHeight: 1000
             }
         });