uview-plus 3.4.24 → 3.4.26

package/changelog.md

@@ -1,3 +1,21 @@
+## 3.4.26（2025-05-06）
+fix: 修复test工具引入
+
+feat: card组件支持全局设置props默认值
+
+fix: 修复image在加载错误情况下高度和宽度不正确问题
+
+fix: 修复picker-data快捷组件默认picker选中
+
+fix: 修复日历month子组件缺失emits定义
+
+## 3.4.25（2025-04-27）
+fix: up-form编译在微信小程序里样式缺失 #640
+
+fix: number-box输入为空时自动设为最小值
+
+feat: picker与datetimepicke组件hasInput模式支持inputProps属性
+
 ## 3.4.24（2025-04-25）
 fix: 修复upload上传逻辑(感谢@semdy)
 

package/components/u-calendar/month.vue

@@ -292,6 +292,7 @@
 		mounted() {
 			this.init()
 		},
+		emits: ['monthSelected', 'updateMonthTop'],
 		methods: {
 			init() {
 				// 初始化默认选中

package/components/u-card/card.js

@@ -0,0 +1,40 @@
+/*
+ * @Author       : jry
+ * @Description  :
+ * @version      : 3.0
+ * @Date         : 2025-04-26 16:37:21
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-04-26 16:37:21
+ * @FilePath     : /uview-plus/libs/config/props/card.js
+ */
+export default {
+	// cell组件的props
+	cell: {
+		full: false,
+		title: '',
+		titleColor: '#303133',
+		titleSize: '15px',
+		subTitle: '',
+		subTitleColor: '#909399',
+		subTitleSize: '13px',
+		border: true,
+		index: '',
+		margin: '15px',
+		borderRadius: '8px',
+		headStyle: {},
+		bodyStyle: {},
+		footStyle: {},
+		headBorderBottom: true,
+		footBorderTop: true,
+		thumb: '',
+		thumbWidth: '30px',
+		thumbCircle: false,
+		padding: '15px',
+		paddingHead: '',
+        paddingBody: '',
+        paddingFoot: '',
+        showHead: true,
+        showFoot: true,
+        boxShadow: 'none'
+	}
+}

package/components/u-card/props.js

@@ -6,135 +6,129 @@ export const propsCard = defineMixin({
         // 与屏幕两侧是否留空隙
 		full: {
 			type: Boolean,
-			default: false
+			default: () => defProps.card.full
 		},
 		// 标题
 		title: {
 			type: String,
-			default: ''
+			default: () => defProps.card.title
 		},
 		// 标题颜色
 		titleColor: {
 			type: String,
-			default: '#303133'
+			default: () => defProps.card.titleColor
 		},
 		// 标题字体大小
 		titleSize: {
 			type: [Number, String],
-			default: '15px'
+			default: () => defProps.card.titleSize
 		},
 		// 副标题
 		subTitle: {
 			type: String,
-			default: ''
+			default: () => defProps.card.subTitle
 		},
 		// 副标题颜色
 		subTitleColor: {
 			type: String,
-			default: '#909399'
+			default: () => defProps.card.subTitleColor
 		},
 		// 副标题字体大小
 		subTitleSize: {
 			type: [Number, String],
-			default: '13'
+			default: () => defProps.card.subTitleSize
 		},
 		// 是否显示外部边框，只对full=false时有效(卡片与边框有空隙时)
 		border: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.border
 		},
 		// 用于标识点击了第几个
 		index: {
 			type: [Number, String, Object],
-			default: ''
+			default: () => defProps.card.index
 		},
 		// 用于隔开上下左右的边距，带单位的写法，如："30px 30px"，"20px 20px 30px 30px"
 		margin: {
 			type: String,
-			default: '15px'
+			default: () => defProps.card.margin
 		},
 		// card卡片的圆角
 		borderRadius: {
 			type: [Number, String],
-			default: '8px'
+			default: () => defProps.card.borderRadius
 		},
 		// 头部自定义样式，对象形式
 		headStyle: {
 			type: Object,
-			default() {
-				return {};
-			}
+			default: () => defProps.card.headStyle
 		},
 		// 主体自定义样式，对象形式
 		bodyStyle: {
 			type: Object,
-			default() {
-				return {};
-			}
+			default: () => defProps.card.bodyStyle
 		},
 		// 底部自定义样式，对象形式
 		footStyle: {
 			type: Object,
-			default() {
-				return {};
-			}
+			default: () => defProps.card.footStyle
 		},
 		// 头部是否下边框
 		headBorderBottom: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.headBorderBottom
 		},
 		// 底部是否有上边框
 		footBorderTop: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.footBorderTop
 		},
 		// 标题左边的缩略图
 		thumb: {
 			type: String,
-			default: ''
+			default: () => defProps.card.thumb
 		},
 		// 缩略图宽高
 		thumbWidth: {
 			type: [String, Number],
-			default: '30px'
+			default: () => defProps.card.thumbWidth
 		},
 		// 缩略图是否为圆形
 		thumbCircle: {
 			type: Boolean,
-			default: false
+			default: () => defProps.card.thumbCircle
 		},
 		// 给head，body，foot的内边距
 		padding: {
 			type: [String, Number],
-			default: '15px'
+			default: () => defProps.card.padding
 		},
 		paddingHead: {
 			type: [String, Number],
-			default: ''
+			default: () => defProps.card.paddingHead
 		},
 		paddingBody: {
 			type: [String, Number],
-			default: ''
+			default: () => defProps.card.paddingBody
 		},
 		paddingFoot: {
 			type: [String, Number],
-			default: ''
+			default: () => defProps.card.paddingFoot
 		},
 		// 是否显示头部
 		showHead: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.showHead
 		},
 		// 是否显示尾部
 		showFoot: {
 			type: Boolean,
-			default: true
+			default: () => defProps.card.showFoot
 		},
 		// 卡片外围阴影，字符串形式
 		boxShadow: {
 			type: String,
-			default: 'none'
+			default: () => defProps.card.boxShadow
 		}
     }
 })

package/components/u-datetime-picker/datetimePicker.js

@@ -32,6 +32,11 @@ export default {
         confirmColor: '#3c9cff',
         visibleItemCount: 5,
         closeOnClickOverlay: false,
-        defaultIndex: []
+        defaultIndex: [],
+        inputBorder: 'surround',
+        disabled: false,
+        disabledColor: '',
+        placeholder: '请选择',
+        inputProps: {},
     }
 }

package/components/u-datetime-picker/props.js

@@ -7,13 +7,19 @@ export const props = defineMixin({
             type: Boolean,
             default: false
         },
+        inputProps: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        },
         inputBorder: {
             type: String,
-            default: 'surround'
+            default: () => defProps.input.inputBorder
         },
 		disabled: {
             type: Boolean,
-            default: () => false
+            default: () => defProps.input.disabled
         },
 		disabledColor:{
 			type: String,
@@ -21,7 +27,7 @@ export const props = defineMixin({
 		},
         placeholder: {
             type: String,
-            default: () => '请选择'
+            default: () => defProps.input.placeholder
         },
         format: {
             type: String,

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

@@ -5,12 +5,9 @@
         >
             <slot name="trigger" :value="inputValue">
 				<up-input
-					:placeholder="placeholder"
 					:readonly="!!showByClickInput"
-					:border="inputBorder"
 					v-model="inputValue"
-					:disabled="disabled"
-					:disabledColor="disabledColor"
+					v-bind="inputPropsInner"
 				></up-input>
 				<div class="input-cover">
 				</div>
@@ -135,6 +132,16 @@
 			// 如果以下这些变量发生了变化，意味着需要重新初始化各列的值
 			propsChange() {
 				return [this.mode, this.maxDate, this.minDate, this.minHour, this.maxHour, this.minMinute, this.maxMinute, this.filter, ]
+			},
+			// input的props
+			inputPropsInner() {
+				return {
+					border: this.inputBorder,
+            		placeholder: this.placeholder,
+					disabled: this.disabled,
+					disabledColor: this.disabledColor,
+					...this.inputProps
+				}
 			}
 		},
 		mounted() {

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

@@ -240,10 +240,8 @@
 
 					&__slot {
 						flex: 1;
-						/* #ifndef MP */
 						@include flex;
 						align-items: center;
-						/* #endif */
 					}
 
 					&__icon {

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

@@ -132,12 +132,12 @@
 				// #endif
 				// #ifndef APP-NVUE
 				if (this.loading || this.isError || this.width == '100%' || this.mode != 'heightFix') {
-					style.width = this.width;
+					style.width = addUnit(this.width);
 				} else {
 					style.width = 'fit-content';
 				}
 				if (this.loading || this.isError || this.height == '100%' || this.mode != 'widthFix') {
-					style.height = this.height;
+					style.height = addUnit(this.height);
 				} else {
 					style.height = 'fit-content';
 				}
@@ -153,12 +153,12 @@
 				// #endif
 				// #ifndef APP-NVUE
 				if (this.loading || this.isError || this.width == '100%' || this.mode != 'heightFix') {
-					style.width = this.width;
+					style.width = addUnit(this.width);
 				} else {
 					style.width = 'fit-content';
 				}
 				if (this.loading || this.isError || this.height == '100%' || this.mode != 'widthFix') {
-					style.height = this.height;
+					style.height = addUnit(this.height);
 				} else {
 					style.height = 'fit-content';
 				}

package/components/u-number-box/u-number-box.vue

@@ -311,13 +311,17 @@
 					value = ''
 				} = e.detail || {}
 				// 为空返回
-				if (value === '') return
+				if (value === '') {
+					// 为空自动设为最小值
+					this.emitChange(this.min)
+					return
+				}
 				let formatted = this.filter(value)
 				// https://github.com/ijry/uview-plus/issues/613
 				this.emitChange(value);
 				// 最大允许的小数长度
 				if (this.decimalLength !== null && formatted.indexOf('.') !== -1) {
-					const pair = formatted.split('.');
+					const pair = formatted.split('.')
 					formatted = `${pair[0]}.${pair[1].slice(0, this.decimalLength)}`
 				}
 				formatted = this.format(formatted)

package/components/u-picker/picker.js

@@ -20,12 +20,16 @@ export default {
         cancelText: '取消',
         confirmText: '确定',
         cancelColor: '#909193',
-        confirmColor: '#3c9cff',
+        confirmColor: '',
         visibleItemCount: 5,
         keyName: 'text',
         closeOnClickOverlay: false,
         defaultIndex: [],
 		immediateChange: true,
 		zIndex: 10076,
+        disabled: false,
+        disabledColor: '',
+        placeholder: '请选择',
+        inputProps: {},
     }
 }

package/components/u-picker/props.js

@@ -6,22 +6,27 @@ export const props = defineMixin({
             type: Array,
             default: () => []
         },
-		//是否禁用
-		disabled: {
+        hasInput: {
             type: Boolean,
             default: false
+        },
+        inputProps: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        },
+        disabled: {
+            type: Boolean,
+            default: () => defProps.picker.disabled
         },
 		disabledColor:{
 			type: String,
-			default: () => defProps.input.disabledColor
+			default: () => defProps.picker.disabledColor
 		},
-        hasInput: {
-            type: Boolean,
-            default: false
-        },
         placeholder: {
             type: String,
-            default: () => '请选择'
+            default: () => defProps.picker.placeholder
         },
         // 是否展示picker弹窗
         show: {

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

@@ -1,10 +1,17 @@
 <template>
     <view class="u-picker-warrper">
-		<view v-if="hasInput" class="u-picker-input cursor-pointer" @click="onShowByClickInput">
-			<slot>
-				<up-input :disabled="disabled" :disabledColor="disabledColor" :placeholder="placeholder" :readonly="true" border="surround" v-model="inputLabel"></up-input>
-				<div class="input-cover"></div>
-			</slot>
+		<view v-if="hasInput" class="u-picker-input cursor-pointer" @click="onShowByClickInput">
+			<slot :value="inputLabel">
+			</slot>
+			<slot name="trigger" :value="inputLabel">
+			</slot>
+			<up-input
+				v-if="!$slots['default'] && !$slots['$default'] && !$slots['trigger']"
+				:readonly="true"
+				v-model="inputLabel"
+				v-bind="inputPropsInner">
+			</up-input>
+			<div class="input-cover"></div>
 		</view>
 		<u-popup
 			:show="show || (hasInput && showByClickInput)"
@@ -122,11 +129,11 @@ export default {
 			immediate: true,
 			deep:true,
 			handler(n,o) {
-				// 修复uniapp调用子组件直接:defaultIndex="[0]"这样写
-				// v-model的值变化时候导致defaultIndexwatch也会执行的问题
-				//单纯vue不会出现
-				if (!o || n.join("/") != o.join("/")) {
-					this.setIndexs(n, true)
+				// 修复uniapp调用子组件直接:defaultIndex="[0]"这样写
+				// v-model的值变化时候导致defaultIndexwatch也会执行的问题
+				//单纯vue不会出现
+				if (!o || n.join("/") != o.join("/")) {
+					this.setIndexs(n, true)
 				}
 			}
 		},
@@ -141,37 +148,47 @@ export default {
 	},
 	emits: ['close', 'cancel', 'confirm', 'change', 'update:modelValue', 'update:show'],
     computed: {
-		//已选&&已确认的值显示在input上面的文案
-		inputLabel() {
-			let firstItem = this.innerColumns[0] && this.innerColumns[0][0];
-			// //区分是不是对象数组
-			if (firstItem && Object.prototype.toString.call(firstItem) === '[object Object]') {
-				let res = this.innerColumns[0].filter(item => this.modelValue.includes(item['id']))
-				res = res.map(item => item[this.keyName]);
-				return res.join("/");
-
-			} else {
-				//用户确定的值，才显示到输入框
-				return this.modelValue.join("/");
-			}
-		},
-		//已选，待确认的值
-		inputValue() {
-			let items = this.innerColumns.map((item, index) => item[this.innerIndex[index]])
-			let res = []
-			//区分是不是对象数组
-			if (items[0] && Object.prototype.toString.call(items[0]) === '[object Object]') {
-				//对象数组返回id集合
-				items.forEach(element => {
-					res.push(element && element['id'])
-				});
-			} else {
-				//非对象数组返回元素集合
-				items.forEach((element, index) => {
-					res.push(element)
-				});
-			}
-			return res
+		// input的props
+		inputPropsInner() {
+			return {
+				border: this.inputBorder,
+				placeholder: this.placeholder,
+				disabled: this.disabled,
+				disabledColor: this.disabledColor,
+				...this.inputProps
+			}
+		},
+		//已选&&已确认的值显示在input上面的文案
+		inputLabel() {
+			let firstItem = this.innerColumns[0] && this.innerColumns[0][0];
+			// //区分是不是对象数组
+			if (firstItem && Object.prototype.toString.call(firstItem) === '[object Object]') {
+				let res = this.innerColumns[0].filter(item => this.modelValue.includes(item['id']))
+				res = res.map(item => item[this.keyName]);
+				return res.join("/");
+
+			} else {
+				//用户确定的值，才显示到输入框
+				return this.modelValue.join("/");
+			}
+		},
+		//已选，待确认的值
+		inputValue() {
+			let items = this.innerColumns.map((item, index) => item[this.innerIndex[index]])
+			let res = []
+			//区分是不是对象数组
+			if (items[0] && Object.prototype.toString.call(items[0]) === '[object Object]') {
+				//对象数组返回id集合
+				items.forEach(element => {
+					res.push(element && element['id'])
+				});
+			} else {
+				//非对象数组返回元素集合
+				items.forEach((element, index) => {
+					res.push(element)
+				});
+			}
+			return res
 		}
     },
 	methods: {
@@ -346,17 +363,17 @@ export default {
 
 	.u-picker {
 		position: relative;
-		&-input {
-			position: relative;
-			.input-cover {
-				opacity: 0;
-				position: absolute;
-				top: 0;
-				bottom: 0;
-				left: 0;
+		&-input {
+			position: relative;
+			.input-cover {
+				opacity: 0;
+				position: absolute;
+				top: 0;
+				bottom: 0;
+				left: 0;
 				right: 0;
-				z-index:1;
-			}
+				z-index:1;
+			}
 		}
 		&__view {
 

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

@@ -17,6 +17,7 @@
 			:show="show"
 			:columns="optionsInner"
 			:keyName="labelKey"
+			:defaultIndex="defaultIndex"
 			@confirm="select"
 			@cancel="cancel">
 		</up-picker>
@@ -57,13 +58,15 @@ export default {
         return {
 			show: false,
 			current: '',
+			defaultIndex: [],
         }
     },
     created() {
 		if (this.modelValue) {
-			this.options.forEach((ele) => {
+			this.options.forEach((ele, index) => {
 				if (ele[this.valueKey] == this.modelValue) {
 					this.current = ele[this.labelKey]
+					this.defaultIndex = [index]
 				}
 			})
 		}
@@ -74,6 +77,7 @@ export default {
 				this.options.forEach((ele) => {
 					if (ele[this.valueKey] == this.modelValue) {
 						this.current = ele[this.labelKey]
+						this.defaultIndex = [index]
 					}
 				})
 			}
@@ -101,8 +105,9 @@ export default {
 			this.show = false;
 			// console.log(value);
             this.$emit('update:modelValue', value[0][this.valueKey]);
+			this.defaultIndex = columnIndex;
 			this.current = value[0][this.labelKey];
-        },
+        }
     }
 }
 </script>

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

@@ -171,7 +171,7 @@
 		<up-popup
 			mode="center"
 			v-model:show="popupShow">
-			<video id="myVideo"
+			<video id="myVideo" v-if="popupShow"
 				:src="currentItemIndex >= 0 ? lists[currentItemIndex].url : ''"
 				@error="videoErrorCallback" show-center-play-btn
 				object-fit='cover' show-fullscreen-btn='true'

package/components/u-upload/utils.js

@@ -1,3 +1,4 @@
+import test from '../../libs/function/test'
 function pickExclude(obj, keys) {
 	// 某些情况下，type可能会为
     if (!['[object Object]', '[object File]'].includes(Object.prototype.toString.call(obj))) {
@@ -21,30 +22,30 @@ function formatImage(res) {
 		// #ifdef H5
 		name: item.name,
 		file: item
-		// #endif
-		// #ifndef H5
-		name: item.path.split('/').pop() + '.png',
+		// #endif
+		// #ifndef H5
+		name: item.path.split('/').pop() + '.png',
 		// #endif
     }))
 }
 
-function formatVideo(res) {
-	// console.log(res)
+function formatVideo(res) {
+	// console.log(res)
     return [
         {
             ...pickExclude(res, ['tempFilePath', 'thumbTempFilePath', 'errMsg']),
             type: 'video',
             url: res.tempFilePath,
             thumb: res.thumbTempFilePath,
-			size: res.size,
-			width: res.width || 0, // APP 2.1.0+、H5、微信小程序、京东小程序
+			size: res.size,
+			width: res.width || 0, // APP 2.1.0+、H5、微信小程序、京东小程序
 			height: res.height || 0, // APP 2.1.0+、H5、微信小程序、京东小程序
 			// #ifdef H5
 			name: res.name,
 			file: res
-			// #endif
-			// #ifndef H5
-			name: res.tempFilePath.split('/').pop() + '.mp4',
+			// #endif
+			// #ifndef H5
+			name: res.tempFilePath.split('/').pop() + '.mp4',
 			// #endif
         }
     ]
@@ -59,9 +60,9 @@ function formatMedia(res) {
 		size: item.size,
 		// #ifdef H5
 		file: item
-		// #endif
-		// #ifndef H5
-		name: item.tempFilePath.split('/').pop() + (res.type === 'video' ? '.mp4': '.png'),
+		// #endif
+		// #ifndef H5
+		name: item.tempFilePath.split('/').pop() + (res.type === 'video' ? '.mp4': '.png'),
 		// #endif
     }))
 }

package/package.json

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