Merge pull request #178374 in DEC/fineui from master to feature/x

* commit '09b1e664433508b9f656b1eabe94f0f0a70c90f2': 无JIRA fix: bi.combo布局overflow问题
2 years ago · 94c9b65498
2 changed files with 2 additions and 0 deletions
--- a/src/base/combination/bubble.js
+++ b/src/base/combination/bubble.js
@ -83,6 +83,7 @@

            BI.createWidget(BI.extend({
                element: this,
+                scrolly: false,
            }, BI.LogicFactory.createLogic("vertical", BI.extend(o.logic, {
                items: [
                    { el: this.combo }
--- a/src/base/combination/combo.js
+++ b/src/base/combination/combo.js
@ -93,6 +93,7 @@

            BI.createWidget(BI.extend({
                element: this,
+                scrolly: false,
            }, BI.LogicFactory.createLogic("vertical", BI.extend(o.logic, {
                items: [
                    { el: this.combo }