uview-plus 3.3.48 → 3.3.49

package/components/u-album/u-album.vue

@@ -119,7 +119,6 @@ export default {
         imageStyle() {
             return (index1, index2) => {
                 const { space, rowCount, multipleSize, urls } = this,
-                    { addUnit, addStyle } = uni.$u,
                     rowLen = this.showUrls.length,
                     allLen = this.urls.length
                 const style = {

package/components/u-image/u-image.vue

@@ -20,6 +20,8 @@
 				:lazy-load="lazyLoad"
 				class="u-image__image"
 				:style="{
+					width: addUnit(width),
+					height: addUnit(height),
 					borderRadius: shape == 'circle' ? '10000px' : addUnit(radius)
 				}"
 			></image>
@@ -125,17 +127,43 @@
 			transStyle() {
 				let style = {};
 				// 通过调用addUnit()方法，如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上rpx单位
+				// #ifdef APP-NVUE
 				style.width = addUnit(this.width);
 				style.height = addUnit(this.height);
+				// #endif
+				// #ifndef APP-NVUE
+				if (this.width == '100%') {
+					style.width = this.width;
+				} else {
+					style.width = 'fit-content';
+				}
+				if (this.height == '100%') {
+					style.height = this.height;
+				} else {
+					style.height = 'fit-content';
+				}
+				// #endif
 				return style;
 			},
 			wrapStyle() {
 				let style = {};
 				// 通过调用addUnit()方法，如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上rpx单位
-				// style.width = addUnit(this.width);
-				// style.height = addUnit(this.height);
-				style.width = '100%';
-				style.height = '100%';
+				// #ifdef APP-NVUE
+				style.width = addUnit(this.width);
+				style.height = addUnit(this.height);
+				// #endif
+				// #ifndef APP-NVUE
+				if (this.width == '100%') {
+					style.width = this.width;
+				} else {
+					style.width = 'fit-content';
+				}
+				if (this.height == '100%') {
+					style.height = this.height;
+				} else {
+					style.height = 'fit-content';
+				}
+				// #endif
 				// 如果是显示圆形，设置一个很多的半径值即可
 				style.borderRadius = this.shape == 'circle' ? '10000px' : addUnit(this.radius)
 				// 如果设置圆角，必须要有hidden，否则可能圆角无效

package/components/u-picker/picker.js

@@ -25,6 +25,7 @@ export default {
         keyName: 'text',
         closeOnClickOverlay: false,
         defaultIndex: [],
-		immediateChange: true
+		immediateChange: true,
+		zIndex: 10076,
     }
 }

package/components/u-picker/props.js

@@ -99,5 +99,10 @@ export const props = defineMixin({
 			type: Boolean,
 			default: false
 		},
+		// 层级
+		zIndex: {
+		    type: [String, Number],
+		    default: () => defProps.picker.zIndex
+		},
     }
 })

package/components/u-picker/u-picker.vue

@@ -10,6 +10,7 @@
 		<u-popup
 			:show="show || (hasInput && showByClickInput)"
 			:mode="popupMode"
+			:zIndex="zIndex"
 			@close="closeHandler"
 		>
 			<view class="u-picker">

package/components/u-text/props.js

@@ -107,6 +107,11 @@ export const props = defineMixin({
         wordWrap: {
             type: String,
             default: () => defProps.text.wordWrap
-        }
+        },
+		// 占满剩余空间
+		flex1: {
+			type: Boolean,
+			default: () => defProps.text.flex1
+		}
     }
 })

package/components/u-text/text.js

@@ -32,7 +32,8 @@ export default {
         margin: 0,
         lineHeight: '',
         align: 'left',
-        wordWrap: 'normal'
+        wordWrap: 'normal',
+		flex1: true
     }
 
 }

package/components/u-text/u-text.vue

@@ -3,10 +3,7 @@
         class="u-text"
         :class="[customClass]"
         v-if="show"
-        :style="{
-            margin: margin,
-			justifyContent: align === 'left' ? 'flex-start' : align === 'center' ? 'center' : 'flex-end'
-        }"
+        :style="wrapStyle"
         @tap="clickHandler"
     >
         <text
@@ -116,6 +113,20 @@ export default {
     // #endif
 	emits: ['click'],
     computed: {
+        wrapStyle() {
+            let style = {
+                margin: this.margin,
+			    justifyContent: this.align === 'left' ? 'flex-start' : this.align === 'center' ? 'center' : 'flex-end'
+            }
+            // 占满剩余空间
+            if (this.flex1) {
+                style.flex = 1;
+				// #ifndef APP-NVUE
+				style.width = '100%';
+				// #endif
+            }
+			return style;
+        },
         valueStyle() {
             const style = {
                 textDecoration: this.decoration,
@@ -170,10 +181,6 @@ export default {
     @include flex(row);
     align-items: center;
     flex-wrap: nowrap;
-    flex: 1;
-	/* #ifndef APP-NVUE */
-	width: 100%;
-	/* #endif */
 
     &__price {
         font-size: 14px;

package/package.json

@@ -2,7 +2,7 @@
 	"id": "uview-plus",
 	"name": "uview-plus",
 	"displayName": "uview-plus3.0重磅发布，全面的Vue3鸿蒙移动组件库。",
-	"version": "3.3.48",
+	"version": "3.3.49",
 	"description": "零云®uview-plus已兼容vue3，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
 	"keywords": [
         "uview",