diff --git a/dist/2.0/fineui.css b/dist/2.0/fineui.css index 910e46dee..781fd434c 100644 --- a/dist/2.0/fineui.css +++ b/dist/2.0/fineui.css @@ -1945,6 +1945,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-height: 100%; + float: left; } .bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle { /* 09版 */ @@ -2053,6 +2054,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-width: 100%; + float: left; } .bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center { /* 09版 */ diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 556137854..401d0f6e5 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * - * @class BI.FlexCenterLayout + * @class BI.FlexWrapperCenterLayout * @extends BI.Layout */ -BI.FlexCenterLayout = BI.inherit(BI.Layout, { +BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { - return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-flex-scrollable-center-layout clearfix" + return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { + baseCls: "bi-flex-scrollable-center-layout clearfix", + scrollable: true }); }, render: function () { - BI.FlexCenterLayout.superclass.render.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments); this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-center-adapt-layout-wrapper"); this.populate(this.options.items); }, _addElement: function (i, item) { var o = this.options; - var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments); + var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments); w.element.css({position: "relative"}); return w; }, @@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, { }, populate: function (items) { - BI.FlexCenterLayout.superclass.populate.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments); this._mount(); } }); -BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/** +BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * @@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", verticalAlign: BI.VerticalAlign.Top, rowSize: [], - scrollable: null, - scrolly: true, + scrollable: true, + scrolly: false, hgap: 0, vgap: 0, lgap: 0, @@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], - scrollx: true, + scrollx: false, + scrollable: true, hgap: 0, vgap: 0, lgap: 0, @@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { render: function () { BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments); var o = this.options; - this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); + this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); this.populate(this.options.items); }, diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 077295bcf..d187d9635 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * - * @class BI.FlexCenterLayout + * @class BI.FlexWrapperCenterLayout * @extends BI.Layout */ -BI.FlexCenterLayout = BI.inherit(BI.Layout, { +BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { - return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-flex-scrollable-center-layout clearfix" + return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { + baseCls: "bi-flex-scrollable-center-layout clearfix", + scrollable: true }); }, render: function () { - BI.FlexCenterLayout.superclass.render.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments); this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-center-adapt-layout-wrapper"); this.populate(this.options.items); }, _addElement: function (i, item) { var o = this.options; - var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments); + var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments); w.element.css({position: "relative"}); return w; }, @@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, { }, populate: function (items) { - BI.FlexCenterLayout.superclass.populate.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments); this._mount(); } }); -BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/** +BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * @@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", verticalAlign: BI.VerticalAlign.Top, rowSize: [], - scrollable: null, - scrolly: true, + scrollable: true, + scrolly: false, hgap: 0, vgap: 0, lgap: 0, @@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], - scrollx: true, + scrollx: false, + scrollable: true, hgap: 0, vgap: 0, lgap: 0, @@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { render: function () { BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments); var o = this.options; - this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); + this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); this.populate(this.options.items); }, diff --git a/dist/bundle.css b/dist/bundle.css index 910e46dee..781fd434c 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -1945,6 +1945,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-height: 100%; + float: left; } .bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle { /* 09版 */ @@ -2053,6 +2054,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-width: 100%; + float: left; } .bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center { /* 09版 */ diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 556137854..401d0f6e5 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * - * @class BI.FlexCenterLayout + * @class BI.FlexWrapperCenterLayout * @extends BI.Layout */ -BI.FlexCenterLayout = BI.inherit(BI.Layout, { +BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { - return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-flex-scrollable-center-layout clearfix" + return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { + baseCls: "bi-flex-scrollable-center-layout clearfix", + scrollable: true }); }, render: function () { - BI.FlexCenterLayout.superclass.render.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments); this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-center-adapt-layout-wrapper"); this.populate(this.options.items); }, _addElement: function (i, item) { var o = this.options; - var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments); + var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments); w.element.css({position: "relative"}); return w; }, @@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, { }, populate: function (items) { - BI.FlexCenterLayout.superclass.populate.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments); this._mount(); } }); -BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/** +BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * @@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", verticalAlign: BI.VerticalAlign.Top, rowSize: [], - scrollable: null, - scrolly: true, + scrollable: true, + scrolly: false, hgap: 0, vgap: 0, lgap: 0, @@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], - scrollx: true, + scrollx: false, + scrollable: true, hgap: 0, vgap: 0, lgap: 0, @@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { render: function () { BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments); var o = this.options; - this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); + this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); this.populate(this.options.items); }, diff --git a/dist/bundle.js b/dist/bundle.js index 077295bcf..d187d9635 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * - * @class BI.FlexCenterLayout + * @class BI.FlexWrapperCenterLayout * @extends BI.Layout */ -BI.FlexCenterLayout = BI.inherit(BI.Layout, { +BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { - return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-flex-scrollable-center-layout clearfix" + return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { + baseCls: "bi-flex-scrollable-center-layout clearfix", + scrollable: true }); }, render: function () { - BI.FlexCenterLayout.superclass.render.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments); this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-center-adapt-layout-wrapper"); this.populate(this.options.items); }, _addElement: function (i, item) { var o = this.options; - var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments); + var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments); w.element.css({position: "relative"}); return w; }, @@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, { }, populate: function (items) { - BI.FlexCenterLayout.superclass.populate.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments); this._mount(); } }); -BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/** +BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * @@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", verticalAlign: BI.VerticalAlign.Top, rowSize: [], - scrollable: null, - scrolly: true, + scrollable: true, + scrolly: false, hgap: 0, vgap: 0, lgap: 0, @@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], - scrollx: true, + scrollx: false, + scrollable: true, hgap: 0, vgap: 0, lgap: 0, @@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { render: function () { BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments); var o = this.options; - this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); + this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); this.populate(this.options.items); }, diff --git a/dist/core.css b/dist/core.css index 952a28957..2af587803 100644 --- a/dist/core.css +++ b/dist/core.css @@ -1945,6 +1945,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-height: 100%; + float: left; } .bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle { /* 09版 */ @@ -2053,6 +2054,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-width: 100%; + float: left; } .bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center { /* 09版 */ diff --git a/dist/core.js b/dist/core.js index 557675b42..3d2626367 100644 --- a/dist/core.js +++ b/dist/core.js @@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * - * @class BI.FlexCenterLayout + * @class BI.FlexWrapperCenterLayout * @extends BI.Layout */ -BI.FlexCenterLayout = BI.inherit(BI.Layout, { +BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { - return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-flex-scrollable-center-layout clearfix" + return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { + baseCls: "bi-flex-scrollable-center-layout clearfix", + scrollable: true }); }, render: function () { - BI.FlexCenterLayout.superclass.render.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments); this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-center-adapt-layout-wrapper"); this.populate(this.options.items); }, _addElement: function (i, item) { var o = this.options; - var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments); + var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments); w.element.css({position: "relative"}); return w; }, @@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, { }, populate: function (items) { - BI.FlexCenterLayout.superclass.populate.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments); this._mount(); } }); -BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/** +BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * @@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", verticalAlign: BI.VerticalAlign.Top, rowSize: [], - scrollable: null, - scrolly: true, + scrollable: true, + scrolly: false, hgap: 0, vgap: 0, lgap: 0, @@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], - scrollx: true, + scrollx: false, + scrollable: true, hgap: 0, vgap: 0, lgap: 0, @@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { render: function () { BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments); var o = this.options; - this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); + this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); this.populate(this.options.items); }, diff --git a/dist/core_without_normalize.css b/dist/core_without_normalize.css index ae5126d2d..9c8482fff 100644 --- a/dist/core_without_normalize.css +++ b/dist/core_without_normalize.css @@ -1664,6 +1664,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-height: 100%; + float: left; } .bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle { /* 09版 */ @@ -1772,6 +1773,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-width: 100%; + float: left; } .bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center { /* 09版 */ diff --git a/dist/fineui.css b/dist/fineui.css index 26d5cd034..c6b84c2ad 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -1945,6 +1945,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-height: 100%; + float: left; } .bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle { /* 09版 */ @@ -2053,6 +2054,7 @@ textarea { -o-flex-wrap: nowrap; flex-wrap: nowrap; min-width: 100%; + float: left; } .bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center { /* 09版 */ diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index a92dbff63..1788a7d7b 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -31831,24 +31831,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * - * @class BI.FlexCenterLayout + * @class BI.FlexWrapperCenterLayout * @extends BI.Layout */ -BI.FlexCenterLayout = BI.inherit(BI.Layout, { +BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { - return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-flex-scrollable-center-layout clearfix" + return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { + baseCls: "bi-flex-scrollable-center-layout clearfix", + scrollable: true }); }, render: function () { - BI.FlexCenterLayout.superclass.render.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments); this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-center-adapt-layout-wrapper"); this.populate(this.options.items); }, _addElement: function (i, item) { var o = this.options; - var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments); + var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments); w.element.css({position: "relative"}); return w; }, @@ -31867,11 +31868,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, { }, populate: function (items) { - BI.FlexCenterLayout.superclass.populate.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments); this._mount(); } }); -BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/** +BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * @@ -31884,8 +31885,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", verticalAlign: BI.VerticalAlign.Top, rowSize: [], - scrollable: null, - scrolly: true, + scrollable: true, + scrolly: false, hgap: 0, vgap: 0, lgap: 0, @@ -32017,7 +32018,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], - scrollx: true, + scrollx: false, + scrollable: true, hgap: 0, vgap: 0, lgap: 0, @@ -32081,7 +32083,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { render: function () { BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments); var o = this.options; - this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); + this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); this.populate(this.options.items); }, diff --git a/dist/fineui.js b/dist/fineui.js index abc4989df..67d3e4ae2 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -31831,24 +31831,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * - * @class BI.FlexCenterLayout + * @class BI.FlexWrapperCenterLayout * @extends BI.Layout */ -BI.FlexCenterLayout = BI.inherit(BI.Layout, { +BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { - return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-flex-scrollable-center-layout clearfix" + return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { + baseCls: "bi-flex-scrollable-center-layout clearfix", + scrollable: true }); }, render: function () { - BI.FlexCenterLayout.superclass.render.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments); this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-center-adapt-layout-wrapper"); this.populate(this.options.items); }, _addElement: function (i, item) { var o = this.options; - var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments); + var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments); w.element.css({position: "relative"}); return w; }, @@ -31867,11 +31868,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, { }, populate: function (items) { - BI.FlexCenterLayout.superclass.populate.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments); this._mount(); } }); -BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/** +BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * @@ -31884,8 +31885,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", verticalAlign: BI.VerticalAlign.Top, rowSize: [], - scrollable: null, - scrolly: true, + scrollable: true, + scrolly: false, hgap: 0, vgap: 0, lgap: 0, @@ -32017,7 +32018,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], - scrollx: true, + scrollx: false, + scrollable: true, hgap: 0, vgap: 0, lgap: 0, @@ -32081,7 +32083,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { render: function () { BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments); var o = this.options; - this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); + this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); this.populate(this.options.items); }, diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index a1e98b486..d110d25fe 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -20512,24 +20512,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * - * @class BI.FlexCenterLayout + * @class BI.FlexWrapperCenterLayout * @extends BI.Layout */ -BI.FlexCenterLayout = BI.inherit(BI.Layout, { +BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { - return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-flex-scrollable-center-layout clearfix" + return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { + baseCls: "bi-flex-scrollable-center-layout clearfix", + scrollable: true }); }, render: function () { - BI.FlexCenterLayout.superclass.render.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments); this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-center-adapt-layout-wrapper"); this.populate(this.options.items); }, _addElement: function (i, item) { var o = this.options; - var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments); + var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments); w.element.css({position: "relative"}); return w; }, @@ -20548,11 +20549,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, { }, populate: function (items) { - BI.FlexCenterLayout.superclass.populate.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments); this._mount(); } }); -BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/** +BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/** *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * @@ -20565,8 +20566,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", verticalAlign: BI.VerticalAlign.Top, rowSize: [], - scrollable: null, - scrolly: true, + scrollable: true, + scrolly: false, hgap: 0, vgap: 0, lgap: 0, @@ -20698,7 +20699,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], - scrollx: true, + scrollx: false, + scrollable: true, hgap: 0, vgap: 0, lgap: 0, @@ -20762,7 +20764,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { render: function () { BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments); var o = this.options; - this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); + this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); this.populate(this.options.items); }, diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js index 1225a1e1a..d31919404 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js @@ -2,24 +2,25 @@ *自适应水平和垂直方向都居中容器 * Created by GUY on 2016/12/2. * - * @class BI.FlexCenterLayout + * @class BI.FlexWrapperCenterLayout * @extends BI.Layout */ -BI.FlexCenterLayout = BI.inherit(BI.Layout, { +BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, { props: function () { - return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), { - baseCls: "bi-flex-scrollable-center-layout clearfix" + return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), { + baseCls: "bi-flex-scrollable-center-layout clearfix", + scrollable: true }); }, render: function () { - BI.FlexCenterLayout.superclass.render.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments); this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-center-adapt-layout-wrapper"); this.populate(this.options.items); }, _addElement: function (i, item) { var o = this.options; - var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments); + var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments); w.element.css({position: "relative"}); return w; }, @@ -38,8 +39,8 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, { }, populate: function (items) { - BI.FlexCenterLayout.superclass.populate.apply(this, arguments); + BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments); this._mount(); } }); -BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout); \ No newline at end of file +BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout); \ No newline at end of file diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js index d37c8ecb9..4a2fb5c48 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js @@ -11,8 +11,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", verticalAlign: BI.VerticalAlign.Top, rowSize: [], - scrollable: null, - scrolly: true, + scrollable: true, + scrolly: false, hgap: 0, vgap: 0, lgap: 0, diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js index e378d2d08..a757c6777 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js @@ -11,7 +11,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, { baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix", horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], - scrollx: true, + scrollx: false, + scrollable: true, hgap: 0, vgap: 0, lgap: 0, diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js index 7e2dc3773..eb341dba2 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js @@ -25,7 +25,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { render: function () { BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments); var o = this.options; - this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); + this.$wrapper = BI.Widget._renderEngine.createElement("
").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign); this.populate(this.options.items); }, diff --git a/src/css/core/wrapper/flex.css b/src/css/core/wrapper/flex.css index ba1216ee5..d470729db 100644 --- a/src/css/core/wrapper/flex.css +++ b/src/css/core/wrapper/flex.css @@ -351,6 +351,7 @@ -o-flex-wrap: nowrap; flex-wrap: nowrap; min-height: 100%; + float: left; } .bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle { /* 09版 */ @@ -459,6 +460,7 @@ -o-flex-wrap: nowrap; flex-wrap: nowrap; min-width: 100%; + float: left; } .bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center { /* 09版 */ diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index f53f95c64..143ce8bd9 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -45,6 +45,7 @@ flex-wrap: nowrap; min-height: 100%; + float: left; &.v-middle { /* 09版 */ diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index c698d4832..5174b200d 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -45,6 +45,7 @@ flex-wrap: nowrap; min-width: 100%; + float: left; &.h-center { /* 09版 */