From 1b5901b8c3b4f9808917395d9d8bc5c02d34ec31 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Mon, 29 Mar 2021 18:17:28 +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

---
 .../core/wrapper/flex.wrapper.horizontal.less | 35 +++++++++++++++++--
 .../core/wrapper/flex.wrapper.vertical.less   | 29 +++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less
index 4c7b6029b..6418929cd 100644
--- a/src/less/core/wrapper/flex.wrapper.horizontal.less
+++ b/src/less/core/wrapper/flex.wrapper.horizontal.less
@@ -31,6 +31,37 @@
 .bi-f-s-h, .bi-flex-scrollable-horizontal-layout {
   .flex();
 
+  .horizontal();
+
+  /* 09版 */
+  -webkit-box-pack: flex-start;
+  /* 12版 */
+  -webkit-justify-content: flex-start;
+  -moz-justify-content: flex-start;
+  -ms-justify-content: flex-start;
+  -ms-flex-pack: start;
+  -o-justify-content: flex-start;
+  justify-content: flex-start;
+
+  /* 09版 */
+  -webkit-box-align: flex-start;
+  /* 12版 */
+  -webkit-align-items: flex-start;
+  -moz-align-items: flex-start;
+  -ms-align-items: flex-start;
+  -ms-flex-align: start;
+  -o-align-items: flex-start;
+  align-items: flex-start;
+
+  /* 09版 */
+  /*-webkit-box-lines: multiple;*/
+  /* 12版 */
+  -webkit-flex-wrap: nowrap;
+  -moz-flex-wrap: nowrap;
+  -ms-flex-wrap: nowrap;
+  -o-flex-wrap: nowrap;
+  flex-wrap: nowrap;
+
   &.h-center {
     > .f-s-h-w {
       margin-left: auto !important;
@@ -41,7 +72,7 @@
   &.v-middle {
     > .f-s-h-w {
       margin-top: auto !important;
-      margin-right: auto !important;
+      margin-bottom: auto !important;
     }
   }
 
@@ -103,7 +134,7 @@
     -o-flex-wrap: nowrap;
     flex-wrap: nowrap;
 
-    min-height: 100%;
+    //min-height: 100%;
 
     &.v-middle {
       ///* 09版 */
diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less
index 7ad5f2d51..e9ff07f65 100644
--- a/src/less/core/wrapper/flex.wrapper.vertical.less
+++ b/src/less/core/wrapper/flex.wrapper.vertical.less
@@ -32,6 +32,35 @@
   .flex();
   .vertical();
 
+  /* 09版 */
+  -webkit-box-pack: flex-start;
+  /* 12版 */
+  -webkit-justify-content: flex-start;
+  -moz-justify-content: flex-start;
+  -ms-justify-content: flex-start;
+  -ms-flex-pack: start;
+  -o-justify-content: flex-start;
+  justify-content: flex-start;
+
+  /* 09版 */
+  -webkit-box-align: flex-start;
+  /* 12版 */
+  -webkit-align-items: flex-start;
+  -moz-align-items: flex-start;
+  -ms-align-items: flex-start;
+  -ms-flex-align: start;
+  -o-align-items: flex-start;
+  align-items: flex-start;
+
+  /* 09版 */
+  /*-webkit-box-lines: multiple;*/
+  /* 12版 */
+  -webkit-flex-wrap: nowrap;
+  -moz-flex-wrap: nowrap;
+  -ms-flex-wrap: nowrap;
+  -o-flex-wrap: nowrap;
+  flex-wrap: nowrap;
+
   &.h-center {
     > .f-s-v-w {
       margin-left: auto !important;