From 16213c0f85aa3ac8317797bf4a05fd12940e16d3 Mon Sep 17 00:00:00 2001
From: zhangwei <1504152376@qq.com>
Date: 星期三, 05 三月 2025 17:29:42 +0800
Subject: [PATCH] -
---
src/uni_modules/uview-plus/libs/css/flex.scss | 166 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 114 insertions(+), 52 deletions(-)
diff --git a/src/uni_modules/uview-plus/libs/css/flex.scss b/src/uni_modules/uview-plus/libs/css/flex.scss
index d24cd5a..152baec 100644
--- a/src/uni_modules/uview-plus/libs/css/flex.scss
+++ b/src/uni_modules/uview-plus/libs/css/flex.scss
@@ -30,42 +30,55 @@
// flex甯冨眬
.u-flex,
.u-flex-row,
-.u-flex-x {
+.u-flex-x,
+.up-flex,
+.up-flex-row,
+.up-flex-x {
@include flex;
}
.u-flex-y,
-.u-flex-column {
+.u-flex-column,
+.up-flex-y,
+.up-flex-column {
@include flex(column);
}
-.u-flex-x-center {
+.u-flex-x-center,
+.up-flex-x-center {
@include flex;
justify-content: center;
}
-.u-flex-xy-center {
+.u-flex-xy-center,
+.up-flex-xy-center {
@include flex;
justify-content: center;
align-items: center;
}
-.u-flex-y-center {
+.u-flex-y-center,
+.up-flex-y-center {
@include flex;
align-items: center;
}
-.u-flex-x-left {
+.u-flex-x-left,
+.up-flex-x-left {
@include flex;
}
.u-flex-x-reverse,
-.u-flex-row-reverse {
+.u-flex-row-reverse,
+.up-flex-x-reverse,
+.up-flex-row-reverse {
flex-direction: row-reverse;
}
.u-flex-y-reverse,
-.u-flex-column-reverse {
+.u-flex-column-reverse,
+.up-flex-y-reverse,
+.up-flex-column-reverse {
flex-direction: column-reverse;
}
@@ -74,113 +87,143 @@
// nvue涓嬪彧鑳藉啓鎴恈lass="u-flex-x u-flex-x-reverse鐨勫舰寮�"
.u-flex.u-flex-reverse,
.u-flex-row.u-flex-reverse,
-.u-flex-x.u-flex-reverse {
+.u-flex-x.u-flex-reverse,
+.up-flex.up-flex-reverse,
+.up-flex-row.up-flex-reverse,
+.up-flex-x.up-flex-reverse {
flex-direction: row-reverse;
}
.u-flex-column.u-flex-reverse,
-.u-flex-y.u-flex-reverse {
+.u-flex-y.u-flex-reverse,
+.up-flex-column.up-flex-reverse,
+.up-flex-y.up-flex-reverse {
flex-direction: column-reverse;
}
// 鑷姩浼哥缉
-.u-flex-fill {
+.u-flex-fill,
+.up-flex-fill {
flex: 1 1 auto;
}
// 杈圭晫鑷姩浼哥缉
.u-margin-top-auto,
-.u-m-t-auto {
+.u-m-t-auto,
+.up-margin-top-auto,
+.up-m-t-auto {
margin-top: auto !important;
}
.u-margin-right-auto,
-.u-m-r-auto {
+.u-m-r-auto,
+.up-margin-right-auto,
+.up-m-r-auto {
margin-right: auto !important;
}
.u-margin-bottom-auto,
-.u-m-b-auto {
+.u-m-b-auto,
+.up-margin-bottom-auto,
+.up-m-b-auto {
margin-bottom: auto !important;
}
.u-margin-left-auto,
-.u-m-l-auto {
+.u-m-l-auto,
+.up-margin-left-auto,
+.up-m-l-auto {
margin-left: auto !important;
}
.u-margin-center-auto,
-.u-m-c-auto {
+.u-m-c-auto,
+.up-margin-center-auto,
+.up-m-c-auto {
margin-left: auto !important;
margin-right: auto !important;
}
.u-margin-middle-auto,
-.u-m-m-auto {
+.u-m-m-auto,
+.up-margin-middle-auto,
+.up-m-m-auto {
margin-top: auto !important;
margin-bottom: auto !important;
}
/* #endif */
// 鎹㈣
-.u-flex-wrap {
+.u-flex-wrap,
+.up-flex-wrap {
flex-wrap: wrap;
}
// 鍙嶅悜鎹㈣
-.u-flex-wrap-reverse {
+.u-flex-wrap-reverse,
+.up-flex-wrap-reverse {
flex-wrap: wrap-reverse;
}
// 涓昏酱璧风偣瀵归綈
-.u-flex-start {
+.u-flex-start,
+.up-flex-start {
justify-content: flex-start;
}
// 涓昏酱涓棿瀵归綈
-.u-flex-center {
+.u-flex-center,
+.up-flex-center {
justify-content: center;
}
// 涓昏酱缁堢偣瀵归綈
-.u-flex-end {
+.u-flex-end,
+.up-flex-end {
justify-content: flex-end;
}
// 涓昏酱绛夋瘮闂磋窛
-.u-flex-between {
+.u-flex-between,
+.up-flex-between {
justify-content: space-between;
}
// 涓昏酱鍧囧垎闂磋窛
-.u-flex-around {
+.u-flex-around,
+.up-flex-around {
justify-content: space-around;
}
// 浜ゅ弶杞磋捣鐐瑰榻�
-.u-flex-items-start {
+.u-flex-items-start,
+.up-flex-items-start {
align-items: flex-start;
}
// 浜ゅ弶杞翠腑闂村榻�
-.u-flex-items-center {
+.u-flex-items-center,
+.up-flex-items-center {
align-items: center;
}
// 浜ゅ弶杞寸粓鐐瑰榻�
-.u-flex-items-end {
+.u-flex-items-end,
+.up-flex-items-end {
align-items: flex-end;
}
// 浜ゅ弶杞寸涓�琛屾枃瀛楀熀绾垮榻�
-.u-flex-items-baseline {
+.u-flex-items-baseline,
+.up-flex-items-baseline {
/* #ifndef APP-NVUE */
align-items: baseline;
/* #endif */
}
// 浜ゅ弶杞存柟鍚戞媺浼稿榻�
-.u-flex-items-stretch {
+.u-flex-items-stretch,
+.up-flex-items-stretch {
align-items: stretch;
}
@@ -189,27 +232,32 @@
// 瀛愬厓绱犱氦鍙夎酱璧风偣瀵归綈
/* #ifndef APP-NVUE */
-.u-flex-self-start {
+.u-flex-self-start,
+.up-flex-self-start {
align-self: flex-start;
}
// 瀛愬厓绱犱氦鍙夎酱灞呬腑瀵归綈
-.u-flex-self-center {
+.u-flex-self-center,
+.up-flex-self-center {
align-self: center;
}
// 瀛愬厓绱犱氦鍙夎酱缁堢偣瀵归綈
-.u-flex-self-end {
+.u-flex-self-end,
+.up-flex-self-end {
align-self: flex-end;
}
// 瀛愬厓绱犱氦鍙夎酱绗竴琛屾枃瀛楀熀绾垮榻�
-.u-flex-self-baseline {
+.u-flex-self-baseline,
+.up-flex-self-baseline {
align-self: baseline;
}
// 瀛愬厓绱犱氦鍙夎酱鏂瑰悜鎷変几瀵归綈
-.u-flex-self-stretch {
+.u-flex-self-stretch,
+.up-flex-self-stretch {
align-self: stretch;
}
/* #endif */
@@ -217,32 +265,38 @@
// 璧风偣瀵归綈
/* #ifndef APP-NVUE */
-.u-flex-content-start {
+.u-flex-content-start,
+.up-flex-content-start {
align-content: flex-start;
}
// 灞呬腑瀵归綈
-.u-flex-content-center {
+.u-flex-content-center,
+.up-flex-content-center {
align-content: center;
}
// 缁堢偣瀵归綈
-.u-flex-content-end {
+.u-flex-content-end,
+.up-flex-content-end {
align-content: flex-end;
}
// 涓ょ瀵归綈
-.u-flex-content-between {
+.u-flex-content-between,
+.up-flex-content-between {
align-content: space-between;
}
// 鍧囧垎闂磋窛
-.u-flex-content-around {
+.u-flex-content-around,
+.up-flex-content-around {
align-content: space-around;
}
// 鍏ㄩ儴灞呬腑瀵归綈
-.u-flex-middle {
+.u-flex-middle,
+.up-flex-middle {
justify-content: center;
align-items: center;
align-self: center;
@@ -250,12 +304,14 @@
}
// 鏄惁鍙互鏀惧ぇ
-.u-flex-grow {
+.u-flex-grow,
+.up-flex-grow {
flex-grow: 1;
}
// 鏄惁鍙互缂╁皬
-.u-flex-shrink {
+.u-flex-shrink,
+.up-flex-shrink {
flex-shrink: 1;
}
@@ -265,36 +321,42 @@
@for $i from 0 through 80 {
// 鍙鍙屾暟鍜岃兘琚�5闄ゅ敖鐨勬暟
@if $i % 2 == 0 or $i % 5 == 0 {
- // 寰楀嚭锛歶-margin-30鎴栬�卽-m-30
- .u-margin-#{$i}, .u-m-#{$i} {
+ // 寰楀嚭锛歶p-margin-30鎴栬�卽-m-30
+ .u-margin-#{$i}, .u-m-#{$i},
+ .up-margin-#{$i}, .up-m-#{$i} {
margin: $i + rpx!important;
}
- // 寰楀嚭锛歶-padding-30鎴栬�卽-p-30
- .u-padding-#{$i}, .u-p-#{$i} {
+ // 寰楀嚭锛歶p-padding-30鎴栬�卽-p-30
+ .u-padding-#{$i}, .u-p-#{$i},
+ .up-padding-#{$i}, .up-p-#{$i} {
padding: $i + rpx!important;
}
@each $short, $long in l left, t top, r right, b bottom {
- // 缂╁啓鐗堬紝缁撴灉濡傦細 u-m-l-30
+ // 缂╁啓鐗堬紝缁撴灉濡傦細 up-m-l-30
// 瀹氫箟澶栬竟璺�
- .u-m-#{$short}-#{$i} {
+ .u-m-#{$short}-#{$i},
+ .up-m-#{$short}-#{$i} {
margin-#{$long}: $i + rpx!important;
}
// 瀹氫箟鍐呰竟璺�
- .u-p-#{$short}-#{$i} {
+ .u-p-#{$short}-#{$i},
+ .up-p-#{$short}-#{$i} {
padding-#{$long}: $i + rpx!important;
}
- // 瀹屾暣鐗堬紝缁撴灉濡傦細u-margin-left-30
+ // 瀹屾暣鐗堬紝缁撴灉濡傦細up-margin-left-30
// 瀹氫箟澶栬竟璺�
- .u-margin-#{$long}-#{$i} {
+ .u-margin-#{$long}-#{$i},
+ .up-margin-#{$long}-#{$i} {
margin-#{$long}: $i + rpx!important;
}
// 瀹氫箟鍐呰竟璺�
- .u-padding-#{$long}-#{$i} {
+ .u-padding-#{$long}-#{$i},
+ .up-padding-#{$long}-#{$i} {
padding-#{$long}: $i + rpx!important;
}
}
--
Gitblit v1.9.1