From 31552ce4f5333e467b960d027d3a73fb4fd249cc Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 27 Mar 2021 15:36:11 +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

---
 src/core/platform/web/config.js | 38 ++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/core/platform/web/config.js b/src/core/platform/web/config.js
index 02764ae06..d86a2523e 100644
--- a/src/core/platform/web/config.js
+++ b/src/core/platform/web/config.js
@@ -25,13 +25,13 @@ BI.prepares.push(function () {
             // 在这种情况下，也可以通过flex支持该布局
             if (supportFlex) {
                 // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
-                if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) {
-                    return BI.extend({}, ob, {
-                        type: "bi.flex_horizontal",
-                        horizontalAlign: !justOneItem && ob.horizontalAlign === BI.HorizontalAlign.Center
-                            ? BI.HorizontalAlign.Left : ob.horizontalAlign
-                    });
-                }
+                // if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) {
+                return BI.extend({}, ob, {
+                    type: "bi.flex_horizontal",
+                    horizontalAlign: !justOneItem && ob.horizontalAlign === BI.HorizontalAlign.Center
+                        ? BI.HorizontalAlign.Left : ob.horizontalAlign
+                });
+                // }
             }
             return BI.extend({}, ob, {type: "bi.table_adapt"});
         }
@@ -57,9 +57,9 @@ BI.prepares.push(function () {
         if (!isAdapt || justOneItem) {
             if (supportFlex) {
                 // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
-                if (!isIE || (ob.scrollable !== true && ob.scrollx !== true && ob.scrolly !== true)) {
-                    return BI.extend({}, ob, {type: "bi.flex_center_adapt"});
-                }
+                // if (!isIE || (ob.scrollable !== true && ob.scrollx !== true && ob.scrolly !== true)) {
+                return BI.extend({}, ob, {type: "bi.flex_center_adapt"});
+                // }
             }
             return BI.extend({}, ob, {type: "bi.inline_center_adapt"});
         }
@@ -71,9 +71,9 @@ BI.prepares.push(function () {
         if (!isAdapt || justOneItem) {
             if (supportFlex) {
                 // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
-                if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) {
-                    return BI.extend({}, ob, {type: "bi.flex_vertical_adapt"});
-                }
+                // if (!isIE || (ob.scrollable !== true && ob.scrolly !== true)) {
+                return BI.extend({}, ob, {type: "bi.flex_vertical_adapt"});
+                // }
             }
             return BI.extend({}, ob, {type: "bi.inline_vertical_adapt"});
         }
@@ -91,18 +91,18 @@ BI.prepares.push(function () {
     BI.Plugin.configWidget("bi.horizontal_float", function (ob) {
         if (isSupportFlex()) {
             // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
-            if (!BI.isIE() || (ob.scrollable !== true && ob.scrollx !== true)) {
-                return BI.extend({}, ob, {type: "bi.flex_horizontal_adapt"});
-            }
+            // if (!BI.isIE() || (ob.scrollable !== true && ob.scrollx !== true)) {
+            return BI.extend({}, ob, {type: "bi.flex_horizontal_adapt"});
+            // }
         }
         return BI.extend({}, ob, {type: "bi.inline_horizontal_adapt"});
     });
     BI.Plugin.configWidget("bi.left_right_vertical_adapt", function (ob) {
         if (isSupportFlex()) {
             // IE下其实也是可以使用flex布局的，只要排除掉出现滚动条的情况
-            if (!BI.isIE() || (ob.scrollable !== true && ob.scrolly !== true)) {
-                return BI.extend({}, ob, {type: "bi.flex_left_right_vertical_adapt"});
-            }
+            // if (!BI.isIE() || (ob.scrollable !== true && ob.scrolly !== true)) {
+            return BI.extend({}, ob, {type: "bi.flex_left_right_vertical_adapt"});
+            // }
         }
         return ob;
     });