uview-plus 3.1.50 → 3.1.52

package/components/u-loading-page/props.js

@@ -1,50 +1,49 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 提示内容
         loadingText: {
             type: [String, Number],
-            default: defprops.loadingPage.loadingText
+            default: () => uni.$u.props.loadingPage.loadingText
         },
         // 文字上方用于替换loading动画的图片
         image: {
             type: String,
-            default: defprops.loadingPage.image
+            default: () => uni.$u.props.loadingPage.image
         },
         // 加载动画的模式，circle-圆形，spinner-花朵形，semicircle-半圆形
         loadingMode: {
             type: String,
-            default: defprops.loadingPage.loadingMode
+            default: () => uni.$u.props.loadingPage.loadingMode
         },
         // 是否加载中
         loading: {
             type: Boolean,
-            default: defprops.loadingPage.loading
+            default: () => uni.$u.props.loadingPage.loading
         },
         // 背景色
         bgColor: {
             type: String,
-            default: defprops.loadingPage.bgColor
+            default: () => uni.$u.props.loadingPage.bgColor
         },
         // 文字颜色
         color: {
             type: String,
-            default: defprops.loadingPage.color
+            default: () => uni.$u.props.loadingPage.color
         },
         // 文字大小
         fontSize: {
             type: [String, Number],
-            default: defprops.loadingPage.fontSize
+            default: () => uni.$u.props.loadingPage.fontSize
         },
 		// 图标大小
 		iconSize: {
 		    type: [String, Number],
-		    default: defprops.loadingPage.fontSize
+		    default: () => uni.$u.props.loadingPage.fontSize
 		},
         // 加载中图标的颜色，只能rgb或者十六进制颜色值
         loadingColor: {
             type: String,
-            default: defprops.loadingPage.loadingColor
+            default: () => uni.$u.props.loadingPage.loadingColor
         }
     }
 }

package/components/u-loadmore/props.js

@@ -1,95 +1,94 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 组件状态，loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
         status: {
             type: String,
-            default: defprops.loadmore.status
+            default: () => uni.$u.props.loadmore.status
         },
         // 组件背景色
         bgColor: {
             type: String,
-            default: defprops.loadmore.bgColor
+            default: () => uni.$u.props.loadmore.bgColor
         },
         // 是否显示加载中的图标
         icon: {
             type: Boolean,
-            default: defprops.loadmore.icon
+            default: () => uni.$u.props.loadmore.icon
         },
         // 字体大小
         fontSize: {
             type: [String, Number],
-            default: defprops.loadmore.fontSize
+            default: () => uni.$u.props.loadmore.fontSize
         },
 		    // 图标大小
         iconSize: {
             type: [String, Number],
-            default: defprops.loadmore.iconSize
+            default: () => uni.$u.props.loadmore.iconSize
         },
         // 字体颜色
         color: {
             type: String,
-            default: defprops.loadmore.color
+            default: () => uni.$u.props.loadmore.color
         },
         // 加载中状态的图标，spinner-花朵状图标，circle-圆圈状，semicircle-半圆
         loadingIcon: {
             type: String,
-            default: defprops.loadmore.loadingIcon
+            default: () => uni.$u.props.loadmore.loadingIcon
         },
         // 加载前的提示语
         loadmoreText: {
             type: String,
-            default: defprops.loadmore.loadmoreText
+            default: () => uni.$u.props.loadmore.loadmoreText
         },
         // 加载中提示语
         loadingText: {
             type: String,
-            default: defprops.loadmore.loadingText
+            default: () => uni.$u.props.loadmore.loadingText
         },
         // 没有更多的提示语
         nomoreText: {
             type: String,
-            default: defprops.loadmore.nomoreText
+            default: () => uni.$u.props.loadmore.nomoreText
         },
         // 在“没有更多”状态下，是否显示粗点
         isDot: {
             type: Boolean,
-            default: defprops.loadmore.isDot
+            default: () => uni.$u.props.loadmore.isDot
         },
         // 加载中图标的颜色
         iconColor: {
             type: String,
-            default: defprops.loadmore.iconColor
+            default: () => uni.$u.props.loadmore.iconColor
         },
         // 上边距
         marginTop: {
             type: [String, Number],
-            default: defprops.loadmore.marginTop
+            default: () => uni.$u.props.loadmore.marginTop
         },
         // 下边距
         marginBottom: {
             type: [String, Number],
-            default: defprops.loadmore.marginBottom
+            default: () => uni.$u.props.loadmore.marginBottom
         },
         // 高度，单位px
         height: {
             type: [String, Number],
-            default: defprops.loadmore.height
+            default: () => uni.$u.props.loadmore.height
         },
         // 是否显示左边分割线
         line: {
             type: Boolean,
-            default: defprops.loadmore.line
+            default: () => uni.$u.props.loadmore.line
         },
         // 线条颜色
         lineColor: {
             type: String,
-            default: defprops.loadmore.lineColor
+            default: () => uni.$u.props.loadmore.lineColor
         },
         // 是否虚线，true-虚线，false-实线
         dashed: {
             type: Boolean,
-            default: defprops.loadmore.dashed
+            default: () => uni.$u.props.loadmore.dashed
         }
     }
 }

package/components/u-modal/props.js

@@ -1,85 +1,84 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否展示modal
         show: {
             type: Boolean,
-            default: defprops.modal.show
+            default: () => uni.$u.props.modal.show
         },
         // 标题
         title: {
             type: [String],
-            default: defprops.modal.title
+            default: () => uni.$u.props.modal.title
         },
         // 弹窗内容
         content: {
             type: String,
-            default: defprops.modal.content
+            default: () => uni.$u.props.modal.content
         },
         // 确认文案
         confirmText: {
             type: String,
-            default: defprops.modal.confirmText
+            default: () => uni.$u.props.modal.confirmText
         },
         // 取消文案
         cancelText: {
             type: String,
-            default: defprops.modal.cancelText
+            default: () => uni.$u.props.modal.cancelText
         },
         // 是否显示确认按钮
         showConfirmButton: {
             type: Boolean,
-            default: defprops.modal.showConfirmButton
+            default: () => uni.$u.props.modal.showConfirmButton
         },
         // 是否显示取消按钮
         showCancelButton: {
             type: Boolean,
-            default: defprops.modal.showCancelButton
+            default: () => uni.$u.props.modal.showCancelButton
         },
         // 确认按钮颜色
         confirmColor: {
             type: String,
-            default: defprops.modal.confirmColor
+            default: () => uni.$u.props.modal.confirmColor
         },
         // 取消文字颜色
         cancelColor: {
             type: String,
-            default: defprops.modal.cancelColor
+            default: () => uni.$u.props.modal.cancelColor
         },
         // 对调确认和取消的位置
         buttonReverse: {
             type: Boolean,
-            default: defprops.modal.buttonReverse
+            default: () => uni.$u.props.modal.buttonReverse
         },
         // 是否开启缩放效果
         zoom: {
             type: Boolean,
-            default: defprops.modal.zoom
+            default: () => uni.$u.props.modal.zoom
         },
         // 是否异步关闭，只对确定按钮有效
         asyncClose: {
             type: Boolean,
-            default: defprops.modal.asyncClose
+            default: () => uni.$u.props.modal.asyncClose
         },
         // 是否允许点击遮罩关闭modal
         closeOnClickOverlay: {
             type: Boolean,
-            default: defprops.modal.closeOnClickOverlay
+            default: () => uni.$u.props.modal.closeOnClickOverlay
         },
         // 给一个负的margin-top，往上偏移，避免和键盘重合的情况
         negativeTop: {
             type: [String, Number],
-            default: defprops.modal.negativeTop
+            default: () => uni.$u.props.modal.negativeTop
         },
         // modal宽度，不支持百分比，可以数值，px，rpx单位
         width: {
             type: [String, Number],
-            default: defprops.modal.width
+            default: () => uni.$u.props.modal.width
         },
         // 确认按钮的样式，circle-圆形，square-方形，如设置，将不会显示取消按钮
         confirmButtonShape: {
             type: String,
-            default: defprops.modal.confirmButtonShape
+            default: () => uni.$u.props.modal.confirmButtonShape
         }
     }
 }

package/components/u-navbar/props.js

@@ -1,85 +1,84 @@
-import defprops from '../../libs/config/props';
 export default {
 	props: {
 		// 是否开启顶部安全区适配
 		safeAreaInsetTop: {
 			type: Boolean,
-			default: defprops.navbar.safeAreaInsetTop
+			default: () => uni.$u.props.navbar.safeAreaInsetTop
 		},
 		// 固定在顶部时，是否生成一个等高元素，以防止塌陷
 		placeholder: {
 			type: Boolean,
-			default: defprops.navbar.placeholder
+			default: () => uni.$u.props.navbar.placeholder
 		},
 		// 是否固定在顶部
 		fixed: {
 			type: Boolean,
-			default: defprops.navbar.fixed
+			default: () => uni.$u.props.navbar.fixed
 		},
 		// 是否显示下边框
 		border: {
 			type: Boolean,
-			default: defprops.navbar.border
+			default: () => uni.$u.props.navbar.border
 		},
 		// 左边的图标
 		leftIcon: {
 			type: String,
-			default: defprops.navbar.leftIcon
+			default: () => uni.$u.props.navbar.leftIcon
 		},
 		// 左边的提示文字
 		leftText: {
 			type: String,
-			default: defprops.navbar.leftText
+			default: () => uni.$u.props.navbar.leftText
 		},
 		// 左右的提示文字
 		rightText: {
 			type: String,
-			default: defprops.navbar.rightText
+			default: () => uni.$u.props.navbar.rightText
 		},
 		// 右边的图标
 		rightIcon: {
 			type: String,
-			default: defprops.navbar.rightIcon
+			default: () => uni.$u.props.navbar.rightIcon
 		},
 		// 标题
 		title: {
 			type: [String, Number],
-			default: defprops.navbar.title
+			default: () => uni.$u.props.navbar.title
 		},
 		// 背景颜色
 		bgColor: {
 			type: String,
-			default: defprops.navbar.bgColor
+			default: () => uni.$u.props.navbar.bgColor
 		},
 		// 标题的宽度
 		titleWidth: {
 			type: [String, Number],
-			default: defprops.navbar.titleWidth
+			default: () => uni.$u.props.navbar.titleWidth
 		},
 		// 导航栏高度
 		height: {
 			type: [String, Number],
-			default: defprops.navbar.height
+			default: () => uni.$u.props.navbar.height
 		},
 		// 左侧返回图标的大小
 		leftIconSize: {
 			type: [String, Number],
-			default: defprops.navbar.leftIconSize
+			default: () => uni.$u.props.navbar.leftIconSize
 		},
 		// 左侧返回图标的颜色
 		leftIconColor: {
 			type: String,
-			default: defprops.navbar.leftIconColor
+			default: () => uni.$u.props.navbar.leftIconColor
 		},
 		// 点击左侧区域(返回图标)，是否自动返回上一页
 		autoBack: {
 			type: Boolean,
-			default: defprops.navbar.autoBack
+			default: () => uni.$u.props.navbar.autoBack
 		},
 		// 标题的样式，对象或字符串
 		titleStyle: {
 			type: [String, Object],
-			default: defprops.navbar.titleStyle
+			default: () => uni.$u.props.navbar.titleStyle
 		}
 	}
 }

package/components/u-no-network/props.js

@@ -1,20 +1,19 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 页面文字提示
         tips: {
             type: String,
-            default: defprops.noNetwork.tips
+            default: () => uni.$u.props.noNetwork.tips
         },
         // 一个z-index值，用于设置没有网络这个组件的层次，因为页面可能会有其他定位的元素层级过高，导致此组件被覆盖
         zIndex: {
             type: [String, Number],
-            default: defprops.noNetwork.zIndex
+            default: () => uni.$u.props.noNetwork.zIndex
         },
         // image 没有网络的图片提示
         image: {
             type: String,
-            default: defprops.noNetwork.image
+            default: () => uni.$u.props.noNetwork.image
         }
     }
 }

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

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

package/components/u-notify/props.js

@@ -1,50 +1,49 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 到顶部的距离
         top: {
             type: [String, Number],
-            default: defprops.notify.top
+            default: () => uni.$u.props.notify.top
         },
         // 是否展示组件
         // show: {
         // 	type: Boolean,
-        // 	default: defprops.notify.show
+        // 	default: () => uni.$u.props.notify.show
         // },
         // type主题，primary，success，warning，error
         type: {
             type: String,
-            default: defprops.notify.type
+            default: () => uni.$u.props.notify.type
         },
         // 字体颜色
         color: {
             type: String,
-            default: defprops.notify.color
+            default: () => uni.$u.props.notify.color
         },
         // 背景颜色
         bgColor: {
             type: String,
-            default: defprops.notify.bgColor
+            default: () => uni.$u.props.notify.bgColor
         },
         // 展示的文字内容
         message: {
             type: String,
-            default: defprops.notify.message
+            default: () => uni.$u.props.notify.message
         },
         // 展示时长，为0时不消失，单位ms
         duration: {
             type: [String, Number],
-            default: defprops.notify.duration
+            default: () => uni.$u.props.notify.duration
         },
         // 字体大小
         fontSize: {
             type: [String, Number],
-            default: defprops.notify.fontSize
+            default: () => uni.$u.props.notify.fontSize
         },
         // 是否留出顶部安全距离（状态栏高度）
         safeAreaInsetTop: {
             type: Boolean,
-            default: defprops.notify.safeAreaInsetTop
+            default: () => uni.$u.props.notify.safeAreaInsetTop
         }
     }
 }

package/components/u-notify/u-notify.vue

@@ -162,7 +162,12 @@
 				this.timer = null
 			}
 		},
+		// #ifdef VUE2
 		beforeDestroy() {
+		// #endif
+		// #ifdef VUE3
+		beforeUnmount() {
+		// #endif
 			this.clearTimer()
 		}
 	}