From ffd4a43f212097982b31b7c75f7da6c1aec1c0fa Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 31 Jul 2021 16:08:05 +0800
Subject: [PATCH] bugfix

---
 src/core/platform/web/config.js                       | 2 +-
 src/core/wrapper/layout/fill/float.fill.horizontal.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/platform/web/config.js b/src/core/platform/web/config.js
index 23de10d01..f4051252f 100644
--- a/src/core/platform/web/config.js
+++ b/src/core/platform/web/config.js
@@ -31,7 +31,7 @@ BI.prepares.push(function () {
         // 当列宽既需要自动列宽又需要自适应列宽时，inline布局也处理不了了，降级table处理吧
         var hasAutoAndFillColumnSize = false;
         if (ob.columnSize && ob.columnSize.length > 0) {
-            if (ob.columnSize && ob.columnSize.indexOf("") >= 0 && ob.columnSize.indexOf("fill") >= 0) {
+            if (ob.columnSize.indexOf("") >= 0 && ob.columnSize.indexOf("fill") >= 0) {
                 hasAutoAndFillColumnSize = true;
             }
         } else {
diff --git a/src/core/wrapper/layout/fill/float.fill.horizontal.js b/src/core/wrapper/layout/fill/float.fill.horizontal.js
index e2ed9ba86..ad6f6b3e6 100644
--- a/src/core/wrapper/layout/fill/float.fill.horizontal.js
+++ b/src/core/wrapper/layout/fill/float.fill.horizontal.js
@@ -38,6 +38,7 @@ BI.FloatHorizontalFillLayout = BI.inherit(BI.Layout, {
                     type: "bi.vertical_adapt",
                     horizontalAlign: BI.HorizontalAlign.Stretch,
                     verticalAlign: o.verticalAlign,
+                    columnSize: ["fill"],
                     items: [item]
                 });
             } else {