From c0c4f25a37d9ce6ee9c74f4e62f0fea7b78d243c Mon Sep 17 00:00:00 2001 From: guy Date: Mon, 29 Mar 2021 11:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wrapper/layout/flex/flex.leftrightvertical.center.js | 2 +- src/less/core/wrapper/flex.wrapper.horizontal.less | 4 ++++ src/less/core/wrapper/flex.wrapper.vertical.less | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js b/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js index 47a8194c1..102ae4646 100644 --- a/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js +++ b/src/core/wrapper/layout/flex/flex.leftrightvertical.center.js @@ -57,7 +57,7 @@ BI.FlexLeftRightVerticalAdaptLayout = BI.inherit(BI.Layout, { rightItems = BI.map(rightItems, function (i, item) { if (i === 0) { if (BI.isWidget(item)) { - item.addClass("flex-left-auto"); + item.element.addClass("flex-left-auto"); } else { var t = BI.stripEL(item); t.cls = (t.cls || "") + " flex-left-auto"; diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index 2c080150d..6a6293f64 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -149,6 +149,10 @@ align-items: stretch; } + &.h-stretch { + min-width: 100%; + } + &.h-center { ///* 09版 */ //-webkit-box-pack: center; diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index c9653c175..54d5dddcf 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -132,10 +132,6 @@ margin-left: auto !important; margin-right: auto !important; } - - &.v-middle { - min-height: 100%; - } } &.h-right { @@ -162,6 +158,10 @@ align-items: stretch; } + &.v-stretch { + min-height: 100%; + } + &.v-middle { ///* 09版 */ //-webkit-box-pack: center;