From effb93e90df3099a5299507be8aa6b5ec8270c3a Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 29 Apr 2022 15:32:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feature:=20=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/core/wrapper/flex.horizontal.less | 1 + src/less/core/wrapper/flex.vertical.less | 1 + src/less/core/wrapper/flex.wrapper.horizontal.less | 1 + src/less/core/wrapper/flex.wrapper.vertical.less | 1 + 4 files changed, 4 insertions(+) diff --git a/src/less/core/wrapper/flex.horizontal.less b/src/less/core/wrapper/flex.horizontal.less index b6a8ccc97..a6a38704d 100644 --- a/src/less/core/wrapper/flex.horizontal.less +++ b/src/less/core/wrapper/flex.horizontal.less @@ -169,6 +169,7 @@ } > .f-f { + min-width: 0; -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1; diff --git a/src/less/core/wrapper/flex.vertical.less b/src/less/core/wrapper/flex.vertical.less index c8fbefa6b..d856d0dee 100644 --- a/src/less/core/wrapper/flex.vertical.less +++ b/src/less/core/wrapper/flex.vertical.less @@ -168,6 +168,7 @@ } > .f-f { + min-width: 0; -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1; diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index 89de62f88..1b38fa0be 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -265,6 +265,7 @@ } > .f-f { + min-width: 0; -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1; diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index 477891105..cb9a86f69 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -259,6 +259,7 @@ } > .f-f { + min-width: 0; -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1; From 1f21e397bd1b1b5654c0db853cce7d0d81b59116 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 29 Apr 2022 15:35:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feature:=20=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/core/wrapper/flex.vertical.less | 2 +- src/less/core/wrapper/flex.wrapper.vertical.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/less/core/wrapper/flex.vertical.less b/src/less/core/wrapper/flex.vertical.less index d856d0dee..5b97ea999 100644 --- a/src/less/core/wrapper/flex.vertical.less +++ b/src/less/core/wrapper/flex.vertical.less @@ -168,7 +168,7 @@ } > .f-f { - min-width: 0; + min-height: 0; -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1; diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index cb9a86f69..09693c348 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -259,7 +259,7 @@ } > .f-f { - min-width: 0; + min-height: 0; -webkit-flex-grow: 1; -moz-flex-grow: 1; -ms-flex-grow: 1; From 39410b8ec2f2f1879726c83a5f15102d3dda835f Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 29 Apr 2022 15:38:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature:=20=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout/flex/flex.horizontal.js | 1 - src/core/wrapper/layout/flex/flex.vertical.js | 1 - 2 files changed, 2 deletions(-) diff --git a/src/core/wrapper/layout/flex/flex.horizontal.js b/src/core/wrapper/layout/flex/flex.horizontal.js index 1228e7e59..7d53dfe0e 100644 --- a/src/core/wrapper/layout/flex/flex.horizontal.js +++ b/src/core/wrapper/layout/flex/flex.horizontal.js @@ -81,7 +81,6 @@ BI.FlexHorizontalLayout = BI.inherit(BI.Layout, { } if (columnSize === "fill") { w.element.addClass("f-f"); - w.element.css({ minWidth: 0 }); } w.element.addClass("c-e"); if (i === 0) { diff --git a/src/core/wrapper/layout/flex/flex.vertical.js b/src/core/wrapper/layout/flex/flex.vertical.js index 40f252ed2..46b175e9b 100644 --- a/src/core/wrapper/layout/flex/flex.vertical.js +++ b/src/core/wrapper/layout/flex/flex.vertical.js @@ -80,7 +80,6 @@ BI.FlexVerticalLayout = BI.inherit(BI.Layout, { } if (rowSize === "fill") { w.element.addClass("f-f"); - w.element.css({ minHeight: 0 }); } w.element.addClass("c-e"); if (i === 0) {