uview-plus 3.8.49 → 3.8.86

package/components/u-action-sheet/props.js

@@ -7,8 +7,10 @@
  * @FilePath     : /uview-plus/libs/config/props/props.js
  */
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import ActionSheetDefaultProps from './actionSheet'
+import { registerComponentProps } from '../../libs/config/props.js'
 
+const defProps = registerComponentProps(ActionSheetDefaultProps)
 export const props = defineMixin({
     props: {
         // 操作菜单是否展示 （默认false）

package/components/u-action-sheet/u-action-sheet.vue

@@ -296,6 +296,7 @@
 		}
 
 		&__description {
+			display: block;
 			font-size: $u-action-sheet-description-font-size;
 			color: $u-action-sheet-description-color;
 			margin: $u-action-sheet-description-margin;

package/components/u-album/props.js

@@ -7,8 +7,10 @@
  * @FilePath     : /uview-plus/components/u-album/props.js
  */
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import AlbumDefaultProps from './album'
+import { registerComponentProps } from '../../libs/config/props.js'
 
+const defProps = registerComponentProps(AlbumDefaultProps)
 export const props = defineMixin({
     props: {
         // 图片地址，Array<String>|Array<Object>形式

package/components/u-alert/props.js

@@ -7,8 +7,10 @@
  * @FilePath     : /uview-plus/libs/config/props/props.js
  */
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
-
+import AlertDefaultProps from './alert'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(AlertDefaultProps)
 export const props = defineMixin({
     props: {
         // 显示文字

package/components/u-avatar/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import AvatarDefaultProps from './avatar'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(AvatarDefaultProps)
 import test from '../../libs/function/test';
 export const props = defineMixin({
     props: {

package/components/u-avatar-group/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import AvatarGroupDefaultProps from './avatarGroup'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(AvatarGroupDefaultProps)
 export const props = defineMixin({
     props: {
         // 头像图片组

package/components/u-back-top/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import BackTopDefaultProps from './backtop'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(BackTopDefaultProps)
 export const props = defineMixin({
     props: {
         // 返回顶部的形状，circle-圆形，square-方形

package/components/u-badge/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import BadgeDefaultProps from './badge'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(BadgeDefaultProps)
 export const props = defineMixin({
     props: {
         // 是否显示圆点

package/components/u-barcode/u-barcode.vue

@@ -1,11 +1,14 @@
 <template>
   <view class="u-barcode" v-if="calcSizeDone">
-    <canvas 
-      v-if="showCanvas && !error" 
-      :id="canvasId" 
+    <up-canvas
+      v-if="showCanvas && !error"
+      ref="barcodeCanvas"
       :canvas-id="canvasId" 
+      :width="canvasWidth"
+      :height="canvasHeight"
+      bg-color="transparent"
       :style="{ width: canvasWidth + 'px', height: canvasHeight + 'px' }"
-    ></canvas>
+    ></up-canvas>
     <image 
       v-else-if="!showCanvas && !error"
       :src="barcodeImage" 
@@ -19,6 +22,15 @@
     >
       <text class="error-text">{{ error }}</text>
     </view>
+    <up-canvas
+      v-if="!useCanvas && calcSizeDone"
+      ref="barcodeImageCanvas"
+      class="u-barcode__hidden-canvas"
+      :canvas-id="tempCanvasId"
+      :width="canvasWidth"
+      :height="canvasHeight"
+      bg-color="transparent"
+    ></up-canvas>
   </view>
 </template>
 
@@ -146,6 +158,7 @@ export default {
   data() {
     return {
       canvasId: 'barcode-' + Math.random().toString(36).substr(2, 9),
+      tempCanvasId: 'barcode-temp-' + Math.random().toString(36).substr(2, 9),
       barcodeImage: '',
       showCanvas: false,
       canvasWidth: 0,
@@ -269,8 +282,7 @@ export default {
 
         await nextTick()
 
-        // 获取canvas上下文
-        const ctx = uni.createCanvasContext(this.canvasId, this)
+        const ctx = await this.getCanvasRef('barcodeCanvas')
         
         // 清空画布
         ctx.setFillStyle(options.background)
@@ -301,14 +313,14 @@ export default {
      * @author jry <ijry@qq.com>
      * @param {Object} options - 条码配置选项
      */
-    renderToImage(options) {
+    async renderToImage(options) {
       try {
         // 计算canvas尺寸
         this.calculateCanvasSize(options)
-        
-        // 创建临时canvas用于生成图片
-        const tempCanvasId = 'temp-' + this.canvasId
-        const ctx = uni.createCanvasContext(tempCanvasId, this)
+
+        await nextTick()
+        const canvas = await this.getCanvasRef('barcodeImageCanvas')
+        const ctx = canvas
         
         // 清空画布
         ctx.setFillStyle(options.background)
@@ -326,9 +338,11 @@ export default {
         ctx.draw(false, () => {
           // 延迟一小段时间确保canvas绘制完成
           setTimeout(() => {
-            // 将canvas转换为图片
-            uni.canvasToTempFilePath({
-              canvasId: tempCanvasId,
+            canvas.toTempFilePath({
+              width: this.canvasWidth,
+              height: this.canvasHeight,
+              destWidth: this.canvasWidth,
+              destHeight: this.canvasHeight,
               success: (res) => {
                 this.barcodeImage = res.tempFilePath
                 this.$emit('rendered', { type: 'image', value: this.value, path: res.tempFilePath })
@@ -337,7 +351,7 @@ export default {
                 console.error('生成条码图片失败:', error)
                 this.$emit('error', error)
               }
-            }, this)
+            })
           }, 100)
         })
       } catch (error) {
@@ -345,6 +359,16 @@ export default {
         this.$emit('error', error)
       }
     },
+
+    async getCanvasRef(refName) {
+      await nextTick()
+      const canvas = this.$refs[refName]
+      if (!canvas) {
+        throw new Error(`Canvas ref not found: ${refName}`)
+      }
+      await canvas.initCanvas(true)
+      return canvas
+    },
     
     /**
      * 计算canvas尺寸
@@ -986,6 +1010,13 @@ export default {
   align-items: center;
 }
 
+.u-barcode__hidden-canvas {
+  position: fixed;
+  top: -10000px;
+  left: -10000px;
+  z-index: -1;
+}
+
 .error-container {
   display: flex;
   justify-content: center;

package/components/u-box/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue.js'
-import defProps from './box.js'
+import BoxDefaultProps from './box.js'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(BoxDefaultProps)
 
 export const propsBox = defineMixin({
     props: {
@@ -54,4 +57,4 @@ export const propsBox = defineMixin({
             default: () => defProps.box.rightBottomTitle
         },
     }
-})
+})

package/components/u-button/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import ButtonDefaultProps from './button'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(ButtonDefaultProps)
 export const props = defineMixin({
     props: {
         // 是否细边框

package/components/u-button/vue.scss

@@ -14,9 +14,9 @@ $u-button-plain-u-button-success-color:$u-success;
 $u-button-plain-u-button-error-color:$u-error;
 $u-button-plain-u-button-warning-color:$u-warning;
 
-.u-button {
-	width: 100%;
-	white-space: nowrap;
+.u-button {
+	width: auto;
+	white-space: nowrap;
 	
 	&__text {
 		white-space: nowrap;

package/components/u-calendar/calendar.js

@@ -34,14 +34,26 @@ export default {
         readonly: false,
         showConfirm: true,
         maxRange: Number.MAX_SAFE_INTEGER, // Infinity
-        rangePrompt: '',
+        rangePrompt: '',
         showRangePrompt: true,
         allowSameDay: false,
+        rangeResultMode: 'all',
+        enableTime: false,
+        timePrecision: 'minute',
+        defaultTime: '',
 		round: 0,
+        overlay: true,
+        duration: 300,
+        overlayStyle: {},
+        overlayOpacity: 0.5,
+        zIndex: 10075,
+        safeAreaInsetBottom: true,
+        safeAreaInsetTop: false,
+        bgColor: '',
 		monthNum: 3,
         monthSwitch: false,
         showToday: true,
-        rangeResultMode: 'all',
+        todayColor: '',
         weekText: [t("up.week.one"), t("up.week.two"), t("up.week.three"), t("up.week.four"), t("up.week.five"), t("up.week.six"), t("up.week.seven")],
         forbidDays: [],
         forbidDaysToast: t("up.calendar.disabled"),

package/components/u-calendar/month.vue

@@ -33,7 +33,7 @@
 	// #endif
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addUnit, deepClone, toast, sleep } from '../../libs/function/index';
+	import { addUnit, deepClone, toast, sleep, getWindowInfo } from '../../libs/function/index';
 	import { colorGradient } from '../../libs/function/colorGradient';
 	import test from '../../libs/function/test';
 	import defProps from '../../libs/config/props';
@@ -140,6 +140,11 @@
 			todayDate: {
 				type: String,
 				default: ''
+			},
+			// 今天日期的独立高亮颜色
+			todayColor: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
@@ -168,8 +173,10 @@
 				return (index1, index2, item) => {
 					const style = {}
 					let week = item.week
+					// 隐藏挂载场景下节点宽度可能拿到0，兜底使用窗口宽度避免首日偏移归零
+					const wrapperWidth = this.width > 0 ? this.width : (getWindowInfo().windowWidth || 0)
 					// 不进行四舍五入的形式保留2位小数
-					const dayWidth = Number(parseFloat(this.width / 7).toFixed(3).slice(0, -1))
+					const dayWidth = Number(parseFloat(wrapperWidth / 7).toFixed(3).slice(0, -1))
 					// 得出每个日期的宽度
 					// #ifdef APP-NVUE
 					style.width = addUnit(dayWidth, 'px')
@@ -178,7 +185,12 @@
 					if (index2 === 0) {
 						// 获取当前为星期几，如果为0，则为星期天，减一为每月第一天时，需要向左偏移的item个数
 						week = (week === 0 ? 7 : week) - 1
+						// #ifdef APP-NVUE
 						style.marginLeft = addUnit(week * dayWidth, 'px')
+						// #endif
+						// #ifndef APP-NVUE
+						style.marginLeft = `${(week / 7) * 100}%`
+						// #endif
 					}
 					if (this.mode === 'range') {
 						// 之所以需要这么写，是因为DCloud公司的iOS客户端导致的bug
@@ -198,8 +210,8 @@
 					if (this.selected.some(item => this.dateSame(item, date))) {
 						style.backgroundColor = this.color
 					}
-					if (this.todayDate && this.dateSame(date, this.todayDate) && !this.selected.some(item => this.dateSame(item, date))) {
-						style.border = `1px solid ${this.color}`
+					if (this.todayDate && this.dateSame(date, this.todayDate)) {
+						style.border = `1px solid ${this.resolvedTodayColor}`
 						style.boxSizing = 'border-box'
 					}
 					if (this.mode === 'single') {
@@ -248,6 +260,9 @@
 					return style
 				}
 			},
+			resolvedTodayColor() {
+				return this.todayColor || this.color
+			},
 			// 某个日期是否被选中
 			textStyle() {
 				return (item) => {
@@ -265,6 +280,9 @@
 							style.color = this.color
 						}
 					}
+					if (this.todayDate && this.dateSame(date, this.todayDate) && !this.isSelectedDate(date)) {
+						style.color = this.resolvedTodayColor
+					}
 					return style
 				}
 			},
@@ -335,16 +353,21 @@
 			dateSame(date1, date2) {
 				return dayjs(date1).isSame(dayjs(date2))
 			},
+			isSelectedDate(date) {
+				return this.selected.some(item => this.dateSame(item, date))
+			},
 			// 获取月份数据区域的宽度，因为nvue不支持百分比，所以无法通过css设置每个日期item的宽度
 			getWrapperWidth() {
 				// #ifdef APP-NVUE
 				dom.getComponentRect(this.$refs['u-calendar-month-wrapper'], res => {
-					this.width = res.size.width
+					const width = res && res.size ? Number(res.size.width) : 0
+					this.width = width > 0 ? width : (getWindowInfo().windowWidth || 0)
 				})
 				// #endif
 				// #ifndef APP-NVUE
 				this.$uGetRect('.u-calendar-month-wrapper').then(size => {
-					this.width = size.width
+					const width = size ? Number(size.width) : 0
+					this.width = width > 0 ? width : (getWindowInfo().windowWidth || 0)
 				})
 				// #endif
 			},
@@ -493,6 +516,18 @@
 			setSelected(selected, event = true) {
 				this.selected = selected
 				event && this.$emit('monthSelected', this.selected,'tap')
+			},
+			selectDate(date) {
+				const targetDate = dayjs(date).format("YYYY-MM-DD")
+				for (let monthIndex = 0; monthIndex < this.months.length; monthIndex++) {
+					const dayIndex = this.months[monthIndex].date.findIndex(item => {
+						return this.dateSame(item.date, targetDate)
+					})
+					if (dayIndex !== -1) {
+						this.clickHandler(monthIndex, dayIndex, this.months[monthIndex].date[dayIndex])
+						return
+					}
+				}
 			}
 		}
 	}

package/components/u-calendar/props.js

@@ -1,6 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import CalendarDefaultProps from './calendar'
+import { registerComponentProps } from '../../libs/config/props.js'
 
+const defProps = registerComponentProps(CalendarDefaultProps)
 export const props = defineMixin({
     props: {
         // 日历顶部标题
@@ -98,6 +100,46 @@ export const props = defineMixin({
             type: Boolean,
             default: () => defProps.calendar.show
         },
+        // 是否显示遮罩
+        overlay: {
+            type: Boolean,
+            default: () => defProps.calendar.overlay
+        },
+        // 动画时长，单位ms
+        duration: {
+            type: [String, Number],
+            default: () => defProps.calendar.duration
+        },
+        // 自定义遮罩的样式
+        overlayStyle: {
+            type: [Object, String],
+            default: () => defProps.calendar.overlayStyle
+        },
+        // 遮罩的透明度，0-1之间
+        overlayOpacity: {
+            type: [Number, String],
+            default: () => defProps.calendar.overlayOpacity
+        },
+        // 层级
+        zIndex: {
+            type: [String, Number],
+            default: () => defProps.calendar.zIndex
+        },
+        // 是否为iPhoneX留出底部安全距离
+        safeAreaInsetBottom: {
+            type: Boolean,
+            default: () => defProps.calendar.safeAreaInsetBottom
+        },
+        // 是否留出顶部安全距离（状态栏高度）
+        safeAreaInsetTop: {
+            type: Boolean,
+            default: () => defProps.calendar.safeAreaInsetTop
+        },
+        // 弹窗背景色，设置为transparent可去除白色背景
+        bgColor: {
+            type: String,
+            default: () => defProps.calendar.bgColor
+        },
         // 是否允许点击遮罩关闭日历
         closeOnClickOverlay: {
             type: Boolean,
@@ -137,6 +179,21 @@ export const props = defineMixin({
         rangeResultMode: {
             type: String,
             default: () => defProps.calendar.rangeResultMode
+        },
+        // 是否开启时分秒选择
+        enableTime: {
+            type: Boolean,
+            default: () => defProps.calendar.enableTime
+        },
+        // 时间精度：hour-仅时，minute-时分，second-时分秒
+        timePrecision: {
+            type: String,
+            default: () => defProps.calendar.timePrecision
+        },
+        // 默认时间，格式支持 HH / HH:mm / HH:mm:ss
+        defaultTime: {
+            type: String,
+            default: () => defProps.calendar.defaultTime
         },
 		// 圆角值
 		round: {
@@ -158,6 +215,11 @@ export const props = defineMixin({
 			type: Boolean,
 			default: () => defProps.calendar.showToday
 		},
+		// 今天日期的独立高亮颜色，默认跟随主题色
+		todayColor: {
+			type: String,
+			default: () => defProps.calendar.todayColor
+		},
         // 星期文案
         weekText: {
 			type: Array,