guy 6 years ago
parent
commit
db5e5087a0
  1. 22
      dist/2.0/fineui.css
  2. 52
      dist/2.0/fineui.ie.js
  3. 10
      dist/2.0/fineui.ie.min.js
  4. 52
      dist/2.0/fineui.js
  5. 10
      dist/2.0/fineui.min.js
  6. 22
      dist/bundle.css
  7. 52
      dist/bundle.ie.js
  8. 10
      dist/bundle.ie.min.js
  9. 52
      dist/bundle.js
  10. 10
      dist/bundle.min.js
  11. 22
      dist/core.css
  12. 52
      dist/core.js
  13. 22
      dist/core_without_normalize.css
  14. 22
      dist/fineui.css
  15. 52
      dist/fineui.ie.js
  16. 10
      dist/fineui.ie.min.js
  17. 52
      dist/fineui.js
  18. 10
      dist/fineui.min.js
  19. 34
      dist/fineui_without_jquery_polyfill.js
  20. 2
      dist/utils.min.js
  21. 18
      src/core/platform/web/config.js
  22. 6
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js
  23. 8
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js
  24. 6
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  25. 8
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js
  26. 6
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
  27. 22
      src/css/core/wrapper/flex.css
  28. 4
      src/less/core/wrapper/flex.wrapper.center.less
  29. 4
      src/less/core/wrapper/flex.wrapper.horizontal.less
  30. 4
      src/less/core/wrapper/flex.wrapper.vertical.less

22
dist/2.0/fineui.css vendored

@ -1863,7 +1863,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-center-adapt-layout .flex-wrapper-center-adapt-layout-wrapper {
.bi-flex-scrollable-center-adapt-layout .flex-scrollable-center-adapt-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1907,7 +1907,7 @@ textarea {
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1956,7 +1956,7 @@ textarea {
flex-wrap: nowrap;
min-height: 100%;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-middle {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -1966,7 +1966,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-bottom {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-bottom {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -1976,7 +1976,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -1986,7 +1986,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.h-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-orient: vertical;
/* 12版 */
@ -2015,7 +2015,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -2064,7 +2064,7 @@ textarea {
flex-wrap: nowrap;
min-width: 100%;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-center {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -2075,7 +2075,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-right {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-right {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -2086,7 +2086,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -2097,7 +2097,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.v-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-orient: horizontal;
/* 12版 */

52
dist/2.0/fineui.ie.js vendored

@ -19158,10 +19158,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
if (!isIE && supportFlex && justOneItem) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend(ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend(ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -19174,10 +19174,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex();
if (!isIE && supportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center_adapt"});
// 不是IE用flex__scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_vertical_center_adapt"});
}
@ -19191,10 +19191,10 @@ BI.prepares.push(function () {
});
BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
if (!BI.isIE() && isSupportFlex()) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -31589,12 +31589,12 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-center-layout clearfix"
baseCls: "bi-flex-scrollable-center-layout clearfix"
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-center-adapt-layout-wrapper");
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
@ -31623,7 +31623,7 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31633,7 +31633,7 @@ BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
@ -31649,7 +31649,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_vertical",
type: "bi.flex_scrollable_vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31673,8 +31673,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31684,7 +31684,7 @@ BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalC
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-horizontal-layout clearfix",
baseCls: "bi-flex-scrollable-horizontal-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
@ -31701,7 +31701,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperHorizontalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.populate(this.options.items);
},
@ -31756,7 +31756,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.shortcut("bi.flex_scrollable_horizontal", BI.FlexWrapperHorizontalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31766,7 +31766,7 @@ BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
@ -31781,7 +31781,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_horizontal",
type: "bi.flex_scrollable_horizontal",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31805,8 +31805,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31816,7 +31816,7 @@ BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCente
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
@ -31833,7 +31833,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("<div>").addClass("flex-wrapper-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},
@ -31888,7 +31888,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_vertical", BI.FlexWrapperVerticalLayout);/**
BI.shortcut("bi.flex_scrollable_vertical", BI.FlexWrapperVerticalLayout);/**
* 固定子组件上下左右的布局容器
* @class BI.AbsoluteLayout
* @extends BI.Layout

10
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

52
dist/2.0/fineui.js vendored

@ -19158,10 +19158,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
if (!isIE && supportFlex && justOneItem) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend(ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend(ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -19174,10 +19174,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex();
if (!isIE && supportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center_adapt"});
// 不是IE用flex__scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_vertical_center_adapt"});
}
@ -19191,10 +19191,10 @@ BI.prepares.push(function () {
});
BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
if (!BI.isIE() && isSupportFlex()) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -31589,12 +31589,12 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-center-layout clearfix"
baseCls: "bi-flex-scrollable-center-layout clearfix"
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-center-adapt-layout-wrapper");
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
@ -31623,7 +31623,7 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31633,7 +31633,7 @@ BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
@ -31649,7 +31649,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_vertical",
type: "bi.flex_scrollable_vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31673,8 +31673,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31684,7 +31684,7 @@ BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalC
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-horizontal-layout clearfix",
baseCls: "bi-flex-scrollable-horizontal-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
@ -31701,7 +31701,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperHorizontalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.populate(this.options.items);
},
@ -31756,7 +31756,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.shortcut("bi.flex_scrollable_horizontal", BI.FlexWrapperHorizontalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31766,7 +31766,7 @@ BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
@ -31781,7 +31781,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_horizontal",
type: "bi.flex_scrollable_horizontal",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31805,8 +31805,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31816,7 +31816,7 @@ BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCente
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
@ -31833,7 +31833,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("<div>").addClass("flex-wrapper-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},
@ -31888,7 +31888,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_vertical", BI.FlexWrapperVerticalLayout);/**
BI.shortcut("bi.flex_scrollable_vertical", BI.FlexWrapperVerticalLayout);/**
* 固定子组件上下左右的布局容器
* @class BI.AbsoluteLayout
* @extends BI.Layout

10
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

22
dist/bundle.css vendored

@ -1863,7 +1863,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-center-adapt-layout .flex-wrapper-center-adapt-layout-wrapper {
.bi-flex-scrollable-center-adapt-layout .flex-scrollable-center-adapt-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1907,7 +1907,7 @@ textarea {
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1956,7 +1956,7 @@ textarea {
flex-wrap: nowrap;
min-height: 100%;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-middle {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -1966,7 +1966,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-bottom {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-bottom {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -1976,7 +1976,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -1986,7 +1986,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.h-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-orient: vertical;
/* 12版 */
@ -2015,7 +2015,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -2064,7 +2064,7 @@ textarea {
flex-wrap: nowrap;
min-width: 100%;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-center {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -2075,7 +2075,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-right {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-right {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -2086,7 +2086,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -2097,7 +2097,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.v-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-orient: horizontal;
/* 12版 */

52
dist/bundle.ie.js vendored

@ -19158,10 +19158,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
if (!isIE && supportFlex && justOneItem) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend(ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend(ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -19174,10 +19174,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex();
if (!isIE && supportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center_adapt"});
// 不是IE用flex__scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_vertical_center_adapt"});
}
@ -19191,10 +19191,10 @@ BI.prepares.push(function () {
});
BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
if (!BI.isIE() && isSupportFlex()) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -31589,12 +31589,12 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-center-layout clearfix"
baseCls: "bi-flex-scrollable-center-layout clearfix"
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-center-adapt-layout-wrapper");
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
@ -31623,7 +31623,7 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31633,7 +31633,7 @@ BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
@ -31649,7 +31649,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_vertical",
type: "bi.flex_scrollable_vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31673,8 +31673,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31684,7 +31684,7 @@ BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalC
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-horizontal-layout clearfix",
baseCls: "bi-flex-scrollable-horizontal-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
@ -31701,7 +31701,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperHorizontalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.populate(this.options.items);
},
@ -31756,7 +31756,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.shortcut("bi.flex_scrollable_horizontal", BI.FlexWrapperHorizontalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31766,7 +31766,7 @@ BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
@ -31781,7 +31781,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_horizontal",
type: "bi.flex_scrollable_horizontal",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31805,8 +31805,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31816,7 +31816,7 @@ BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCente
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
@ -31833,7 +31833,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("<div>").addClass("flex-wrapper-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},
@ -31888,7 +31888,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_vertical", BI.FlexWrapperVerticalLayout);/**
BI.shortcut("bi.flex_scrollable_vertical", BI.FlexWrapperVerticalLayout);/**
* 固定子组件上下左右的布局容器
* @class BI.AbsoluteLayout
* @extends BI.Layout

10
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

52
dist/bundle.js vendored

@ -19158,10 +19158,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
if (!isIE && supportFlex && justOneItem) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend(ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend(ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -19174,10 +19174,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex();
if (!isIE && supportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center_adapt"});
// 不是IE用flex__scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_vertical_center_adapt"});
}
@ -19191,10 +19191,10 @@ BI.prepares.push(function () {
});
BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
if (!BI.isIE() && isSupportFlex()) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -31589,12 +31589,12 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-center-layout clearfix"
baseCls: "bi-flex-scrollable-center-layout clearfix"
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-center-adapt-layout-wrapper");
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
@ -31623,7 +31623,7 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31633,7 +31633,7 @@ BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
@ -31649,7 +31649,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_vertical",
type: "bi.flex_scrollable_vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31673,8 +31673,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31684,7 +31684,7 @@ BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalC
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-horizontal-layout clearfix",
baseCls: "bi-flex-scrollable-horizontal-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
@ -31701,7 +31701,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperHorizontalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.populate(this.options.items);
},
@ -31756,7 +31756,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.shortcut("bi.flex_scrollable_horizontal", BI.FlexWrapperHorizontalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31766,7 +31766,7 @@ BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
@ -31781,7 +31781,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_horizontal",
type: "bi.flex_scrollable_horizontal",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31805,8 +31805,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31816,7 +31816,7 @@ BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCente
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
@ -31833,7 +31833,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("<div>").addClass("flex-wrapper-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},
@ -31888,7 +31888,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_vertical", BI.FlexWrapperVerticalLayout);/**
BI.shortcut("bi.flex_scrollable_vertical", BI.FlexWrapperVerticalLayout);/**
* 固定子组件上下左右的布局容器
* @class BI.AbsoluteLayout
* @extends BI.Layout

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

22
dist/core.css vendored

@ -1863,7 +1863,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-center-adapt-layout .flex-wrapper-center-adapt-layout-wrapper {
.bi-flex-scrollable-center-adapt-layout .flex-scrollable-center-adapt-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1907,7 +1907,7 @@ textarea {
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1956,7 +1956,7 @@ textarea {
flex-wrap: nowrap;
min-height: 100%;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-middle {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -1966,7 +1966,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-bottom {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-bottom {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -1976,7 +1976,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -1986,7 +1986,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.h-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-orient: vertical;
/* 12版 */
@ -2015,7 +2015,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -2064,7 +2064,7 @@ textarea {
flex-wrap: nowrap;
min-width: 100%;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-center {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -2075,7 +2075,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-right {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-right {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -2086,7 +2086,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -2097,7 +2097,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.v-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-orient: horizontal;
/* 12版 */

52
dist/core.js vendored

@ -19158,10 +19158,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
if (!isIE && supportFlex && justOneItem) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend(ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend(ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -19174,10 +19174,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex();
if (!isIE && supportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center_adapt"});
// 不是IE用flex__scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_vertical_center_adapt"});
}
@ -19191,10 +19191,10 @@ BI.prepares.push(function () {
});
BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
if (!BI.isIE() && isSupportFlex()) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -31589,12 +31589,12 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-center-layout clearfix"
baseCls: "bi-flex-scrollable-center-layout clearfix"
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-center-adapt-layout-wrapper");
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
@ -31623,7 +31623,7 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31633,7 +31633,7 @@ BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
@ -31649,7 +31649,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_vertical",
type: "bi.flex_scrollable_vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31673,8 +31673,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31684,7 +31684,7 @@ BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalC
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-horizontal-layout clearfix",
baseCls: "bi-flex-scrollable-horizontal-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
@ -31701,7 +31701,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperHorizontalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.populate(this.options.items);
},
@ -31756,7 +31756,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.shortcut("bi.flex_scrollable_horizontal", BI.FlexWrapperHorizontalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31766,7 +31766,7 @@ BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
@ -31781,7 +31781,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_horizontal",
type: "bi.flex_scrollable_horizontal",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31805,8 +31805,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31816,7 +31816,7 @@ BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCente
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
@ -31833,7 +31833,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("<div>").addClass("flex-wrapper-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},
@ -31888,7 +31888,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_vertical", BI.FlexWrapperVerticalLayout);/**
BI.shortcut("bi.flex_scrollable_vertical", BI.FlexWrapperVerticalLayout);/**
* 固定子组件上下左右的布局容器
* @class BI.AbsoluteLayout
* @extends BI.Layout

22
dist/core_without_normalize.css vendored

@ -1582,7 +1582,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-center-adapt-layout .flex-wrapper-center-adapt-layout-wrapper {
.bi-flex-scrollable-center-adapt-layout .flex-scrollable-center-adapt-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1626,7 +1626,7 @@ textarea {
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1675,7 +1675,7 @@ textarea {
flex-wrap: nowrap;
min-height: 100%;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-middle {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -1685,7 +1685,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-bottom {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-bottom {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -1695,7 +1695,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -1705,7 +1705,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.h-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-orient: vertical;
/* 12版 */
@ -1734,7 +1734,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1783,7 +1783,7 @@ textarea {
flex-wrap: nowrap;
min-width: 100%;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-center {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -1794,7 +1794,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-right {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-right {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -1805,7 +1805,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -1816,7 +1816,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.v-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-orient: horizontal;
/* 12版 */

22
dist/fineui.css vendored

@ -1863,7 +1863,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-center-adapt-layout .flex-wrapper-center-adapt-layout-wrapper {
.bi-flex-scrollable-center-adapt-layout .flex-scrollable-center-adapt-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1907,7 +1907,7 @@ textarea {
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -1956,7 +1956,7 @@ textarea {
flex-wrap: nowrap;
min-height: 100%;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-middle {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -1966,7 +1966,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-bottom {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-bottom {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -1976,7 +1976,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -1986,7 +1986,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.h-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-orient: vertical;
/* 12版 */
@ -2015,7 +2015,7 @@ textarea {
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -2064,7 +2064,7 @@ textarea {
flex-wrap: nowrap;
min-width: 100%;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-center {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -2075,7 +2075,7 @@ textarea {
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-right {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-right {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -2086,7 +2086,7 @@ textarea {
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -2097,7 +2097,7 @@ textarea {
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.v-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-orient: horizontal;
/* 12版 */

52
dist/fineui.ie.js vendored

@ -19403,10 +19403,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
if (!isIE && supportFlex && justOneItem) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend(ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend(ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -19419,10 +19419,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex();
if (!isIE && supportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center_adapt"});
// 不是IE用flex__scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_vertical_center_adapt"});
}
@ -19436,10 +19436,10 @@ BI.prepares.push(function () {
});
BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
if (!BI.isIE() && isSupportFlex()) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -31834,12 +31834,12 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-center-layout clearfix"
baseCls: "bi-flex-scrollable-center-layout clearfix"
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-center-adapt-layout-wrapper");
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
@ -31868,7 +31868,7 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31878,7 +31878,7 @@ BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
@ -31894,7 +31894,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_vertical",
type: "bi.flex_scrollable_vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31918,8 +31918,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31929,7 +31929,7 @@ BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalC
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-horizontal-layout clearfix",
baseCls: "bi-flex-scrollable-horizontal-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
@ -31946,7 +31946,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperHorizontalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.populate(this.options.items);
},
@ -32001,7 +32001,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.shortcut("bi.flex_scrollable_horizontal", BI.FlexWrapperHorizontalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -32011,7 +32011,7 @@ BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
@ -32026,7 +32026,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_horizontal",
type: "bi.flex_scrollable_horizontal",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -32050,8 +32050,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -32061,7 +32061,7 @@ BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCente
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
@ -32078,7 +32078,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("<div>").addClass("flex-wrapper-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},
@ -32133,7 +32133,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_vertical", BI.FlexWrapperVerticalLayout);/**
BI.shortcut("bi.flex_scrollable_vertical", BI.FlexWrapperVerticalLayout);/**
* 固定子组件上下左右的布局容器
* @class BI.AbsoluteLayout
* @extends BI.Layout

10
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

52
dist/fineui.js vendored

@ -19403,10 +19403,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
if (!isIE && supportFlex && justOneItem) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend(ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend(ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -19419,10 +19419,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex();
if (!isIE && supportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center_adapt"});
// 不是IE用flex__scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_vertical_center_adapt"});
}
@ -19436,10 +19436,10 @@ BI.prepares.push(function () {
});
BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
if (!BI.isIE() && isSupportFlex()) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -31834,12 +31834,12 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-center-layout clearfix"
baseCls: "bi-flex-scrollable-center-layout clearfix"
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-center-adapt-layout-wrapper");
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
@ -31868,7 +31868,7 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31878,7 +31878,7 @@ BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
@ -31894,7 +31894,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_vertical",
type: "bi.flex_scrollable_vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -31918,8 +31918,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31929,7 +31929,7 @@ BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalC
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-horizontal-layout clearfix",
baseCls: "bi-flex-scrollable-horizontal-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
@ -31946,7 +31946,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperHorizontalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.populate(this.options.items);
},
@ -32001,7 +32001,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.shortcut("bi.flex_scrollable_horizontal", BI.FlexWrapperHorizontalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -32011,7 +32011,7 @@ BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
@ -32026,7 +32026,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_horizontal",
type: "bi.flex_scrollable_horizontal",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -32050,8 +32050,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -32061,7 +32061,7 @@ BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCente
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
@ -32078,7 +32078,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("<div>").addClass("flex-wrapper-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},
@ -32133,7 +32133,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_vertical", BI.FlexWrapperVerticalLayout);/**
BI.shortcut("bi.flex_scrollable_vertical", BI.FlexWrapperVerticalLayout);/**
* 固定子组件上下左右的布局容器
* @class BI.AbsoluteLayout
* @extends BI.Layout

10
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

34
dist/fineui_without_jquery_polyfill.js vendored

@ -20515,12 +20515,12 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-center-layout clearfix"
baseCls: "bi-flex-scrollable-center-layout clearfix"
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-center-adapt-layout-wrapper");
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
@ -20549,7 +20549,7 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -20559,7 +20559,7 @@ BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);/**
BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
@ -20575,7 +20575,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_vertical",
type: "bi.flex_scrollable_vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -20599,8 +20599,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -20610,7 +20610,7 @@ BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalC
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-horizontal-layout clearfix",
baseCls: "bi-flex-scrollable-horizontal-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
@ -20627,7 +20627,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperHorizontalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.populate(this.options.items);
},
@ -20682,7 +20682,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.shortcut("bi.flex_scrollable_horizontal", BI.FlexWrapperHorizontalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -20692,7 +20692,7 @@ BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);/**
BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
@ -20707,7 +20707,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_horizontal",
type: "bi.flex_scrollable_horizontal",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -20731,8 +20731,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -20742,7 +20742,7 @@ BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCente
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
@ -20759,7 +20759,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("<div>").addClass("flex-wrapper-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},
@ -20814,7 +20814,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_vertical", BI.FlexWrapperVerticalLayout);/**
BI.shortcut("bi.flex_scrollable_vertical", BI.FlexWrapperVerticalLayout);/**
* 固定子组件上下左右的布局容器
* @class BI.AbsoluteLayout
* @extends BI.Layout

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

18
src/core/platform/web/config.js

@ -47,10 +47,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.center_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex(), justOneItem = (ob.items && ob.items.length <= 1);
if (!isIE && supportFlex && justOneItem) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend(ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend(ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}
@ -63,10 +63,10 @@ BI.prepares.push(function () {
BI.Plugin.registerWidget("bi.vertical_adapt", function (ob) {
var isIE = BI.isIE(), supportFlex = isSupportFlex();
if (!isIE && supportFlex) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_vertical_center_adapt"});
// 不是IE用flex__scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_vertical_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_vertical_center_adapt"});
}
@ -80,10 +80,10 @@ BI.prepares.push(function () {
});
BI.Plugin.registerWidget("bi.float_center_adapt", function (ob) {
if (!BI.isIE() && isSupportFlex()) {
// 有滚动条的情况下需要用到flex_wrapper_center_adapt布局
// 有滚动条的情况下需要用到flex_scrollable_center_adapt布局
if (ob.scrollable === true || ob.scrollx === true || ob.scrolly === true) {
// 不是IE用flex_wrapper_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_wrapper_center_adapt"});
// 不是IE用flex_scrollable_center_adapt布局
return BI.extend({}, ob, {type: "bi.flex_scrollable_center_adapt"});
}
return BI.extend(ob, {type: "bi.flex_center_adapt"});
}

6
src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js

@ -8,12 +8,12 @@
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-center-layout clearfix"
baseCls: "bi-flex-scrollable-center-layout clearfix"
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-center-adapt-layout-wrapper");
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
@ -42,4 +42,4 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_center_adapt", BI.FlexCenterLayout);
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);

8
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js

@ -8,7 +8,7 @@
BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
@ -24,7 +24,7 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_vertical",
type: "bi.flex_scrollable_vertical",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -48,5 +48,5 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_wrapper_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_adapt", BI.FlexWrapperHorizontalCenter);
BI.shortcut("bi.flex_scrollable_horizontal_center_adapt", BI.FlexWrapperHorizontalCenter);

6
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js

@ -8,7 +8,7 @@
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-horizontal-layout clearfix",
baseCls: "bi-flex-scrollable-horizontal-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
@ -25,7 +25,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperHorizontalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-wrapper-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-horizontal-layout-wrapper v-" + o.verticalAlign).addClass("h-" + o.horizontalAlign);
this.populate(this.options.items);
},
@ -80,4 +80,4 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_horizontal", BI.FlexWrapperHorizontalLayout);
BI.shortcut("bi.flex_scrollable_horizontal", BI.FlexWrapperHorizontalLayout);

8
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js

@ -8,7 +8,7 @@
BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalCenter.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-center-adapt-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
@ -23,7 +23,7 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
render: function () {
var self = this, o = this.options;
return {
type: "bi.flex_wrapper_horizontal",
type: "bi.flex_scrollable_horizontal",
ref: function (_ref) {
self.wrapper = _ref;
},
@ -47,5 +47,5 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
this.wrapper.populate(items);
}
});
BI.shortcut("bi.flex_wrapper_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_wrapper_vertical_center_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_adapt", BI.FlexWrapperVerticalCenter);
BI.shortcut("bi.flex_scrollable_vertical_center_adapt", BI.FlexWrapperVerticalCenter);

6
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

@ -8,7 +8,7 @@
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-wrapper-vertical-layout clearfix",
baseCls: "bi-flex-scrollable-vertical-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
@ -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("<div>").addClass("flex-wrapper-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},
@ -80,4 +80,4 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
this._mount();
}
});
BI.shortcut("bi.flex_wrapper_vertical", BI.FlexWrapperVerticalLayout);
BI.shortcut("bi.flex_scrollable_vertical", BI.FlexWrapperVerticalLayout);

22
src/css/core/wrapper/flex.css

@ -259,7 +259,7 @@
align-items: stretch;
}
.bi-flex-wrapper-center-adapt-layout .flex-wrapper-center-adapt-layout-wrapper {
.bi-flex-scrollable-center-adapt-layout .flex-scrollable-center-adapt-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -303,7 +303,7 @@
float: left;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -352,7 +352,7 @@
flex-wrap: nowrap;
min-height: 100%;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-middle {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -362,7 +362,7 @@
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-bottom {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-bottom {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -372,7 +372,7 @@
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.v-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -382,7 +382,7 @@
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-horizontal-layout .flex-wrapper-horizontal-layout-wrapper.h-stretch {
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-orient: vertical;
/* 12版 */
@ -411,7 +411,7 @@
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper {
display: box;
/* OLD - Android 4.4- */
display: -webkit-box;
@ -460,7 +460,7 @@
flex-wrap: nowrap;
min-width: 100%;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-center {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */
-webkit-box-align: center;
/* 12版 */
@ -471,7 +471,7 @@
-o-align-items: center;
align-items: center;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-right {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-right {
/* 09版 */
-webkit-box-align: flex-end;
/* 12版 */
@ -482,7 +482,7 @@
-o-align-items: flex-end;
align-items: flex-end;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.h-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-stretch {
/* 09版 */
-webkit-box-align: stretch;
/* 12版 */
@ -493,7 +493,7 @@
-o-align-items: stretch;
align-items: stretch;
}
.bi-flex-wrapper-vertical-layout .flex-wrapper-vertical-layout-wrapper.v-stretch {
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.v-stretch {
/* 09版 */
-webkit-box-orient: horizontal;
/* 12版 */

4
src/less/core/wrapper/flex.wrapper.center.less

@ -1,5 +1,5 @@
.bi-flex-wrapper-center-adapt-layout {
& .flex-wrapper-center-adapt-layout-wrapper {
.bi-flex-scrollable-center-adapt-layout {
& .flex-scrollable-center-adapt-layout-wrapper {
display: box; /* OLD - Android 4.4- */
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */

4
src/less/core/wrapper/flex.wrapper.horizontal.less

@ -1,5 +1,5 @@
.bi-flex-wrapper-horizontal-layout {
& .flex-wrapper-horizontal-layout-wrapper {
.bi-flex-scrollable-horizontal-layout {
& .flex-scrollable-horizontal-layout-wrapper {
display: box; /* OLD - Android 4.4- */
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */

4
src/less/core/wrapper/flex.wrapper.vertical.less

@ -1,5 +1,5 @@
.bi-flex-wrapper-vertical-layout {
& .flex-wrapper-vertical-layout-wrapper {
.bi-flex-scrollable-vertical-layout {
& .flex-scrollable-vertical-layout-wrapper {
display: box; /* OLD - Android 4.4- */
display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */

Loading…
Cancel
Save