Merge pull request #198 in ~GUY/fineui from ~YOUNG/fineuig:master to master

* commit 'a921e9985d2a65d8c863f20b948424ab1fa6dea9': downlistcombo container
7 years ago · c98d27a70a
9 changed files with 2218 additions and 2210 deletions
--- a/bi/widget.js
+++ b/bi/widget.js
@ -3511,6 +3511,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
            adjustLength: 0,
            direction: "bottom",
            trigger: "click",
+            container: null,
            el: {}
        })
    },
@ -3540,6 +3541,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
            type: 'bi.combo',
            trigger: o.trigger,
            isNeedAdjustWidth: false,
+            container: o.container,
            adjustLength: o.adjustLength,
            direction: o.direction,
            el: BI.createWidget(o.el, {
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -82038,6 +82038,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
            adjustLength: 0,
            direction: "bottom",
            trigger: "click",
+            container: null,
            el: {}
        })
    },
@ -82067,6 +82068,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
            type: 'bi.combo',
            trigger: o.trigger,
            isNeedAdjustWidth: false,
+            container: o.container,
            adjustLength: o.adjustLength,
            direction: o.direction,
            el: BI.createWidget(o.el, {
--- a/dist/widget.js
+++ b/dist/widget.js
@ -3511,6 +3511,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
            adjustLength: 0,
            direction: "bottom",
            trigger: "click",
+            container: null,
            el: {}
        })
    },
@ -3540,6 +3541,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
            type: 'bi.combo',
            trigger: o.trigger,
            isNeedAdjustWidth: false,
+            container: o.container,
            adjustLength: o.adjustLength,
            direction: o.direction,
            el: BI.createWidget(o.el, {
--- a/src/widget/downlist/combo.downlist.js
+++ b/src/widget/downlist/combo.downlist.js
@ -11,6 +11,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
            adjustLength: 0,
            direction: "bottom",
            trigger: "click",
+            container: null,
            el: {}
        })
    },
@ -40,6 +41,7 @@ BI.DownListCombo = BI.inherit(BI.Widget, {
            type: 'bi.combo',
            trigger: o.trigger,
            isNeedAdjustWidth: false,
+            container: o.container,
            adjustLength: o.adjustLength,
            direction: o.direction,
            el: BI.createWidget(o.el, {