fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

BI-34288 horizontal配置vertical_adapt/horizontal_adapt/center_adapt与demo

es6
windy 6 years ago
parent
0bbc555ee1
commit
86c140add5
14 changed files with 417 additions and 208 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 137
      demo/js/core/layout/demo.horizontal.js
  2. 18
      dist/bundle.ie.js
  3. 60
      dist/bundle.ie.min.js
  4. 18
      dist/bundle.js
  5. 60
      dist/bundle.min.js
  6. 18
      dist/core.js
  7. 131
      dist/demo.js
  8. 18
      dist/fineui.ie.js
  9. 60
      dist/fineui.ie.min.js
  10. 18
      dist/fineui.js
  11. 60
      dist/fineui.min.js
  12. 18
      dist/fineui_without_jquery_polyfill.js
  13. 2
      dist/utils.min.js
  14. 7
      src/core/wrapper/layout/layout.horizontal.js

137
demo/js/core/layout/demo.horizontal.js
Unescape View File

@ -7,33 +7,118 @@ Demo.Horizontal = BI.inherit(BI.Widget, {
}, },
render: function () { render: function () {
return { return {
type: "bi.horizontal", type: "bi.vertical",
hgap: 10, vgap: 10,
items: [{ items: [{
type: "bi.label", type: "bi.horizontal",
whiteSpace: "normal", height: 150,
text: "因为大多数场景下都需要垂直居中，所以这个布局一般会被vertical_adapt布局设置scrollx=true取代", hgap: 10,
cls: "layout-bg3", items: [{
width: 500, type: "bi.label",
height: 50 whiteSpace: "normal",
}, { text: "因为大多数场景下都需要垂直居中，所以这个布局一般会被vertical_adapt布局设置scrollx=true取代",
type: "bi.label", cls: "layout-bg3",
text: "水平布局", width: 500,
cls: "layout-bg4", height: 50
width: 300, }, {
height: 30 type: "bi.label",
}, { text: "水平布局",
type: "bi.label", cls: "layout-bg4",
text: "水平布局", width: 300,
cls: "layout-bg5", height: 30
width: 300, }, {
height: 30 type: "bi.label",
}, { text: "水平布局",
type: "bi.label", cls: "layout-bg5",
text: "水平布局", width: 300,
cls: "layout-bg6", height: 30
width: 300, }, {
height: 30 type: "bi.label",
text: "水平布局",
cls: "layout-bg6",
width: 300,
height: 30
}]
}, {
type: "bi.layout",
height: 1,
cls: "bi-border-bottom bi-high-light-border"
}, {
type: "bi.horizontal",
height: 150,
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Left,
vgap: 10,
items: [{
type: "bi.label",
text: "以horizontal实现的vertical_adapt垂直居中",
cls: "layout-bg1",
width: 300,
height: 30
}, {
type: "bi.label",
text: "以horizontal实现的vertical_adapt垂直居中",
cls: "layout-bg2",
width: 300,
height: 30
}]
}, {
type: "bi.layout",
height: 1,
cls: "bi-border-bottom bi-high-light-border"
}, {
type: "bi.horizontal",
height: 150,
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
items: [{
type: "bi.label",
text: "以horizontal代替horizontal_adapt实现的水平居中(单元素)",
cls: "layout-bg1",
width: 300,
height: 30
}]
}, {
type: "bi.layout",
height: 1,
cls: "bi-border-bottom bi-high-light-border"
}, {
type: "bi.horizontal",
height: 150,
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [300, "fill"],
items: [{
type: "bi.label",
text: "以horizontal代替horizontal_adapt实现的用于水平适应布局",
cls: "layout-bg1",
height: 30
}, {
type: "bi.label",
text: "以horizontal代替horizontal_adapt实现的水平自适应列",
cls: "layout-bg2",
height: 30
}]
}, {
type: "bi.layout",
height: 1,
cls: "bi-border-bottom bi-high-light-border"
}, {
type: "bi.center_adapt",
height: 150,
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
items: [{
type: "bi.label",
text: "以horizontal代替center_adapt实现的水平垂直居中",
width: 300,
height: 100,
cls: "layout-bg1"
}]
}, {
type: "bi.layout",
height: 1,
cls: "bi-border-bottom bi-high-light-border"
}] }]
}; };
} }

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

@ -31262,7 +31262,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
} }
}); });
BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/** BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/**
* 自适应水平和垂直方向都居中容器 * 使用display:table和display:table-cell实现的horizontal布局
* @class BI.TableCenterAdaptLayout * @class BI.TableCenterAdaptLayout
* @extends BI.Layout * @extends BI.Layout
*/ */
@ -31271,6 +31271,8 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-table-center-adapt-layout", baseCls: "bi-table-center-adapt-layout",
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -31280,12 +31282,13 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments); BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<div>").css({ this.$table = BI.Widget._renderEngine.createElement("<div>").css({
position: "relative", position: "relative",
display: "table", display: "table",
width: "100%", height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
height: "100%", width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"white-space": "nowrap" "white-space": "nowrap"
}); });
this.populate(this.options.items); this.populate(this.options.items);
@ -31309,7 +31312,7 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.width(width); td.element.width(width);
} }
td.element.css({"max-width": o.columnSize[i]}); td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }
@ -32748,8 +32751,8 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-layout", baseCls: "bi-horizontal-layout",
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [], columnSize: [],
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -32759,10 +32762,13 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.HorizontalLayout.superclass.render.apply(this, arguments); BI.HorizontalLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({ this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({
position: "relative", position: "relative",
"white-space": "nowrap", "white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"border-spacing": "0px", "border-spacing": "0px",
border: "none", border: "none",
"border-collapse": "separate" "border-collapse": "separate"
@ -32792,7 +32798,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.attr("width", width); td.element.attr("width", width);
} }
td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }

60
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
dist/bundle.js vendored
Unescape View File

@ -31262,7 +31262,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
} }
}); });
BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/** BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/**
* 自适应水平和垂直方向都居中容器 * 使用display:table和display:table-cell实现的horizontal布局
* @class BI.TableCenterAdaptLayout * @class BI.TableCenterAdaptLayout
* @extends BI.Layout * @extends BI.Layout
*/ */
@ -31271,6 +31271,8 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-table-center-adapt-layout", baseCls: "bi-table-center-adapt-layout",
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -31280,12 +31282,13 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments); BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<div>").css({ this.$table = BI.Widget._renderEngine.createElement("<div>").css({
position: "relative", position: "relative",
display: "table", display: "table",
width: "100%", height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
height: "100%", width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"white-space": "nowrap" "white-space": "nowrap"
}); });
this.populate(this.options.items); this.populate(this.options.items);
@ -31309,7 +31312,7 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.width(width); td.element.width(width);
} }
td.element.css({"max-width": o.columnSize[i]}); td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }
@ -32748,8 +32751,8 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-layout", baseCls: "bi-horizontal-layout",
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [], columnSize: [],
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -32759,10 +32762,13 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.HorizontalLayout.superclass.render.apply(this, arguments); BI.HorizontalLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({ this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({
position: "relative", position: "relative",
"white-space": "nowrap", "white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"border-spacing": "0px", "border-spacing": "0px",
border: "none", border: "none",
"border-collapse": "separate" "border-collapse": "separate"
@ -32792,7 +32798,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.attr("width", width); td.element.attr("width", width);
} }
td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }

60
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
dist/core.js vendored
Unescape View File

@ -31262,7 +31262,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
} }
}); });
BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/** BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/**
* 自适应水平和垂直方向都居中容器 * 使用display:table和display:table-cell实现的horizontal布局
* @class BI.TableCenterAdaptLayout * @class BI.TableCenterAdaptLayout
* @extends BI.Layout * @extends BI.Layout
*/ */
@ -31271,6 +31271,8 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-table-center-adapt-layout", baseCls: "bi-table-center-adapt-layout",
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -31280,12 +31282,13 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments); BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<div>").css({ this.$table = BI.Widget._renderEngine.createElement("<div>").css({
position: "relative", position: "relative",
display: "table", display: "table",
width: "100%", height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
height: "100%", width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"white-space": "nowrap" "white-space": "nowrap"
}); });
this.populate(this.options.items); this.populate(this.options.items);
@ -31309,7 +31312,7 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.width(width); td.element.width(width);
} }
td.element.css({"max-width": o.columnSize[i]}); td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }
@ -32748,8 +32751,8 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-layout", baseCls: "bi-horizontal-layout",
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [], columnSize: [],
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -32759,10 +32762,13 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.HorizontalLayout.superclass.render.apply(this, arguments); BI.HorizontalLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({ this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({
position: "relative", position: "relative",
"white-space": "nowrap", "white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"border-spacing": "0px", "border-spacing": "0px",
border: "none", border: "none",
"border-collapse": "separate" "border-collapse": "separate"
@ -32792,7 +32798,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.attr("width", width); td.element.attr("width", width);
} }
td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }

131
dist/demo.js vendored
Unescape View File

@ -5973,33 +5973,118 @@ Demo.Horizontal = BI.inherit(BI.Widget, {
}, },
render: function () { render: function () {
return { return {
type: "bi.horizontal", type: "bi.vertical",
hgap: 10, vgap: 10,
items: [{ items: [{
type: "bi.label", type: "bi.horizontal",
whiteSpace: "normal", height: 150,
text: "因为大多数场景下都需要垂直居中，所以这个布局一般会被vertical_adapt布局设置scrollx=true取代", hgap: 10,
cls: "layout-bg3", items: [{
width: 500, type: "bi.label",
height: 50 whiteSpace: "normal",
text: "因为大多数场景下都需要垂直居中，所以这个布局一般会被vertical_adapt布局设置scrollx=true取代",
cls: "layout-bg3",
width: 500,
height: 50
}, {
type: "bi.label",
text: "水平布局",
cls: "layout-bg4",
width: 300,
height: 30
}, {
type: "bi.label",
text: "水平布局",
cls: "layout-bg5",
width: 300,
height: 30
}, {
type: "bi.label",
text: "水平布局",
cls: "layout-bg6",
width: 300,
height: 30
}]
}, { }, {
type: "bi.label", type: "bi.layout",
text: "水平布局", height: 1,
cls: "layout-bg4", cls: "bi-border-bottom bi-high-light-border"
width: 300,
height: 30
}, { }, {
type: "bi.label", type: "bi.horizontal",
text: "水平布局", height: 150,
cls: "layout-bg5", verticalAlign: BI.VerticalAlign.Middle,
width: 300, horizontalAlign: BI.HorizontalAlign.Left,
height: 30 vgap: 10,
items: [{
type: "bi.label",
text: "以horizontal实现的vertical_adapt垂直居中",
cls: "layout-bg1",
width: 300,
height: 30
}, {
type: "bi.label",
text: "以horizontal实现的vertical_adapt垂直居中",
cls: "layout-bg2",
width: 300,
height: 30
}]
}, { }, {
type: "bi.label", type: "bi.layout",
text: "水平布局", height: 1,
cls: "layout-bg6", cls: "bi-border-bottom bi-high-light-border"
width: 300, }, {
height: 30 type: "bi.horizontal",
height: 150,
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
items: [{
type: "bi.label",
text: "以horizontal代替horizontal_adapt实现的水平居中(单元素)",
cls: "layout-bg1",
width: 300,
height: 30
}]
}, {
type: "bi.layout",
height: 1,
cls: "bi-border-bottom bi-high-light-border"
}, {
type: "bi.horizontal",
height: 150,
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Center,
columnSize: [300, "fill"],
items: [{
type: "bi.label",
text: "以horizontal代替horizontal_adapt实现的用于水平适应布局",
cls: "layout-bg1",
height: 30
}, {
type: "bi.label",
text: "以horizontal代替horizontal_adapt实现的水平自适应列",
cls: "layout-bg2",
height: 30
}]
}, {
type: "bi.layout",
height: 1,
cls: "bi-border-bottom bi-high-light-border"
}, {
type: "bi.center_adapt",
height: 150,
verticalAlign: BI.VerticalAlign.Middle,
horizontalAlign: BI.HorizontalAlign.Center,
items: [{
type: "bi.label",
text: "以horizontal代替center_adapt实现的水平垂直居中",
width: 300,
height: 100,
cls: "layout-bg1"
}]
}, {
type: "bi.layout",
height: 1,
cls: "bi-border-bottom bi-high-light-border"
}] }]
}; };
} }

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

@ -31504,7 +31504,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
} }
}); });
BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/** BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/**
* 自适应水平和垂直方向都居中容器 * 使用display:table和display:table-cell实现的horizontal布局
* @class BI.TableCenterAdaptLayout * @class BI.TableCenterAdaptLayout
* @extends BI.Layout * @extends BI.Layout
*/ */
@ -31513,6 +31513,8 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-table-center-adapt-layout", baseCls: "bi-table-center-adapt-layout",
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -31522,12 +31524,13 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments); BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<div>").css({ this.$table = BI.Widget._renderEngine.createElement("<div>").css({
position: "relative", position: "relative",
display: "table", display: "table",
width: "100%", height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
height: "100%", width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"white-space": "nowrap" "white-space": "nowrap"
}); });
this.populate(this.options.items); this.populate(this.options.items);
@ -31551,7 +31554,7 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.width(width); td.element.width(width);
} }
td.element.css({"max-width": o.columnSize[i]}); td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }
@ -32990,8 +32993,8 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-layout", baseCls: "bi-horizontal-layout",
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [], columnSize: [],
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -33001,10 +33004,13 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.HorizontalLayout.superclass.render.apply(this, arguments); BI.HorizontalLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({ this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({
position: "relative", position: "relative",
"white-space": "nowrap", "white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"border-spacing": "0px", "border-spacing": "0px",
border: "none", border: "none",
"border-collapse": "separate" "border-collapse": "separate"
@ -33034,7 +33040,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.attr("width", width); td.element.attr("width", width);
} }
td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }

60
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
dist/fineui.js vendored
Unescape View File

@ -31504,7 +31504,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
} }
}); });
BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/** BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/**
* 自适应水平和垂直方向都居中容器 * 使用display:table和display:table-cell实现的horizontal布局
* @class BI.TableCenterAdaptLayout * @class BI.TableCenterAdaptLayout
* @extends BI.Layout * @extends BI.Layout
*/ */
@ -31513,6 +31513,8 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-table-center-adapt-layout", baseCls: "bi-table-center-adapt-layout",
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -31522,12 +31524,13 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments); BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<div>").css({ this.$table = BI.Widget._renderEngine.createElement("<div>").css({
position: "relative", position: "relative",
display: "table", display: "table",
width: "100%", height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
height: "100%", width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"white-space": "nowrap" "white-space": "nowrap"
}); });
this.populate(this.options.items); this.populate(this.options.items);
@ -31551,7 +31554,7 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.width(width); td.element.width(width);
} }
td.element.css({"max-width": o.columnSize[i]}); td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }
@ -32990,8 +32993,8 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-layout", baseCls: "bi-horizontal-layout",
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [], columnSize: [],
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -33001,10 +33004,13 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.HorizontalLayout.superclass.render.apply(this, arguments); BI.HorizontalLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({ this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({
position: "relative", position: "relative",
"white-space": "nowrap", "white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"border-spacing": "0px", "border-spacing": "0px",
border: "none", border: "none",
"border-collapse": "separate" "border-collapse": "separate"
@ -33034,7 +33040,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.attr("width", width); td.element.attr("width", width);
} }
td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }

60
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -20273,7 +20273,7 @@ BI.InlineVerticalAdaptLayout = BI.inherit(BI.Layout, {
} }
}); });
BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/** BI.shortcut("bi.inline_vertical_adapt", BI.InlineVerticalAdaptLayout);/**
* 自适应水平和垂直方向都居中容器 * 使用display:table和display:table-cell实现的horizontal布局
* @class BI.TableCenterAdaptLayout * @class BI.TableCenterAdaptLayout
* @extends BI.Layout * @extends BI.Layout
*/ */
@ -20282,6 +20282,8 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.TableCenterAdaptLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-table-center-adapt-layout", baseCls: "bi-table-center-adapt-layout",
columnSize: [], columnSize: [],
verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -20291,12 +20293,13 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments); BI.TableCenterAdaptLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<div>").css({ this.$table = BI.Widget._renderEngine.createElement("<div>").css({
position: "relative", position: "relative",
display: "table", display: "table",
width: "100%", height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
height: "100%", width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"white-space": "nowrap" "white-space": "nowrap"
}); });
this.populate(this.options.items); this.populate(this.options.items);
@ -20320,7 +20323,7 @@ BI.TableCenterAdaptLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.width(width); td.element.width(width);
} }
td.element.css({"max-width": o.columnSize[i]}); td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }
@ -21759,8 +21762,8 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-layout", baseCls: "bi-horizontal-layout",
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [], columnSize: [],
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -21770,10 +21773,13 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.HorizontalLayout.superclass.render.apply(this, arguments); BI.HorizontalLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({ this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({
position: "relative", position: "relative",
"white-space": "nowrap", "white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"border-spacing": "0px", "border-spacing": "0px",
border: "none", border: "none",
"border-collapse": "separate" "border-collapse": "separate"
@ -21803,7 +21809,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.attr("width", width); td.element.attr("width", width);
} }
td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
src/core/wrapper/layout/layout.horizontal.js
Unescape View File

@ -8,8 +8,8 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.HorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-horizontal-layout", baseCls: "bi-horizontal-layout",
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [], columnSize: [],
scrollx: true,
hgap: 0, hgap: 0,
vgap: 0, vgap: 0,
lgap: 0, lgap: 0,
@ -19,10 +19,13 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
}); });
}, },
render: function () { render: function () {
var o = this.options;
BI.HorizontalLayout.superclass.render.apply(this, arguments); BI.HorizontalLayout.superclass.render.apply(this, arguments);
this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({ this.$table = BI.Widget._renderEngine.createElement("<table>").attr({cellspacing: 0, cellpadding: 0}).css({
position: "relative", position: "relative",
"white-space": "nowrap", "white-space": "nowrap",
height: o.verticalAlign === BI.VerticalAlign.Middle ? "100%" : "auto",
width: o.horizontalAlign === BI.HorizontalAlign.Center ? "100%" : "auto",
"border-spacing": "0px", "border-spacing": "0px",
border: "none", border: "none",
"border-collapse": "separate" "border-collapse": "separate"
@ -52,7 +55,7 @@ BI.HorizontalLayout = BI.inherit(BI.Layout, {
td = this.getWidgetByName(this._getChildName(i)); td = this.getWidgetByName(this._getChildName(i));
td.element.attr("width", width); td.element.attr("width", width);
} }
td.element.css({"max-width": o.columnSize[i] + "px"});
if (i === 0) { if (i === 0) {
td.element.addClass("first-element"); td.element.addClass("first-element");
} }

Write Preview
Loading…
Cancel
Save