xydata-tools 1.0.46 → 1.0.48

package/dist/components/uni-app/media-picker/media-picker.vue

@@ -56,11 +56,11 @@
 				<shmily-drag-media v-if="enableImage && !enableVideo && showFileList" v-model="imageUrls"
 					:number="imageLimit" :cols="cols" :imageWidth="itemWidth" :padding="10"
 					:borderRadius="itemBorderRadius" :align="align" :draggable="draggable" :enableAddButton="true"
-					moveType="image" @update:modelValue="handleImageDragChange" @add-click="selectAndUploadImage">
+					moveType="image" @update:modelValue="handleImageDragChange">
 					<template #add-button="{ childWidth }">
 						<slot name="image-upload-button" :select="selectAndUploadImage" :limit="imageLimit"
 							:count="imageFileList.length">
-							<view class="drag-upload-btn">
+							<view class="drag-upload-btn" @click="selectAndUploadImage">
 								<image :src="imageUploadIcon" class="upload-icon"
 									:style="getUploadIconStyle(childWidth)"></image>
 								<view class="upload-text" :style="getUploadTextStyle(childWidth)">{{ imageButtonTitle }}
@@ -74,12 +74,11 @@
 				<shmily-drag-media v-else-if="enableVideo && !enableImage && showFileList" v-model="videoUrls"
 					:number="videoLimit" :cols="cols" :imageWidth="itemWidth" :padding="10"
 					:borderRadius="itemBorderRadius" :align="align" :draggable="draggable" :enableAddButton="true"
-					moveType="video" @update:modelValue="handleVideoDragChange" @add-click="selectAndUploadVideo"
-					@videoClick="handleVideoItemClick">
+					moveType="video" @update:modelValue="handleVideoDragChange" @videoClick="handleVideoItemClick">
 					<template #add-button="{ childWidth }">
 						<slot name="video-upload-button" :select="selectAndUploadVideo" :limit="videoLimit"
 							:count="videoFileList.length">
-							<view class="drag-upload-btn">
+							<view class="drag-upload-btn" @click="selectAndUploadVideo">
 								<image :src="videoUploadIcon" class="upload-icon"
 									:style="getUploadIconStyle(childWidth)"></image>
 								<view class="upload-text" :style="getUploadTextStyle(childWidth)">{{ videoButtonTitle }}
@@ -196,7 +195,7 @@ export default {
 		// ==================== 通用配置 ====================
 		/** 上传类型: 'image' - 仅图片, 'video' - 仅视频, 'both' - 图片+视频（必填） */
 		uploadType: {
-			type: String, 
+			type: String,
 			default: 'image',
 			validator: (value) => ['image', 'video', 'both'].includes(value)
 		},
@@ -515,7 +514,7 @@ export default {
 				return this.uploadIconSize
 			}
 			const widthRpx = this.pxToRpx(parsedPx)
-			const size = Math.floor(widthRpx * 0.3) 
+			const size = Math.floor(widthRpx * 0.3)
 			return Math.max(20, size)
 		},
 		computeUploadTextSize(childWidth) {
@@ -524,13 +523,13 @@ export default {
 			return Math.max(20, size)
 		},
 		getUploadIconStyle(childWidth) {
-			const size = this.computeUploadIconSize(childWidth) 
+			const size = this.computeUploadIconSize(childWidth)
 			return {
 				width: size + 'rpx',
 				height: size + 'rpx'
 			}
 		},
-		getUploadTextStyle(childWidth) { 
+		getUploadTextStyle(childWidth) {
 			return {
 				fontSize: this.computeUploadTextSize(childWidth) + 'rpx'
 			}

package/dist/components/uni-app/media-picker/shmily-drag-media.vue

@@ -6,7 +6,7 @@
                 <movable-view v-for="(item, index) in imageList" :key="item.id" class="view" direction="all" :y="item.y"
                     :x="item.x" :damping="40" :disabled="!draggable" @change="onChange($event, item)"
                     @touchstart="touchstart(item)" @mousedown="touchstart(item)" @touchend="touchend($event, item)"
-                    @mouseup="touchend($event, item)" :style="{
+                    @click="handleClick(item)" @mouseup="touchend($event, item)" :style="{
                         width: viewWidth + 'px',
                         height: viewWidth + 'px',
                         'z-index': item.zIndex,
@@ -38,8 +38,7 @@
                 </movable-view>
                 <!-- 添加按钮或自定义插槽 -->
                 <view class="add" v-if="imageList.length < number && showAddButton"
-                    :style="{ top: add.y, left: add.x, width: viewWidth + 'px', height: viewWidth + 'px' }"
-                    @click="addImages">
+                    :style="{ top: add.y, left: add.x, width: viewWidth + 'px', height: viewWidth + 'px' }">
                     <view class="add-wrap"
                         :style="{ width: childWidth, height: childWidth, borderRadius: borderRadius + 'rpx' }">
                         <slot name="add-button" :childWidth="childWidth" :borderRadius="borderRadius"></slot>
@@ -418,6 +417,16 @@ export default {
                 this.timer = null
             }, 200)
         },
+        handleClick(item) {
+            // 设为disable后无法触发touch事件
+            if (!this.draggable) {
+                if (this.moveType === 'video') {
+                    this.playVideo(item)
+                } else {
+                    this.previewImage(item)
+                }
+            }
+        },
         touchend(event, item) {
             const eventType = event.type // 'touchend' 或 'mouseup' 
 
@@ -530,30 +539,6 @@ export default {
             }
             //#endif
         },
-        addImages() {
-            // 如果显示添加按钮，触发自定义事件让父组件处理
-            if (this.showAddButton) {
-                this.$emit('add-click')
-                return
-            }
-
-            if (typeof this.addImage === 'function') {
-                this.addImage.bind(this.$parent)()
-            } else {
-                let checkNumber = this.number - this.imageList.length
-                uni.chooseImage({
-                    count: checkNumber,
-                    sourceType: ['album', 'camera'],
-                    success: res => {
-                        let count = checkNumber <= res.tempFilePaths.length ? checkNumber : res.tempFilePaths.length
-                        for (let i = 0; i < count; i++) {
-                            this.addProperties(res.tempFilePaths[i])
-                        }
-                        this.sortList()
-                    }
-                })
-            }
-        },
         delImages(item, index) {
             if (typeof this.delImage === 'function') {
                 this.delImage.bind(this.$parent)(() => {

package/package.json

@@ -1,43 +1,16 @@
 {
   "name": "xydata-tools",
-  "version": "1.0.46",
+  "version": "1.0.48",
   "description": "xydata tools",
   "main": "dist/index.js",
   "module": "dist/index.js",
-  "exports": {
-    ".": {
-      "types": "./dist/types/index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./dist/uniapp": {
-      "types": "./dist/uniapp.d.ts",
-      "default": "./dist/uniapp.js"
-    },
-    "./dist/uniapp.js": {
-      "types": "./dist/uniapp.d.ts",
-      "default": "./dist/uniapp.js"
-    }
-  },
+  "types": "dist/types/index.d.ts",  
   "scripts": {
-    "dev": "yarn link && father dev",
+    "dev": "father dev",
     "build": "father build",
-    "generate-types": "tsc --project tsconfig.json",
+    "generate-types": "tsc --emitDeclarationOnly --project tsconfig.json",
     "prepublishOnly": "npm run build && npm run generate-types"
-  },
-  "types": "dist/types/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "dist/uniapp": [
-        "dist/uniapp.d.ts"
-      ],
-      "dist/uniapp.js": [
-        "dist/uniapp.d.ts"
-      ],
-      "*": [
-        "dist/types/*"
-      ]
-    }
-  },
+  }, 
   "keywords": [],
   "authors": [],
   "license": "MIT",