xydata-tools 1.1.21 → 1.1.22

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

@@ -57,13 +57,13 @@
 					:number="imageLimit" :cols="cols" :imageWidth="itemWidth" :padding="10"
 					:borderRadius="itemBorderRadius" :align="align" :draggable="draggable" :enableAddButton="true"
 					moveType="image" @input="handleImageDragChange">
-					<template #add-button="{ childWidth }">
+					<template #add-button>
 						<slot name="image-upload-button" :select="selectAndUploadImage" :limit="imageLimit"
 							:count="imageFileList.length">
 							<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 }}
+									:style="dragIconStyle"></image>
+								<view class="upload-text" :style="dragTextStyle">{{ imageButtonTitle }}
 								</view>
 							</view>
 						</slot>
@@ -75,13 +75,13 @@
 					:number="videoLimit" :cols="cols" :imageWidth="itemWidth" :padding="10"
 					:borderRadius="itemBorderRadius" :align="align" :draggable="draggable" :enableAddButton="true"
 					moveType="video" @input="handleVideoDragChange" @videoClick="handleVideoItemClick">
-					<template #add-button="{ childWidth }">
+					<template #add-button>
 						<slot name="video-upload-button" :select="selectAndUploadVideo" :limit="videoLimit"
 							:count="videoFileList.length">
 							<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 }}
+									:style="dragIconStyle"></image>
+								<view class="upload-text" :style="dragTextStyle">{{ videoButtonTitle }}
 								</view>
 							</view>
 						</slot>
@@ -451,6 +451,18 @@ export default {
 		uploadTextSize() {
 			return Math.max(20, Math.floor(this.uploadIconSize * 0.38))
 		},
+		// 拖拽模式下的图标和文字样式（预计算好，避免模板中使用方法调用报错）
+		dragIconStyle() {
+			return {
+				width: this.uploadIconSize + 'rpx',
+				height: this.uploadIconSize + 'rpx'
+			}
+		},
+		dragTextStyle() {
+			return {
+				fontSize: this.uploadTextSize + 'rpx'
+			}
+		},
 
 		// ==================== 只读模式网格样式 ====================
 		readonlyGridStyle() {
@@ -515,48 +527,6 @@ export default {
 		hasEventListener(eventName) {
 			return !!(this.$listeners && this.$listeners[eventName])
 		},
-		parseChildWidth(childWidth) {
-			if (typeof childWidth === 'number') {
-				return childWidth
-			}
-			if (typeof childWidth === 'string') {
-				const parsed = parseFloat(childWidth)
-				return Number.isFinite(parsed) ? parsed : null
-			}
-			return null
-		},
-		pxToRpx(px) {
-			if (!px || !this.windowWidth) {
-				return 0
-			}
-			return px / this.windowWidth * 750
-		},
-		computeUploadIconSize(childWidth) {
-			const parsedPx = this.parseChildWidth(childWidth)
-			if (!parsedPx) {
-				return this.uploadIconSize
-			}
-			const widthRpx = this.pxToRpx(parsedPx)
-			const size = Math.floor(widthRpx * 0.3)
-			return Math.max(20, size)
-		},
-		computeUploadTextSize(childWidth) {
-			const iconSize = this.computeUploadIconSize(childWidth)
-			const size = Math.floor(iconSize * 0.4)
-			return Math.max(20, size)
-		},
-		getUploadIconStyle(childWidth) {
-			const size = this.computeUploadIconSize(childWidth)
-			return {
-				width: size + 'rpx',
-				height: size + 'rpx'
-			}
-		},
-		getUploadTextStyle(childWidth) {
-			return {
-				fontSize: this.computeUploadTextSize(childWidth) + 'rpx'
-			}
-		},
 
 		// ==================== 图片相关方法 ====================
 		/**

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

@@ -43,7 +43,7 @@
                     :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>
+                        <slot name="add-button"></slot>
                     </view>
                 </view>
             </movable-area>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.21",
+	"version": "1.1.22",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",