From fad6851b71cc587afe32e96df75370d793fc6404 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 19 Feb 2021 00:02:37 +0800 Subject: [PATCH] bugfix --- src/core/wrapper/layout/flex/flex.horizontal.js | 6 ++---- src/core/wrapper/layout/flex/flex.vertical.js | 6 ++---- .../flex/wrapper/flex.wrapper.horizontal.js | 6 ++---- .../layout/flex/wrapper/flex.wrapper.vertical.js | 6 ++---- src/less/core/wrapper/flex.horizontal.less | 15 +++++++++++++++ src/less/core/wrapper/flex.vertical.less | 15 +++++++++++++++ .../core/wrapper/flex.wrapper.horizontal.less | 15 +++++++++++++++ src/less/core/wrapper/flex.wrapper.vertical.less | 15 +++++++++++++++ 8 files changed, 68 insertions(+), 16 deletions(-) diff --git a/src/core/wrapper/layout/flex/flex.horizontal.js b/src/core/wrapper/layout/flex/flex.horizontal.js index 22cd106af..7d2045060 100644 --- a/src/core/wrapper/layout/flex/flex.horizontal.js +++ b/src/core/wrapper/layout/flex/flex.horizontal.js @@ -35,15 +35,13 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, { position: "relative" }); if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "auto") { - w.element.css({ - "flex-shrink": "0" - }); + w.element.addClass("shrink-none"); } if (o.columnSize[i] > 0) { w.element.width(o.columnSize[i] <= 1 ? (o.columnSize[i] * 100 + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)); } if (o.columnSize[i] === "fill") { - w.element.css("flex", "1"); + w.element.addClass("fill"); } if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) { w.element.css({ diff --git a/src/core/wrapper/layout/flex/flex.vertical.js b/src/core/wrapper/layout/flex/flex.vertical.js index 8de8e6d31..34acdb4c3 100644 --- a/src/core/wrapper/layout/flex/flex.vertical.js +++ b/src/core/wrapper/layout/flex/flex.vertical.js @@ -34,15 +34,13 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, { position: "relative" }); if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "auto") { - w.element.css({ - "flex-shrink": "0" - }); + w.element.addClass("shrink-none"); } if (o.rowSize[i] > 0) { w.element.height(o.rowSize[i] <= 1 ? (o.rowSize[i] * 100 + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)); } if (o.rowSize[i] === "fill") { - w.element.css("flex", "1"); + w.element.addClass("fill"); } if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) { w.element.css({ 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 ce695e8c3..1a3e62bb6 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,13 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, { position: "relative" }); if (o.horizontalAlign !== BI.HorizontalAlign.Stretch && o.columnSize[i] !== "auto") { - w.element.css({ - "flex-shrink": "0" - }); + w.element.addClass("shrink-none"); } if (o.columnSize[i] > 0) { w.element.width(o.columnSize[i] <= 1 ? (o.columnSize[i] * 100 + "%") : (o.columnSize[i] / BI.pixRatio + BI.pixUnit)); } if (o.columnSize[i] === "fill") { - w.element.css("flex", "1"); + w.element.addClass("fill"); } if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) { w.element.css({ 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 0c373fa19..0af54996c 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,13 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { position: "relative" }); if (o.verticalAlign !== BI.VerticalAlign.Stretch && o.rowSize[i] !== "auto") { - w.element.css({ - "flex-shrink": "0" - }); + w.element.addClass("shrink-none"); } if (o.rowSize[i] > 0) { w.element.height(o.rowSize[i] <= 1 ? (o.rowSize[i] * 100 + "%") : (o.rowSize[i] / BI.pixRatio + BI.pixUnit)); } if (o.rowSize[i] === "fill") { - w.element.css("flex", "1"); + w.element.addClass("fill"); } if (o.vgap + o.tgap + (item.tgap || 0) + (item.vgap || 0) !== 0) { w.element.css({ diff --git a/src/less/core/wrapper/flex.horizontal.less b/src/less/core/wrapper/flex.horizontal.less index 565cd3bb7..86e986f3e 100644 --- a/src/less/core/wrapper/flex.horizontal.less +++ b/src/less/core/wrapper/flex.horizontal.less @@ -156,4 +156,19 @@ justify-content: flex-end; } } + + > .shrink-none { + -webkit-flex-shrink: 0; + -moz-flex-shrink: 0; + -ms-flex-shrink: 0; + flex-shrink: 0; + } + + > .fill { + -webkit-box-flex: 1; + -moz-box-flex: 1; + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + } } diff --git a/src/less/core/wrapper/flex.vertical.less b/src/less/core/wrapper/flex.vertical.less index d324e2fa5..a5a89dc1a 100644 --- a/src/less/core/wrapper/flex.vertical.less +++ b/src/less/core/wrapper/flex.vertical.less @@ -155,4 +155,19 @@ justify-content: flex-end; } } + + > .shrink-none { + -webkit-flex-shrink: 0; + -moz-flex-shrink: 0; + -ms-flex-shrink: 0; + flex-shrink: 0; + } + + > .fill { + -webkit-box-flex: 1; + -moz-box-flex: 1; + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + } } diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index 607275b4c..20d00b6e7 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -163,5 +163,20 @@ justify-content: flex-end; } } + + > .shrink-none { + -webkit-flex-shrink: 0; + -moz-flex-shrink: 0; + -ms-flex-shrink: 0; + flex-shrink: 0; + } + + > .fill { + -webkit-box-flex: 1; + -moz-box-flex: 1; + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + } } } diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index 5806e8108..569dbfccd 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -163,5 +163,20 @@ justify-content: flex-end; } } + + > .shrink-none { + -webkit-flex-shrink: 0; + -moz-flex-shrink: 0; + -ms-flex-shrink: 0; + flex-shrink: 0; + } + + > .fill { + -webkit-box-flex: 1; + -moz-box-flex: 1; + -webkit-flex: 1; + -ms-flex: 1; + flex: 1; + } } }