uview-plus 3.1.52 → 3.2.5

package/components/u-subsection/u-subsection.vue

@@ -11,14 +11,14 @@
             :style="[barStyle]"
             :class="[
                 mode === 'button' && 'u-subsection--button__bar',
-                current === 0 &&
+                innerCurrent === 0 &&
                     mode === 'subsection' &&
                     'u-subsection__bar--first',
-                current > 0 &&
-                    current < list.length - 1 &&
+                innerCurrent > 0 &&
+                innerCurrent < list.length - 1 &&
                     mode === 'subsection' &&
                     'u-subsection__bar--center',
-                current === list.length - 1 &&
+                innerCurrent === list.length - 1 &&
                     mode === 'subsection' &&
                     'u-subsection__bar--last',
             ]"
@@ -83,6 +83,8 @@ export default {
                 width: 0,
                 height: 0,
             },
+            innerCurrent: '',
+            windowResizeCallback: {}
         };
     },
     watch: {
@@ -92,6 +94,9 @@ export default {
         current: {
             immediate: true,
             handler(n) {
+                if (n !== this.innerCurrent) {
+                    this.innerCurrent = n
+                }
                 // #ifdef APP-NVUE
                 // 在安卓nvue上，如果通过translateX进行位移，到最后一个时，会导致右侧无法绘制圆角
                 // 故用animation模块进行位移
@@ -129,7 +134,7 @@ export default {
             // 通过translateX移动滑块，其移动的距离为索引*item的宽度
             // #ifndef APP-NVUE
             style.transform = `translateX(${
-                this.current * this.itemRect.width
+                this.innerCurrent * this.itemRect.width
             }px)`;
             // #endif
             if (this.mode === "subsection") {
@@ -156,16 +161,16 @@ export default {
             return (index) => {
                 const style = {};
                 style.fontWeight =
-                    this.bold && this.current === index ? "bold" : "normal";
+                    this.bold && this.innerCurrent === index ? "bold" : "normal";
                 style.fontSize = uni.$u.addUnit(this.fontSize);
                 // subsection模式下，激活时默认为白色的文字
                 if (this.mode === "subsection") {
                     style.color =
-                        this.current === index ? "#fff" : this.inactiveColor;
+                        this.innerCurrent === index ? "#fff" : this.inactiveColor;
                 } else {
                     // button模式下，激活时文字颜色默认为activeColor
                     style.color =
-                        this.current === index
+                        this.innerCurrent === index
                             ? this.activeColor
                             : this.inactiveColor;
                 }
@@ -175,10 +180,18 @@ export default {
     },
     mounted() {
         this.init();
+        this.windowResizeCallback = (res) => {
+            this.init();
+        }
+        uni.onWindowResize(this.windowResizeCallback)
+    },
+    beforeUnmount() {
+        uni.offWindowResize(this.windowResizeCallback)
     },
 	emits: ["change"],
     methods: {
         init() {
+            this.innerCurrent = this.current
             uni.$u.sleep().then(() => this.getRect());
         },
 		// 判断展示文本
@@ -202,6 +215,7 @@ export default {
             // #endif
         },
         clickHandler(index) {
+            this.innerCurrent = index
             this.$emit("change", index);
         },
     },
@@ -221,20 +235,20 @@ export default {
 	/* #endif */
 
     &--button {
-        height: 32px;
+        height: 34px;
         background-color: rgb(238, 238, 239);
         padding: 3px;
-        border-radius: 3px;
+        border-radius: 4px;
         align-items: stretch;
 
         &__bar {
             background-color: #ffffff;
-            border-radius: 3px !important;
+            border-radius: 4px !important;
         }
     }
 
     &--subsection {
-        height: 30px;
+        height: 32px;
     }
 
     &__bar {
@@ -246,8 +260,8 @@ export default {
         /* #endif */
 
         &--first {
-            border-top-left-radius: 3px;
-            border-bottom-left-radius: 3px;
+            border-top-left-radius: 4px;
+            border-bottom-left-radius: 4px;
             border-top-right-radius: 0px;
             border-bottom-right-radius: 0px;
         }
@@ -262,8 +276,8 @@ export default {
         &--last {
             border-top-left-radius: 0px;
             border-bottom-left-radius: 0px;
-            border-top-right-radius: 3px;
-            border-bottom-right-radius: 3px;
+            border-top-right-radius: 4px;
+            border-bottom-right-radius: 4px;
         }
     }
 
@@ -280,18 +294,18 @@ export default {
         }
 
         &--first {
-            border-top-left-radius: 3px;
-            border-bottom-left-radius: 3px;
+            border-top-left-radius: 4px;
+            border-bottom-left-radius: 4px;
         }
 
         &--last {
-            border-top-right-radius: 3px;
-            border-bottom-right-radius: 3px;
+            border-top-right-radius: 4px;
+            border-bottom-right-radius: 4px;
         }
 
         &__text {
             font-size: 12px;
-            line-height: 12px;
+            line-height: 14px;
             @include flex;
             align-items: center;
             transition-property: color;

package/components/u-swiper/u-swiper.vue

@@ -2,7 +2,7 @@
 	<view
 		class="u-swiper"
 		:style="{
-			backgroundColor: bgColor,
+			backgroundColor: bgColor,
 			height: $u.addUnit(height),
 			borderRadius: $u.addUnit(radius)
 		}"
@@ -13,11 +13,10 @@
 		>
 			<u-loading-icon mode="circle"></u-loading-icon>
 		</view>
-		<swiper
-			v-else
+		<swiper
 			class="u-swiper__wrapper"
-			:style="{
-				height: $u.addUnit(height),
+			:style="{
+				height: $u.addUnit(height)
 			}"
 			@change="change"
 			:circular="circular"
@@ -206,7 +205,7 @@
 
 <style lang="scss" scoped>
 	@import "../../libs/css/components.scss";
-
+	
 	.u-swiper {
 		@include flex;
 		justify-content: center;
@@ -214,8 +213,7 @@
 		position: relative;
 		overflow: hidden;
 
-		&__wrapper {
-			flex: 1;
+		&__wrapper {
 
 			&__item {
 				flex: 1;

package/components/u-switch/u-switch.vue

@@ -1,6 +1,6 @@
 <template>
 	<view
-	    class="u-switch"
+	    class="u-switch cursor-pointer"
 	    :class="[disabled && 'u-switch--disabled']"
 	    :style="[switchStyle, $u.addStyle(customStyle)]"
 	    @tap="clickHandler"

package/components/u-tabbar-item/u-tabbar-item.vue

@@ -1,6 +1,6 @@
 <template>
 	<view
-	    class="u-tabbar-item"
+	    class="u-tabbar-item cursor-pointer"
 	    :style="[$u.addStyle(customStyle)]"
 	    @tap="clickHandler"
 	>

package/components/u-tabs/u-tabs.vue

@@ -335,6 +335,7 @@
 					&__text {
 						font-size: 15px;
 						color: $u-content-color;
+                        white-space: nowrap;
 
 						&--disabled {
 							color: $u-disabled-color !important;

package/components/u-tag/props.js

@@ -78,7 +78,10 @@ export default {
         // 内置图标，或绝对路径的图片
         icon: {
             type: String,
-            default: () => uni.$u.props.tag.icon
-        }
+            default: () => uni.$u.props.tag.icon,
+		},
+            type: String,
+            default: () => uni.$u.props.tag.iconColor
+        }
     }
 }

package/components/u-tag/u-tag.vue

@@ -4,7 +4,7 @@
 		:show="show"
 		style="display: inline-flex;"
 	>
-		<view class="u-tag-wrapper">
+		<view class="u-tag-wrapper cursor-pointer">
 			<view
 				class="u-tag"
 				:class="[`u-tag--${shape}`, !plain && `u-tag--${type}`, plain && `u-tag--${type}--plain`, `u-tag--${size}`, plain && plainFill && `u-tag--${type}--plain--fill`]"