caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://cloud.finedevelop.com/scm/visual/fineui 

# Conflicts:
#	dist/2.0/fineui.ie.min.js
#	dist/2.0/fineui.min.css
#	dist/2.0/fineui.min.js
#	dist/bundle.ie.min.js
#	dist/bundle.min.css
#	dist/bundle.min.js
#	dist/fineui.ie.min.js
#	dist/fineui.min.css
#	dist/fineui.min.js
#	dist/utils.min.js
es6
windy 6 years ago
parent
912948e8fe 380f81acca
commit
5a5e722f5d
20 changed files with 140 additions and 108 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dist/2.0/fineui.css
  2. 26
      dist/2.0/fineui.ie.js
  3. 26
      dist/2.0/fineui.js
  4. 2
      dist/bundle.css
  5. 26
      dist/bundle.ie.js
  6. 26
      dist/bundle.js
  7. 2
      dist/core.css
  8. 26
      dist/core.js
  9. 2
      dist/core_without_normalize.css
  10. 2
      dist/fineui.css
  11. 26
      dist/fineui.ie.js
  12. 26
      dist/fineui.js
  13. 26
      dist/fineui_without_jquery_polyfill.js
  14. 17
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js
  15. 4
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js
  16. 3
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js
  17. 2
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
  18. 2
      src/css/core/wrapper/flex.css
  19. 1
      src/less/core/wrapper/flex.wrapper.horizontal.less
  20. 1
      src/less/core/wrapper/flex.wrapper.vertical.less

2
dist/2.0/fineui.css vendored
Unescape View File

@ -1945,6 +1945,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-height: 100%;
float: left;
}
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
@ -2053,6 +2054,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-width: 100%;
float: left;
}
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */

26
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
* @class BI.FlexCenterLayout
* @class BI.FlexWrapperCenterLayout
* @extends BI.Layout
*/
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix"
return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix",
scrollable: true
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments);
var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative"});
return w;
},
@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
populate: function (items) {
BI.FlexCenterLayout.superclass.populate.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments);
this._mount();
}
});
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
scrolly: true,
scrollable: true,
scrolly: false,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
scrollx: false,
scrollable: true,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},

26
dist/2.0/fineui.js vendored
Unescape View File

@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
* @class BI.FlexCenterLayout
* @class BI.FlexWrapperCenterLayout
* @extends BI.Layout
*/
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix"
return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix",
scrollable: true
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments);
var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative"});
return w;
},
@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
populate: function (items) {
BI.FlexCenterLayout.superclass.populate.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments);
this._mount();
}
});
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
scrolly: true,
scrollable: true,
scrolly: false,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
scrollx: false,
scrollable: true,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},

2
dist/bundle.css vendored
Unescape View File

@ -1945,6 +1945,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-height: 100%;
float: left;
}
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
@ -2053,6 +2054,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-width: 100%;
float: left;
}
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */

26
dist/bundle.ie.js vendored
Unescape View File

@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
* @class BI.FlexCenterLayout
* @class BI.FlexWrapperCenterLayout
* @extends BI.Layout
*/
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix"
return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix",
scrollable: true
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments);
var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative"});
return w;
},
@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
populate: function (items) {
BI.FlexCenterLayout.superclass.populate.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments);
this._mount();
}
});
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
scrolly: true,
scrollable: true,
scrolly: false,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
scrollx: false,
scrollable: true,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},

26
dist/bundle.js vendored
Unescape View File

@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
* @class BI.FlexCenterLayout
* @class BI.FlexWrapperCenterLayout
* @extends BI.Layout
*/
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix"
return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix",
scrollable: true
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments);
var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative"});
return w;
},
@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
populate: function (items) {
BI.FlexCenterLayout.superclass.populate.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments);
this._mount();
}
});
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
scrolly: true,
scrollable: true,
scrolly: false,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
scrollx: false,
scrollable: true,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},

2
dist/core.css vendored
Unescape View File

@ -1945,6 +1945,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-height: 100%;
float: left;
}
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
@ -2053,6 +2054,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-width: 100%;
float: left;
}
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */

26
dist/core.js vendored
Unescape View File

@ -31586,24 +31586,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
* @class BI.FlexCenterLayout
* @class BI.FlexWrapperCenterLayout
* @extends BI.Layout
*/
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix"
return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix",
scrollable: true
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments);
var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative"});
return w;
},
@ -31622,11 +31623,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
populate: function (items) {
BI.FlexCenterLayout.superclass.populate.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments);
this._mount();
}
});
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31639,8 +31640,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
scrolly: true,
scrollable: true,
scrolly: false,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31772,7 +31773,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
scrollx: false,
scrollable: true,
hgap: 0,
vgap: 0,
lgap: 0,
@ -31836,7 +31838,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},

2
dist/core_without_normalize.css vendored
Unescape View File

@ -1664,6 +1664,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-height: 100%;
float: left;
}
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
@ -1772,6 +1773,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-width: 100%;
float: left;
}
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */

2
dist/fineui.css vendored
Unescape View File

@ -1945,6 +1945,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-height: 100%;
float: left;
}
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
@ -2053,6 +2054,7 @@ textarea {
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-width: 100%;
float: left;
}
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */

26
dist/fineui.ie.js vendored
Unescape View File

@ -31831,24 +31831,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
* @class BI.FlexCenterLayout
* @class BI.FlexWrapperCenterLayout
* @extends BI.Layout
*/
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix"
return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix",
scrollable: true
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments);
var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative"});
return w;
},
@ -31867,11 +31868,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
populate: function (items) {
BI.FlexCenterLayout.superclass.populate.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments);
this._mount();
}
});
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31884,8 +31885,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
scrolly: true,
scrollable: true,
scrolly: false,
hgap: 0,
vgap: 0,
lgap: 0,
@ -32017,7 +32018,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
scrollx: false,
scrollable: true,
hgap: 0,
vgap: 0,
lgap: 0,
@ -32081,7 +32083,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},

26
dist/fineui.js vendored
Unescape View File

@ -31831,24 +31831,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
* @class BI.FlexCenterLayout
* @class BI.FlexWrapperCenterLayout
* @extends BI.Layout
*/
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix"
return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix",
scrollable: true
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments);
var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative"});
return w;
},
@ -31867,11 +31868,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
populate: function (items) {
BI.FlexCenterLayout.superclass.populate.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments);
this._mount();
}
});
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -31884,8 +31885,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
scrolly: true,
scrollable: true,
scrolly: false,
hgap: 0,
vgap: 0,
lgap: 0,
@ -32017,7 +32018,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
scrollx: false,
scrollable: true,
hgap: 0,
vgap: 0,
lgap: 0,
@ -32081,7 +32083,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},

26
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -20512,24 +20512,25 @@ BI.shortcut("bi.flex_vertical", BI.FlexVerticalLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
* @class BI.FlexCenterLayout
* @class BI.FlexWrapperCenterLayout
* @extends BI.Layout
*/
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix"
return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix",
scrollable: true
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments);
var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative"});
return w;
},
@ -20548,11 +20549,11 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
populate: function (items) {
BI.FlexCenterLayout.superclass.populate.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments);
this._mount();
}
});
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);/**
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);/**
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
@ -20565,8 +20566,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
scrolly: true,
scrollable: true,
scrolly: false,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20698,7 +20699,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
scrollx: false,
scrollable: true,
hgap: 0,
vgap: 0,
lgap: 0,
@ -20762,7 +20764,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
render: function () {
BI.FlexWrapperVerticalLayout.superclass.render.apply(this, arguments);
var o = this.options;
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},

17
src/core/wrapper/layout/flex/wrapper/flex.wrapper.center.js
Unescape View File

@ -2,24 +2,25 @@
*自适应水平和垂直方向都居中容器
* Created by GUY on 2016/12/2.
*
* @class BI.FlexCenterLayout
* @class BI.FlexWrapperCenterLayout
* @extends BI.Layout
*/
BI.FlexCenterLayout = BI.inherit(BI.Layout, {
BI.FlexWrapperCenterLayout = BI.inherit(BI.Layout, {
props: function () {
return BI.extend(BI.FlexCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix"
return BI.extend(BI.FlexWrapperCenterLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-flex-scrollable-center-layout clearfix",
scrollable: true
});
},
render: function () {
BI.FlexCenterLayout.superclass.render.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.render.apply(this, arguments);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-center-adapt-layout-wrapper");
this.populate(this.options.items);
},
_addElement: function (i, item) {
var o = this.options;
var w = BI.FlexCenterLayout.superclass._addElement.apply(this, arguments);
var w = BI.FlexWrapperCenterLayout.superclass._addElement.apply(this, arguments);
w.element.css({position: "relative"});
return w;
},
@ -38,8 +39,8 @@ BI.FlexCenterLayout = BI.inherit(BI.Layout, {
},
populate: function (items) {
BI.FlexCenterLayout.superclass.populate.apply(this, arguments);
BI.FlexWrapperCenterLayout.superclass.populate.apply(this, arguments);
this._mount();
}
});
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexCenterLayout);
BI.shortcut("bi.flex_scrollable_center_adapt", BI.FlexWrapperCenterLayout);

4
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.center.js
Unescape View File

@ -11,8 +11,8 @@ BI.FlexWrapperHorizontalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
verticalAlign: BI.VerticalAlign.Top,
rowSize: [],
scrollable: null,
scrolly: true,
scrollable: true,
scrolly: false,
hgap: 0,
vgap: 0,
lgap: 0,

3
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.center.js
Unescape View File

@ -11,7 +11,8 @@ BI.FlexWrapperVerticalCenter = BI.inherit(BI.Layout, {
baseCls: "bi-flex-scrollable-vertical-center-adapt-layout clearfix",
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [],
scrollx: true,
scrollx: false,
scrollable: true,
hgap: 0,
vgap: 0,
lgap: 0,

2
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
Unescape View File

@ -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-scrollable-vertical-layout-scrollable h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.$wrapper = BI.Widget._renderEngine.createElement("<div>").addClass("flex-scrollable-vertical-layout-wrapper h-" + o.horizontalAlign).addClass("v-" + o.verticalAlign);
this.populate(this.options.items);
},

2
src/css/core/wrapper/flex.css
Unescape View File

@ -351,6 +351,7 @@
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-height: 100%;
float: left;
}
.bi-flex-scrollable-horizontal-layout .flex-scrollable-horizontal-layout-wrapper.v-middle {
/* 09版 */
@ -459,6 +460,7 @@
-o-flex-wrap: nowrap;
flex-wrap: nowrap;
min-width: 100%;
float: left;
}
.bi-flex-scrollable-vertical-layout .flex-scrollable-vertical-layout-wrapper.h-center {
/* 09版 */

1
src/less/core/wrapper/flex.wrapper.horizontal.less
Unescape View File

@ -45,6 +45,7 @@
flex-wrap: nowrap;
min-height: 100%;
float: left;
&.v-middle {
/* 09版 */

1
src/less/core/wrapper/flex.wrapper.vertical.less
Unescape View File

@ -45,6 +45,7 @@
flex-wrap: nowrap;
min-width: 100%;
float: left;
&.h-center {
/* 09版 */

Write Preview
Loading…
Cancel
Save