From 9beb6aa2a02e32d10e6f8a909354b03533516ff3 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 7 Apr 2021 21:06:21 +0800
Subject: [PATCH] =?UTF-8?q?stretch=E8=83=BD=E5=A4=9F=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E6=BB=9A=E5=8A=A8=E6=9D=A1=E8=83=BD?=
 =?UTF-8?q?=E5=A4=9F=E5=8A=A8=E6=80=81=E9=80=89=E6=8B=A9=EF=BC=8C=E8=80=8C?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=B8=BB=E5=8A=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/wrapper/layout/adapt/float.horizontal.js | 3 ++-
 src/core/wrapper/layout/layout.horizontal.js      | 3 ++-
 src/core/wrapper/layout/layout.inline.js          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/core/wrapper/layout/adapt/float.horizontal.js b/src/core/wrapper/layout/adapt/float.horizontal.js
index 529855411..5121080d7 100644
--- a/src/core/wrapper/layout/adapt/float.horizontal.js
+++ b/src/core/wrapper/layout/adapt/float.horizontal.js
@@ -1,5 +1,6 @@
 /**
  * 浮动的水平居中布局
  */
-BI.FloatHorizontalLayout = BI.inherit(BI.Layout);
+BI.FloatHorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal_float", BI.FloatHorizontalLayout);
diff --git a/src/core/wrapper/layout/layout.horizontal.js b/src/core/wrapper/layout/layout.horizontal.js
index a2989eff3..525538e92 100644
--- a/src/core/wrapper/layout/layout.horizontal.js
+++ b/src/core/wrapper/layout/layout.horizontal.js
@@ -3,5 +3,6 @@
  * @class BI.HorizontalLayout
  * @extends BI.Layout
  */
-BI.HorizontalLayout = BI.inherit(BI.Layout);
+BI.HorizontalLayout = function () {
+};
 BI.shortcut("bi.horizontal", BI.HorizontalLayout);
diff --git a/src/core/wrapper/layout/layout.inline.js b/src/core/wrapper/layout/layout.inline.js
index 1d2528bcd..182cf8157 100644
--- a/src/core/wrapper/layout/layout.inline.js
+++ b/src/core/wrapper/layout/layout.inline.js
@@ -54,7 +54,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
             if (o.columnSize[i] === "fill") {
                 w.element.css("min-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
             }
-            if (o.horizontalAlign === BI.HorizontalAlign.Stretch) {
+            if (o.horizontalAlign === BI.HorizontalAlign.Stretch || !(o.scrollable === true || o.scrollx === true)) {
                 w.element.css("max-width", "calc(100% - " + ((left + right) / BI.pixRatio + BI.pixUnit) + ")");
             }
         }