From 61a787ee41990d47b3dedc9fdb591577328e488f Mon Sep 17 00:00:00 2001 From: guy Date: Wed, 7 Apr 2021 21:29:47 +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/flex/flex.horizontal.js | 13 ++++++++----- src/core/wrapper/layout/flex/flex.vertical.js | 13 ++++++++----- .../layout/flex/wrapper/flex.wrapper.horizontal.js | 13 ++++++++----- .../layout/flex/wrapper/flex.wrapper.vertical.js | 13 ++++++++----- 4 files changed, 32 insertions(+), 20 deletions(-) diff --git a/src/core/wrapper/layout/flex/flex.horizontal.js b/src/core/wrapper/layout/flex/flex.horizontal.js index 2b313f699..a5be46b07 100644 --- a/src/core/wrapper/layout/flex/flex.horizontal.js +++ b/src/core/wrapper/layout/flex/flex.horizontal.js @@ -40,15 +40,18 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, { w.element.css({ position: "relative" }); - if (o.columnSize[i] === "fill" || o.columnSize[i] === "") { - if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) { - if (o.scrollable === true || o.scrollx === true) { - w.element.addClass("f-s-n"); + if (o.columnSize[i] !== "auto") { + if (o.columnSize[i] === "fill" || o.columnSize[i] === "") { + if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) { + if (o.scrollable === true || o.scrollx === true) { + w.element.addClass("f-s-n"); + } } + } else { + w.element.addClass("f-s-n"); } } if (o.columnSize[i] > 0) { - w.element.addClass("f-s-n"); w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit))); } if (o.columnSize[i] === "fill") { diff --git a/src/core/wrapper/layout/flex/flex.vertical.js b/src/core/wrapper/layout/flex/flex.vertical.js index 836b9c0cf..21bc68215 100644 --- a/src/core/wrapper/layout/flex/flex.vertical.js +++ b/src/core/wrapper/layout/flex/flex.vertical.js @@ -39,15 +39,18 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, { w.element.css({ position: "relative" }); - if (o.rowSize[i] === "fill" || o.rowSize[i] === "") { - if (o.verticalAlign !== BI.VerticalAlign.Stretch) { - if (o.scrollable === true || o.scrolly === true) { - w.element.addClass("f-s-n"); + if (o.columnSize[i] !== "auto") { + if (o.rowSize[i] === "fill" || o.rowSize[i] === "") { + if (o.verticalAlign !== BI.VerticalAlign.Stretch) { + if (o.scrollable === true || o.scrolly === true) { + w.element.addClass("f-s-n"); + } } + } else { + w.element.addClass("f-s-n"); } } if (o.rowSize[i] > 0) { - w.element.addClass("f-s-n"); w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit))); } if (o.rowSize[i] === "fill") { 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 1d98c584c..55f20992d 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js @@ -36,15 +36,18 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, { w.element.css({ position: "relative" }); - if (o.columnSize[i] === "fill" || o.columnSize[i] === "") { - if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) { - if (o.scrollable === true || o.scrollx === true) { - w.element.addClass("f-s-n"); + if (o.columnSize[i] !== "auto") { + if (o.columnSize[i] === "fill" || o.columnSize[i] === "") { + if (o.horizontalAlign !== BI.HorizontalAlign.Stretch) { + if (o.scrollable === true || o.scrollx === true) { + w.element.addClass("f-s-n"); + } } + } else { + w.element.addClass("f-s-n"); } } if (o.columnSize[i] > 0) { - w.element.addClass("f-s-n"); w.element.width(o.columnSize[i] === "" ? "" : (o.columnSize[i] <= 1 ? ((o.columnSize[i] * 100).toFixed(1) + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit))); } if (o.columnSize[i] === "fill") { 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 0ee6d00e4..219a0252e 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js @@ -36,15 +36,18 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { w.element.css({ position: "relative" }); - if (o.rowSize[i] === "fill" || o.rowSize[i] === "") { - if (o.verticalAlign !== BI.VerticalAlign.Stretch) { - if (o.scrollable === true || o.scrolly === true) { - w.element.addClass("f-s-n"); + if (o.columnSize[i] !== "auto") { + if (o.rowSize[i] === "fill" || o.rowSize[i] === "") { + if (o.verticalAlign !== BI.VerticalAlign.Stretch) { + if (o.scrollable === true || o.scrolly === true) { + w.element.addClass("f-s-n"); + } } + } else { + w.element.addClass("f-s-n"); } } if (o.rowSize[i] > 0) { - w.element.addClass("f-s-n"); w.element.height(o.rowSize[i] === "" ? "" : (o.rowSize[i] <= 1 ? ((o.rowSize[i] * 100).toFixed(1) + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit))); } if (o.rowSize[i] === "fill") {