fix: 样式修复

umicro · Jan 28, 2022 · 6e695b1 · 6e695b1
1 parent f042873
commit 6e695b1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 24 deletions.
diff --git a/uni_modules/uview-ui/changelog.md b/uni_modules/uview-ui/changelog.md
@@ -1,3 +1,7 @@
+## 2.0.26（2022-01-28）
+# uView2.0重磅发布，利剑出鞘，一统江湖
+
+1.样式修复
 ## 2.0.25（2022-01-27）
 # uView2.0重磅发布，利剑出鞘，一统江湖
 

diff --git a/uni_modules/uview-ui/libs/config/config.js b/uni_modules/uview-ui/libs/config/config.js
@@ -1,5 +1,5 @@
-// 此版本发布于2022-01-27
-const version = '2.0.25'
+// 此版本发布于2022-01-28
+const version = '2.0.26'
 
 // 开发环境才提示，生产环境不会提示
 if (process.env.NODE_ENV === 'development') {

diff --git a/uni_modules/uview-ui/libs/css/common.scss b/uni_modules/uview-ui/libs/css/common.scss
@@ -9,65 +9,64 @@
 		overflow: hidden;
 		flex: 1;
 		/* #endif */
-		
+
 		/* #ifndef APP-NVUE */
 		// vue下，单行和多行显示省略号需要单独处理
-		@if $i == 1 {
-			display: inline-block !important;
+		@if $i == '1' {
 			overflow: hidden;
 			white-space: nowrap;
 			text-overflow: ellipsis;
 		} @else {
-			display: -webkit-box !important;
+			display: -webkit-box!important;
 			overflow: hidden;
 			text-overflow: ellipsis;
 			word-break: break-all;
 			-webkit-line-clamp: $i;
-			-webkit-box-orient: vertical !important;
+			-webkit-box-orient: vertical!important;
 		}
 		/* #endif */
 	}
 }
- 
- 
+
+
 // 此处加上!important并非随意乱用，而是因为目前*.nvue页面编译到H5时，
 // App.vue的样式会被uni-app的view元素的自带border属性覆盖，导致无效
 // 综上，这是uni-app的缺陷导致我们为了多端兼容，而必须要加上!important
 // 移动端兼容性较好，直接使用0.5px去实现细边框，不使用伪元素形式实现
 .u-border {
 	border-width: 0.5px!important;
-	border-color: $u-border-color!important; 
+	border-color: $u-border-color!important;
     border-style: solid;
 }
- 
+
 .u-border-top {
-	border-top-width: 0.5px!important; 
-	border-color: $u-border-color!important; 
+	border-top-width: 0.5px!important;
+	border-color: $u-border-color!important;
     border-top-style: solid;
 }
 
 .u-border-left {
-	border-left-width: 0.5px!important; 
-	border-color: $u-border-color!important; 
+	border-left-width: 0.5px!important;
+	border-color: $u-border-color!important;
     border-left-style: solid;
 }
 
 .u-border-right {
-	border-right-width: 0.5px!important; 
-	border-color: $u-border-color!important; 
+	border-right-width: 0.5px!important;
+	border-color: $u-border-color!important;
     border-right-style: solid;
 }
- 
+
 .u-border-bottom {
-	border-bottom-width: 0.5px!important; 
-	border-color: $u-border-color!important; 
+	border-bottom-width: 0.5px!important;
+	border-color: $u-border-color!important;
     border-bottom-style: solid;
 }
 
 .u-border-top-bottom {
-	border-top-width: 0.5px!important; 
-	border-bottom-width: 0.5px!important; 
-	border-color: $u-border-color!important; 
+	border-top-width: 0.5px!important;
+	border-bottom-width: 0.5px!important;
+	border-color: $u-border-color!important;
     border-top-style: solid;
     border-bottom-style: solid;
 }

diff --git a/uni_modules/uview-ui/package.json b/uni_modules/uview-ui/package.json
@@ -2,7 +2,7 @@
 	"id": "uview-ui",
 	"name": "uview-ui",
 	"displayName": "uView2.0重磅发布，利剑出鞘，一统江湖",
-	"version": "2.0.25",
+	"version": "2.0.26",
 	"description": "uView UI已完美兼容nvue，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
 	"keywords": [
         "uview",