From 882331485225e954793d7a717b0cb21527d0e81c Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 27 Mar 2021 13:00:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/flex/wrapper/flex.wrapper.horizontal.js        | 3 ++-
 .../wrapper/layout/flex/wrapper/flex.wrapper.vertical.js  | 3 ++-
 src/less/core/wrapper/flex.wrapper.horizontal.less        | 6 ++++++
 src/less/core/wrapper/flex.wrapper.vertical.less          | 8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

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 7b81608e7..5893591eb 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 39a18f6e9..efcd838cd 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 48a067a26..0fccf4346 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 b5b48e5ae..d9071cb8a 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();