Browse Source

布局大一统

es6
guy 3 years ago
parent
commit
96a9da2d1c
  1. 2
      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

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

@ -41,7 +41,7 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, {
position: "relative"
});
if (o.columnSize[i] !== "auto") {
if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && o.columnSize[i] === "fill")) {
if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
w.element.addClass("f-s-n");
}
}

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

@ -40,7 +40,7 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, {
position: "relative"
});
if (o.rowSize[i] !== "auto") {
if (!(o.verticalAlign === BI.VerticalAlign.Stretch && o.rowSize[i] === "fill")) {
if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" || o.rowSize[i] === ""))) {
w.element.addClass("f-s-n");
}
}

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

@ -37,7 +37,7 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
position: "relative"
});
if (o.columnSize[i] !== "auto") {
if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && o.columnSize[i] === "fill")) {
if (!(o.horizontalAlign === BI.HorizontalAlign.Stretch && (o.columnSize[i] === "fill" || o.columnSize[i] === ""))) {
w.element.addClass("f-s-n");
}
}

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

@ -37,7 +37,7 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
position: "relative"
});
if (o.rowSize[i] !== "auto") {
if (!(o.verticalAlign === BI.VerticalAlign.Stretch && o.rowSize[i] === "fill")) {
if (!(o.verticalAlign === BI.VerticalAlign.Stretch && (o.rowSize[i] === "fill" && o.rowSize[i] === ""))) {
w.element.addClass("f-s-n");
}
}

Loading…
Cancel
Save