uview-plus 3.0.17 → 3.1.3

package/components/u-collapse/props.js

@@ -1,19 +1,20 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 当前展开面板的name，非手风琴模式：[<string | number>]，手风琴模式：string | number
         value: {
             type: [String, Number, Array, null],
-            default: uni.$u.props.collapse.value
+            default: defprops.collapse.value
         },
         // 是否手风琴模式
         accordion: {
             type: Boolean,
-            default: uni.$u.props.collapse.accordion
+            default: defprops.collapse.accordion
         },
         // 是否显示外边框
         border: {
             type: Boolean,
-            default: uni.$u.props.collapse.border
+            default: defprops.collapse.border
         }
     }
 }

package/components/u-collapse/u-collapse.vue

@@ -7,6 +7,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	/**
 	 * collapse 折叠面板 
 	 * @description 通过折叠面板收纳内容区域
@@ -19,7 +21,7 @@
 	 */
 	export default {
 		name: "u-collapse",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin,props],
 		watch: {
 			needInit() {
 				this.init()

package/components/u-collapse-item/props.js

@@ -1,59 +1,60 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 标题
         title: {
             type: String,
-            default: uni.$u.props.collapseItem.title
+            default: defprops.collapseItem.title
         },
         // 标题右侧内容
         value: {
             type: String,
-            default: uni.$u.props.collapseItem.value
+            default: defprops.collapseItem.value
         },
         // 标题下方的描述信息
         label: {
             type: String,
-            default: uni.$u.props.collapseItem.label
+            default: defprops.collapseItem.label
         },
         // 是否禁用折叠面板
         disabled: {
             type: Boolean,
-            default: uni.$u.props.collapseItem.disabled
+            default: defprops.collapseItem.disabled
         },
         // 是否展示右侧箭头并开启点击反馈
         isLink: {
             type: Boolean,
-            default: uni.$u.props.collapseItem.isLink
+            default: defprops.collapseItem.isLink
         },
         // 是否开启点击反馈
         clickable: {
             type: Boolean,
-            default: uni.$u.props.collapseItem.clickable
+            default: defprops.collapseItem.clickable
         },
         // 是否显示内边框
         border: {
             type: Boolean,
-            default: uni.$u.props.collapseItem.border
+            default: defprops.collapseItem.border
         },
         // 标题的对齐方式
         align: {
             type: String,
-            default: uni.$u.props.collapseItem.align
+            default: defprops.collapseItem.align
         },
         // 唯一标识符
         name: {
             type: [String, Number],
-            default: uni.$u.props.collapseItem.name
+            default: defprops.collapseItem.name
         },
         // 标题左侧图片，可为绝对路径的图片或内置图标
         icon: {
             type: String,
-            default: uni.$u.props.collapseItem.icon
+            default: defprops.collapseItem.icon
         },
         // 面板展开收起的过渡时间，单位ms
         duration: {
             type: Number,
-            default: uni.$u.props.collapseItem.duration
+            default: defprops.collapseItem.duration
         }
     }
 }

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

@@ -14,17 +14,17 @@
 		>
 			<!-- #ifndef MP-WEIXIN -->
 			<!-- 微信小程序不支持，因为微信中不支持 <slot name="title" slot="title" />的写法 -->
-			<template #title>
-				<slot name="title"></slot>
-			</template>
-			<template #icon>
-				<slot name="icon"></slot>
-			</template>
-			<template #value>
-				<slot name="value"></slot>
-			</template>
-			<template #right-icon>
-				<slot name="right-icon"></slot>
+			<template #title>
+				<slot name="title"></slot>
+			</template>
+			<template #icon>
+				<slot name="icon"></slot>
+			</template>
+			<template #value>
+				<slot name="value"></slot>
+			</template>
+			<template #right-icon>
+				<slot name="right-icon"></slot>
 			</template>
 			<!-- #endif -->
 		</u-cell>
@@ -44,7 +44,10 @@
 </template>
 
 <script>
-	import props from './props.js';
+	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
+	import { nextTick } from 'vue'
 	// #ifdef APP-NVUE
 	const animation = uni.requireNativePlugin('animation')
 	const dom = uni.requireNativePlugin('dom')
@@ -68,7 +71,7 @@
 	 */
 	export default {
 		name: "u-collapse-item",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				elId: uni.$u.guid(),
@@ -102,7 +105,7 @@
 		},
 		methods: {
 			// 异步获取内容，或者动态修改了内容时，需要重新初始化
-			init() {
+			async init() {
 				// 初始化数据
 				this.updateParentData()
 				if (!this.parent) {
@@ -125,10 +128,9 @@
 					}
 					this.expanded = (value || []).some(item => item == this.name)
 				}
-				// 设置组件的展开或收起状态
-				this.$nextTick(function() {
-					this.setContentAnimate()
-				})
+				// 设置组件的展开或收起状态
+				await nextTick()
+				this.setContentAnimate()
 			},
 			updateParentData() {
 				// 此方法在mixin中

package/components/u-column-notice/props.js

@@ -1,55 +1,56 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 显示的内容，字符串
         text: {
             type: [Array],
-            default: uni.$u.props.columnNotice.text
+            default: defprops.columnNotice.text
         },
         // 是否显示左侧的音量图标
         icon: {
             type: String,
-            default: uni.$u.props.columnNotice.icon
+            default: defprops.columnNotice.icon
         },
         // 通告模式，link-显示右箭头，closable-显示右侧关闭图标
         mode: {
             type: String,
-            default: uni.$u.props.columnNotice.mode
+            default: defprops.columnNotice.mode
         },
         // 文字颜色，各图标也会使用文字颜色
         color: {
             type: String,
-            default: uni.$u.props.columnNotice.color
+            default: defprops.columnNotice.color
         },
         // 背景颜色
         bgColor: {
             type: String,
-            default: uni.$u.props.columnNotice.bgColor
+            default: defprops.columnNotice.bgColor
         },
         // 字体大小，单位px
         fontSize: {
             type: [String, Number],
-            default: uni.$u.props.columnNotice.fontSize
+            default: defprops.columnNotice.fontSize
         },
         // 水平滚动时的滚动速度，即每秒滚动多少px(px)，这有利于控制文字无论多少时，都能有一个恒定的速度
         speed: {
             type: [String, Number],
-            default: uni.$u.props.columnNotice.speed
+            default: defprops.columnNotice.speed
         },
         // direction = row时，是否使用步进形式滚动
         step: {
             type: Boolean,
-            default: uni.$u.props.columnNotice.step
+            default: defprops.columnNotice.step
         },
         // 滚动一个周期的时间长，单位ms
         duration: {
             type: [String, Number],
-            default: uni.$u.props.columnNotice.duration
+            default: defprops.columnNotice.duration
         },
         // 是否禁止用手滑动切换
         // 目前HX2.6.11，只支持App 2.5.5+、H5 2.5.5+、支付宝小程序、字节跳动小程序
         disableTouch: {
             type: Boolean,
-            default: uni.$u.props.columnNotice.disableTouch
+            default: defprops.columnNotice.disableTouch
         }
     }
 }

package/components/u-column-notice/u-column-notice.vue

@@ -58,6 +58,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	/**
 	 * ColumnNotice 滚动通知中的垂直滚动 内部组件
 	 * @description 该组件用于滚动通告场景，是其中的垂直滚动方式
@@ -75,7 +77,7 @@
 	 * @example 
 	 */
 	export default {
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 		watch: {
 			text: {
 				immediate: true,

package/components/u-count-down/props.js

@@ -1,24 +1,25 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 倒计时时长，单位ms
         time: {
             type: [String, Number],
-            default: uni.$u.props.countDown.time
+            default: defprops.countDown.time
         },
         // 时间格式，DD-日，HH-时，mm-分，ss-秒，SSS-毫秒
         format: {
             type: String,
-            default: uni.$u.props.countDown.format
+            default: defprops.countDown.format
         },
         // 是否自动开始倒计时
         autoStart: {
             type: Boolean,
-            default: uni.$u.props.countDown.autoStart
+            default: defprops.countDown.autoStart
         },
         // 是否展示毫秒倒计时
         millisecond: {
             type: Boolean,
-            default: uni.$u.props.countDown.millisecond
+            default: defprops.countDown.millisecond
         }
     }
 }

package/components/u-count-down/u-count-down.vue

@@ -7,7 +7,9 @@
 </template>
 
 <script>
-	import props from './props.js';
+	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	import {
 		isSameSecond,
 		parseFormat,
@@ -30,7 +32,7 @@
 	 */
 	export default {
 		name: 'u-count-down',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				timer: null,
@@ -160,4 +162,4 @@
 			line-height: $u-count-down-text-line-height;
 		}
 	}
-</style>
+</style>

package/components/u-count-to/props.js

@@ -1,59 +1,60 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 开始的数值，默认从0增长到某一个数
         startVal: {
             type: [String, Number],
-            default: uni.$u.props.countTo.startVal
+            default: defprops.countTo.startVal
         },
         // 要滚动的目标数值，必须
         endVal: {
             type: [String, Number],
-            default: uni.$u.props.countTo.endVal
+            default: defprops.countTo.endVal
         },
         // 滚动到目标数值的动画持续时间，单位为毫秒（ms）
         duration: {
             type: [String, Number],
-            default: uni.$u.props.countTo.duration
+            default: defprops.countTo.duration
         },
         // 设置数值后是否自动开始滚动
         autoplay: {
             type: Boolean,
-            default: uni.$u.props.countTo.autoplay
+            default: defprops.countTo.autoplay
         },
         // 要显示的小数位数
         decimals: {
             type: [String, Number],
-            default: uni.$u.props.countTo.decimals
+            default: defprops.countTo.decimals
         },
         // 是否在即将到达目标数值的时候，使用缓慢滚动的效果
         useEasing: {
             type: Boolean,
-            default: uni.$u.props.countTo.useEasing
+            default: defprops.countTo.useEasing
         },
         // 十进制分割
         decimal: {
             type: [String, Number],
-            default: uni.$u.props.countTo.decimal
+            default: defprops.countTo.decimal
         },
         // 字体颜色
         color: {
             type: String,
-            default: uni.$u.props.countTo.color
+            default: defprops.countTo.color
         },
         // 字体大小
         fontSize: {
             type: [String, Number],
-            default: uni.$u.props.countTo.fontSize
+            default: defprops.countTo.fontSize
         },
         // 是否加粗字体
         bold: {
             type: Boolean,
-            default: uni.$u.props.countTo.bold
+            default: defprops.countTo.bold
         },
         // 千位分隔符，类似金额的分割(￥23,321.05中的",")
         separator: {
             type: String,
-            default: uni.$u.props.countTo.separator
+            default: defprops.countTo.separator
         }
     }
 }

package/components/u-count-to/u-count-to.vue

@@ -11,6 +11,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 /**
  * countTo 数字滚动
  * @description 该组件一般用于需要滚动数字到某一个值的场景，目标要求是一个递增的值。
@@ -45,7 +47,7 @@ export default {
 			lastTime: 0 // 上一次的时间
 		};
 	},
-	mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+	mixins: [mpMixin, mixin,props],
 	computed: {
 		countDown() {
 			return this.startVal > this.endVal;

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

@@ -1,125 +1,126 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否打开组件
         show: {
             type: Boolean,
-            default: uni.$u.props.datetimePicker.show
+            default: defprops.datetimePicker.show
         },
         // 是否展示顶部的操作栏
         showToolbar: {
             type: Boolean,
-            default: uni.$u.props.datetimePicker.showToolbar
+            default: defprops.datetimePicker.showToolbar
         },
         // #ifdef VUE2
         // 绑定值
         value: {
             type: [String, Number],
-            default: uni.$u.props.datetimePicker.value
+            default: defprops.datetimePicker.value
         },
         // #endif
         // #ifdef VUE3
         // 绑定值
         modelValue: {
             type: [String, Number],
-            default: uni.$u.props.datetimePicker.value
+            default: defprops.datetimePicker.value
         },
         // #endif
         // 顶部标题
         title: {
             type: String,
-            default: uni.$u.props.datetimePicker.title
+            default: defprops.datetimePicker.title
         },
         // 展示格式，mode=date为日期选择，mode=time为时间选择，mode=year-month为年月选择，mode=datetime为日期时间选择
         mode: {
             type: String,
-            default: uni.$u.props.datetimePicker.mode
+            default: defprops.datetimePicker.mode
         },
         // 可选的最大时间
         maxDate: {
             type: Number,
             // 最大默认值为后10年
-            default: uni.$u.props.datetimePicker.maxDate
+            default: defprops.datetimePicker.maxDate
         },
         // 可选的最小时间
         minDate: {
             type: Number,
             // 最小默认值为前10年
-            default: uni.$u.props.datetimePicker.minDate
+            default: defprops.datetimePicker.minDate
         },
         // 可选的最小小时，仅mode=time有效
         minHour: {
             type: Number,
-            default: uni.$u.props.datetimePicker.minHour
+            default: defprops.datetimePicker.minHour
         },
         // 可选的最大小时，仅mode=time有效
         maxHour: {
             type: Number,
-            default: uni.$u.props.datetimePicker.maxHour
+            default: defprops.datetimePicker.maxHour
         },
         // 可选的最小分钟，仅mode=time有效
         minMinute: {
             type: Number,
-            default: uni.$u.props.datetimePicker.minMinute
+            default: defprops.datetimePicker.minMinute
         },
         // 可选的最大分钟，仅mode=time有效
         maxMinute: {
             type: Number,
-            default: uni.$u.props.datetimePicker.maxMinute
+            default: defprops.datetimePicker.maxMinute
         },
         // 选项过滤函数
         filter: {
             type: [Function, null],
-            default: uni.$u.props.datetimePicker.filter
+            default: defprops.datetimePicker.filter
         },
         // 选项格式化函数
         formatter: {
             type: [Function, null],
-            default: uni.$u.props.datetimePicker.formatter
+            default: defprops.datetimePicker.formatter
         },
         // 是否显示加载中状态
         loading: {
             type: Boolean,
-            default: uni.$u.props.datetimePicker.loading
+            default: defprops.datetimePicker.loading
         },
         // 各列中，单个选项的高度
         itemHeight: {
             type: [String, Number],
-            default: uni.$u.props.datetimePicker.itemHeight
+            default: defprops.datetimePicker.itemHeight
         },
         // 取消按钮的文字
         cancelText: {
             type: String,
-            default: uni.$u.props.datetimePicker.cancelText
+            default: defprops.datetimePicker.cancelText
         },
         // 确认按钮的文字
         confirmText: {
             type: String,
-            default: uni.$u.props.datetimePicker.confirmText
+            default: defprops.datetimePicker.confirmText
         },
         // 取消按钮的颜色
         cancelColor: {
             type: String,
-            default: uni.$u.props.datetimePicker.cancelColor
+            default: defprops.datetimePicker.cancelColor
         },
         // 确认按钮的颜色
         confirmColor: {
             type: String,
-            default: uni.$u.props.datetimePicker.confirmColor
+            default: defprops.datetimePicker.confirmColor
         },
         // 每列中可见选项的数量
         visibleItemCount: {
             type: [String, Number],
-            default: uni.$u.props.datetimePicker.visibleItemCount
+            default: defprops.datetimePicker.visibleItemCount
         },
         // 是否允许点击遮罩关闭选择器
         closeOnClickOverlay: {
             type: Boolean,
-            default: uni.$u.props.datetimePicker.closeOnClickOverlay
+            default: defprops.datetimePicker.closeOnClickOverlay
         },
         // 各列的默认索引
         defaultIndex: {
             type: Array,
-            default: uni.$u.props.datetimePicker.defaultIndex
+            default: defprops.datetimePicker.defaultIndex
         }
     }
 }

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

@@ -31,6 +31,8 @@
 	    return result
 	}
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	// import dayjs from '../../libs/util/dayjs.js';
 	import dayjs from 'dayjs'
 
@@ -68,7 +70,7 @@
 	 */
 	export default {
 		name: 'datetime-picker',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				columns: [],

package/components/u-divider/props.js

@@ -1,44 +1,45 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否虚线
         dashed: {
             type: Boolean,
-            default: uni.$u.props.divider.dashed
+            default: defprops.divider.dashed
         },
         // 是否细线
         hairline: {
             type: Boolean,
-            default: uni.$u.props.divider.hairline
+            default: defprops.divider.hairline
         },
         // 是否以点替代文字，优先于text字段起作用
         dot: {
             type: Boolean,
-            default: uni.$u.props.divider.dot
+            default: defprops.divider.dot
         },
         // 内容文本的位置，left-左边，center-中间，right-右边
         textPosition: {
             type: String,
-            default: uni.$u.props.divider.textPosition
+            default: defprops.divider.textPosition
         },
         // 文本内容
         text: {
             type: [String, Number],
-            default: uni.$u.props.divider.text
+            default: defprops.divider.text
         },
         // 文本大小
         textSize: {
             type: [String, Number],
-            default: uni.$u.props.divider.textSize
+            default: defprops.divider.textSize
         },
         // 文本颜色
         textColor: {
             type: String,
-            default: uni.$u.props.divider.textColor
+            default: defprops.divider.textColor
         },
         // 线条颜色
         lineColor: {
             type: String,
-            default: uni.$u.props.divider.lineColor
+            default: defprops.divider.lineColor
         }
     }
 }

package/components/u-divider/u-divider.vue

@@ -30,6 +30,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	/**
 	 * divider 分割线
 	 * @description 区隔内容的分割线，一般用于页面底部"没有更多"的提示。
@@ -49,7 +51,7 @@
 	 */
 	export default {
 		name:'u-divider',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 		computed: {
 			textStyle() {
 				const style = {}