uview-plus 3.8.55 → 3.8.106

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

@@ -36,7 +36,14 @@
 				}, descriptionDynamicStyle]"
 			    v-if="description"
 			>{{description}}</text>
-			<slot>
+			<view
+				class="u-action-sheet__slot"
+				v-if="$slots.default"
+				@tap="slotClickHandler"
+			>
+				<slot></slot>
+			</view>
+			<template v-else>
 				<!-- 分割线 -->
 				<u-line v-if="description" :color="dividerColor"></u-line>
 				<!-- 操作项列表 -->
@@ -96,7 +103,7 @@
 						<u-line v-if="index !== actions.length - 1" :color="dividerColor"></u-line>
 					</view>
 				</scroll-view>
-			</slot>
+			</template>
 			<!-- 取消按钮前的分割区域 -->
 			<u-gap
 			    :bgColor="cancelGapColor"
@@ -161,6 +168,11 @@
 		name: "u-action-sheet",
 		// 一些props参数和methods方法，通过mixin混入，因为其他文件也会用到
 		mixins: [openType, buttonMixin, mixin, props],
+		provide() {
+			return {
+				uActionSheet: this,
+			}
+		},
 		data() {
 			return {
 
@@ -227,6 +239,13 @@
 				this.$emit('update:show', false)
 				this.$emit('close')
 			},
+			// 点击自定义内容时，按菜单项点击配置关闭弹窗
+			slotClickHandler() {
+				if (this.closeOnClickAction) {
+					this.$emit('update:show', false)
+					this.$emit('close')
+				}
+			},
 			// 选择操作项处理
 			selectHandler(index) {
 				const item = this.actions[index]
@@ -296,6 +315,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,9 @@ export default {
         ctx.draw(false, () => {
           // 延迟一小段时间确保canvas绘制完成
           setTimeout(() => {
-            // 将canvas转换为图片
-            uni.canvasToTempFilePath({
-              canvasId: tempCanvasId,
+            canvas.toTempFilePath({
+              width: this.canvasWidth,
+              height: this.canvasHeight,
               success: (res) => {
                 this.barcodeImage = res.tempFilePath
                 this.$emit('rendered', { type: 'image', value: this.value, path: res.tempFilePath })
@@ -337,7 +349,7 @@ export default {
                 console.error('生成条码图片失败:', error)
                 this.$emit('error', error)
               }
-            }, this)
+            })
           }, 100)
         })
       } catch (error) {
@@ -345,6 +357,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 +1008,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/u-button.vue

@@ -227,10 +227,7 @@ export default {
         nvuePlainBackgroundColor() {
             return this.upThemeVar(
                 '--up-button-plain-background-color',
-                this.upThemeVar(
-                    '--up-card-bg-color',
-                    this.isDarkTheme ? '#1c1c1e' : '#ffffff'
-                )
+                'transparent'
             );
         },
         loadingColor() {
@@ -441,7 +438,7 @@ $u-button-square-border-top-left-radius: 3px !default;
 $u-button-square-border-bottom-left-radius: 3px !default;
 $u-button-square-border-bottom-right-radius: 3px !default;
 $u-button-icon-min-width: 1em !default;
-$u-button-plain-background-color: var(--up-button-plain-background-color, var(--up-card-bg-color, #fff)) !default;
+$u-button-plain-background-color: var(--up-button-plain-background-color, transparent) !default;
 $u-button-hairline-border-width: 0.5px !default;
 
 .u-button {

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

@@ -42,6 +42,14 @@ export default {
         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,

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,

package/components/u-calendar/u-calendar.vue

@@ -2,6 +2,14 @@
 	<u-popup
 		:show="show"
 		mode="bottom"
+		:overlay="overlay"
+		:duration="duration"
+		:overlayStyle="overlayStyle"
+		:overlayOpacity="overlayOpacity"
+		:zIndex="zIndex"
+		:safeAreaInsetBottom="safeAreaInsetBottom"
+		:safeAreaInsetTop="safeAreaInsetTop"
+		:bgColor="bgColor"
 		:closeable="!pageInline"
 		@close="close"
 		:round="round"
@@ -202,6 +210,14 @@ import { t } from '../../libs/i18n'
  * @property {String}				confirmText			确定按钮的文字 (默认 '确定' )
  * @property {String}				confirmDisabledText	确认按钮处于禁用状态时的文字 (默认 '确定' )
  * @property {Boolean}				show				是否显示日历弹窗 (默认 false )
+ * @property {Boolean}				overlay				是否显示遮罩 (默认 true )
+ * @property {String | Number}		duration			动画时长，单位ms (默认 300 )
+ * @property {Object | String}		overlayStyle		自定义遮罩的样式
+ * @property {Number | String}		overlayOpacity		遮罩透明度，0-1之间 (默认 0.5 )
+ * @property {String | Number}		zIndex				弹出层的z-index值 (默认 10075 )
+ * @property {Boolean}				safeAreaInsetBottom	是否留出底部安全距离 (默认 true )
+ * @property {Boolean}				safeAreaInsetTop	是否留出顶部安全距离（状态栏高度） (默认 false )
+ * @property {String}				bgColor				弹窗背景色，设置为transparent可去除白色背景
  * @property {Boolean}				closeOnClickOverlay	是否允许点击遮罩关闭日历 (默认 false )
  * @property {Boolean}				readonly	        是否为只读状态，只读状态下禁止选择日期 (默认 false )
  * @property {String | Number}		maxRange	        日期区间最多可选天数，默认无限制，mode = range时有效

package/components/u-calendar-strip/props.js

@@ -1,6 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import CalendarStripDefaultProps from './calendarStrip'
+import { registerComponentProps } from '../../libs/config/props.js'
 
+const defProps = registerComponentProps(CalendarStripDefaultProps)
 export const props = defineMixin({
     props: {
         modelValue: {