diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js index 7b81608e73..5893591ebd 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js @@ -8,7 +8,8 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, { props: function () { 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, horizontalAlign: BI.HorizontalAlign.Left, columnSize: [], diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js index 39a18f6e9f..efcd838cd7 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js @@ -8,7 +8,8 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { props: function () { 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, verticalAlign: BI.VerticalAlign.Top, rowSize: [], diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index 48a067a268..0fccf43464 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -29,6 +29,12 @@ } .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 { .flex(); .horizontal(); diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index b5b48e5aea..d9071cb8a7 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -29,6 +29,14 @@ } .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 { .flex(); .vertical();