Browse Source

update

master
git 3 years ago
parent
commit
542a8c91f2
  1. 4
      src/core/wrapper/layout/flex/flex.horizontal.js
  2. 2
      src/core/wrapper/layout/flex/flex.vertical.js
  3. 2
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  4. 2
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

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

@ -10,7 +10,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
return BI.extend(BI.FlexHorizontalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.FlexHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-f-h", baseCls: "bi-f-h",
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left,// 如果只有一个子元素且想让该子元素横向撑满,设置成Stretch horizontalAlign: BI.HorizontalAlign.Left, // 如果只有一个子元素且想让该子元素横向撑满,设置成Stretch
columnSize: [], columnSize: [],
scrollx: true, scrollx: true,
hgap: 0, hgap: 0,
@ -37,7 +37,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) { _addElement: function (i, item) {
var o = this.options; var o = this.options;
var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments); var w = BI.FlexHorizontalLayout.superclass._addElement.apply(this, arguments);
var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width; var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? "" : item.width;
w.element.css({ w.element.css({
position: "relative" position: "relative"
}); });

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

@ -36,7 +36,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) { _addElement: function (i, item) {
var o = this.options; var o = this.options;
var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments); var w = BI.FlexVerticalLayout.superclass._addElement.apply(this, arguments);
var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height; var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height >= 1 ? "" : item.height;
w.element.css({ w.element.css({
position: "relative" position: "relative"
}); });

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

@ -33,7 +33,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) { _addElement: function (i, item) {
var o = this.options; var o = this.options;
var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments); var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments);
var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width; var columnSize = o.columnSize.length > 0 ? o.columnSize[i] : item.width >= 1 ? "" : item.width;
w.element.css({ w.element.css({
position: "relative" position: "relative"
}); });

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

@ -33,7 +33,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) { _addElement: function (i, item) {
var o = this.options; var o = this.options;
var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments); var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments);
var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height; var rowSize = o.rowSize.length > 0 ? o.rowSize[i] : item.height >= 1 ? "" : item.height;
w.element.css({ w.element.css({
position: "relative" position: "relative"
}); });

Loading…
Cancel
Save