uview-plus 3.3.37 → 3.3.38

package/changelog.md

@@ -1,3 +1,8 @@
+## 3.3.38（2024-11-04）
+fix: 修复视频预览报错 #510
+
+add: album组件增加stop参数支持阻止事件冒泡
+
 ## 3.3.37（2024-10-21）
 fix: 修复因为修改组件名称前缀，导致h5打包后$parent方法内找不到父组件的问题
 

package/components/u-album/album.js

@@ -22,6 +22,7 @@ export default {
         rowCount: 3,
         showMore: true,
         autoWrap: false,
-        unit: 'px'
+        unit: 'px',
+        stop: true,
     }
 }

package/components/u-album/props.js

@@ -76,6 +76,11 @@ export const props = defineMixin({
         unit: {
             type: [String],
             default: () => defProps.album.unit
+        },
+        // 阻止点击冒泡
+        stop: {
+            type: Boolean,
+            default: () => defProps.album.stop
         }
     }
 })

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

@@ -197,6 +197,8 @@ export default {
                 current: url,
                 urls
             })
+            // 是否阻止事件传播
+			this.stop && this.preventEvent(e)
         },
         // 获取图片的路径
         getSrc(item) {

package/components/u-upload/u-upload.vue

@@ -12,7 +12,7 @@
 					    :src="item.thumb || item.url"
 					    :mode="imageMode"
 					    class="u-upload__wrap__preview__image"
-					    @tap="onPreviewImage(item)"
+					    @tap="onPreviewImage(item, index)"
 						:style="[{
 							width: addUnit(width),
 							height: addUnit(height)
@@ -21,7 +21,7 @@
 					<view
 					    v-else
 					    class="u-upload__wrap__preview__other"
-						@tap="onClickPreview($event, item)"
+						@tap="onClickPreview(item, index)"
 					>
 						<u-icon
 						    color="#80CBF9"
@@ -334,50 +334,67 @@
 				);
 			},
 			// 预览图片
-			onPreviewImage(item) {
-				if (!item.isImage || !this.previewFullImage) return
+			onPreviewImage(previewItem, index) {
+				if (!previewItem.isImage || !this.previewFullImage) return
+                let current = 0;
+                const urls = [];
+                let imageIndex = 0;
+                for (var i = 0; i < this.lists.length; i++) {
+                    const item = this.lists[i];
+                    if (item.isImage || (item.type && item.type === 'image')) {
+                        urls.push(item.url || item.thumb);
+                        if (i === index) {
+                            current = imageIndex;
+                        }
+                        imageIndex += 1;
+                    }
+                }
+                if (urls.length < 1) {
+                    return;
+                }
 				uni.previewImage({
-					// 先filter找出为图片的item，再返回filter结果中的图片url
-					urls: this.lists.filter((item) => this.accept === 'image' || test.image(item.url || item.thumb)).map((item) => item.url || item.thumb),
-					current: item.url || item.thumb,
+                    urls: urls,
+                    current: current,
 					fail() {
 						toast('预览图片失败')
 					},
 				});
 			},
-			onPreviewVideo(event) {
+			onPreviewVideo(index) {
 				if (!this.previewFullImage) return;
-				const {
-					index
-				} = event.currentTarget.dataset;
-				const {
-					lists
-				} = this.data;
+                let current = 0;
+                const sources = [];
+                let videoIndex = 0;
+                for (var i = 0; i < this.lists.length; i++) {
+                    const item = this.lists[i];
+                    if (item.isVideo || (item.type && item.type === 'video')) {
+                        sources.push(Object.assign(Object.assign({}, item), {
+                            type: 'video'
+                        }));
+                        if (i === index) {
+                            current = videoIndex;
+                        }
+                        videoIndex += 1;
+                    }
+                }
+                if (sources.length < 1) {
+                    return;
+                }
 				// #ifdef MP-WEIXIN
 				wx.previewMedia({
-					sources: lists
-						.filter((item) => isVideoFile(item))
-						.map((item) =>
-							Object.assign(Object.assign({}, item), {
-								type: 'video'
-							})
-						),
-					current: index,
+					sources: sources,
+					current: current,
 					fail() {
 						toast('预览视频失败')
 					},
 				});
 				// #endif
 			},
-			onClickPreview(event) {
-				const {
-					index
-				} = event.currentTarget.dataset;
-				const item = this.data.lists[index];
+			onClickPreview(item, index) {
 				if (!this.previewFullImage) return;
 				switch (item.type) {
 					case 'video':
-						this.onPreviewVideo(event);
+						this.onPreviewVideo(index);
 						break;
 					default:
 						break;

package/package.json

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