Browse Source

优化布局

master
guy 4 years ago
parent
commit
8823314852
  1. 3
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  2. 3
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js
  3. 6
      src/less/core/wrapper/flex.wrapper.horizontal.less
  4. 8
      src/less/core/wrapper/flex.wrapper.vertical.less

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

@ -8,7 +8,8 @@
BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, { BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
props: function () { props: function () {
return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.FlexWrapperHorizontalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-f-s-h clearfix", // 逆天的IE设置min-height撑不起来高度
baseCls: "bi-f-s-h clearfix" + (BI.isIE() ? " hack" : ""),
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,
columnSize: [], columnSize: [],

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

@ -8,7 +8,8 @@
BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
props: function () { props: function () {
return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), { return BI.extend(BI.FlexWrapperVerticalLayout.superclass.props.apply(this, arguments), {
baseCls: "bi-f-s-v clearfix", // 逆天的IE设置min-height撑不起来高度
baseCls: "bi-f-s-v clearfix" + (BI.isIE() ? " hack" : ""),
horizontalAlign: BI.HorizontalAlign.Left, horizontalAlign: BI.HorizontalAlign.Left,
verticalAlign: BI.VerticalAlign.Top, verticalAlign: BI.VerticalAlign.Top,
rowSize: [], rowSize: [],

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

@ -29,6 +29,12 @@
} }
.bi-f-s-h, .bi-flex-scrollable-horizontal-layout { .bi-f-s-h, .bi-flex-scrollable-horizontal-layout {
&.hack {
& .f-s-h-w, & .flex-scrollable-horizontal-layout-wrapper {
height: 100%;
}
}
& .f-s-h-w, & .flex-scrollable-horizontal-layout-wrapper { & .f-s-h-w, & .flex-scrollable-horizontal-layout-wrapper {
.flex(); .flex();
.horizontal(); .horizontal();

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

@ -29,6 +29,14 @@
} }
.bi-f-s-v, .bi-flex-scrollable-vertical-layout { .bi-f-s-v, .bi-flex-scrollable-vertical-layout {
&.hack {
& .f-s-v-w, & .flex-scrollable-vertical-layout-wrapper {
&.h-center.v-middle {
height: 100%;
}
}
}
& .f-s-v-w, & .flex-scrollable-vertical-layout-wrapper { & .f-s-v-w, & .flex-scrollable-vertical-layout-wrapper {
.flex(); .flex();
.vertical(); .vertical();

Loading…
Cancel
Save