uview-plus 3.1.42 → 3.1.47

package/components/u-textarea/props.js

@@ -1,120 +1,119 @@
-import defprops from '../../libs/config/props';
 export default {
 	props: {
 		// 输入框的内容
 		value: {
 			type: [String, Number],
-			default: defprops.textarea.value
+			default: () => uni.$u.props.textarea.value
 		},
 		// 输入框的内容
 		modelValue: {
 			type: [String, Number],
-			default: defprops.textarea.value
+			default: () => uni.$u.props.textarea.value
 		},
 		// 输入框为空时占位符
 		placeholder: {
 			type: [String, Number],
-			default: defprops.textarea.placeholder
+			default: () => uni.$u.props.textarea.placeholder
 		},
 		// 指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/
 		placeholderClass: {
 			type: String,
-			default: defprops.input.placeholderClass
+			default: () => uni.$u.props.input.placeholderClass
 		},
 		// 指定placeholder的样式
 		placeholderStyle: {
 			type: [String, Object],
-			default: defprops.input.placeholderStyle
+			default: () => uni.$u.props.input.placeholderStyle
 		},
 		// 输入框高度
 		height: {
 			type: [String, Number],
-			default: defprops.textarea.height
+			default: () => uni.$u.props.textarea.height
 		},
 		// 设置键盘右下角按钮的文字，仅微信小程序，App-vue和H5有效
 		confirmType: {
 			type: String,
-			default: defprops.textarea.confirmType
+			default: () => uni.$u.props.textarea.confirmType
 		},
 		// 是否禁用
 		disabled: {
 			type: Boolean,
-			default: defprops.textarea.disabled
+			default: () => uni.$u.props.textarea.disabled
 		},
 		// 是否显示统计字数
 		count: {
 			type: Boolean,
-			default: defprops.textarea.count
+			default: () => uni.$u.props.textarea.count
 		},
 		// 是否自动获取焦点，nvue不支持，H5取决于浏览器的实现
 		focus: {
 			type: Boolean,
-			default: defprops.textarea.focus
+			default: () => uni.$u.props.textarea.focus
 		},
 		// 是否自动增加高度
 		autoHeight: {
 			type: Boolean,
-			default: defprops.textarea.autoHeight
+			default: () => uni.$u.props.textarea.autoHeight
 		},
 		// 如果textarea是在一个position:fixed的区域，需要显示指定属性fixed为true
 		fixed: {
 			type: Boolean,
-			default: defprops.textarea.fixed
+			default: () => uni.$u.props.textarea.fixed
 		},
 		// 指定光标与键盘的距离
 		cursorSpacing: {
 			type: Number,
-			default: defprops.textarea.cursorSpacing
+			default: () => uni.$u.props.textarea.cursorSpacing
 		},
 		// 指定focus时的光标位置
 		cursor: {
 			type: [String, Number],
-			default: defprops.textarea.cursor
+			default: () => uni.$u.props.textarea.cursor
 		},
 		// 是否显示键盘上方带有”完成“按钮那一栏，
 		showConfirmBar: {
 			type: Boolean,
-			default: defprops.textarea.showConfirmBar
+			default: () => uni.$u.props.textarea.showConfirmBar
 		},
 		// 光标起始位置，自动聚焦时有效，需与selection-end搭配使用
 		selectionStart: {
 			type: Number,
-			default: defprops.textarea.selectionStart
+			default: () => uni.$u.props.textarea.selectionStart
 		},
 		// 光标结束位置，自动聚焦时有效，需与selection-start搭配使用
 		selectionEnd: {
 			type: Number,
-			default: defprops.textarea.selectionEnd
+			default: () => uni.$u.props.textarea.selectionEnd
 		},
 		// 键盘弹起时，是否自动上推页面
 		adjustPosition: {
 			type: Boolean,
-			default: defprops.textarea.adjustPosition
+			default: () => uni.$u.props.textarea.adjustPosition
 		},
 		// 是否去掉 iOS 下的默认内边距，只微信小程序有效
 		disableDefaultPadding: {
 			type: Boolean,
-			default: defprops.textarea.disableDefaultPadding
+			default: () => uni.$u.props.textarea.disableDefaultPadding
 		},
 		// focus时，点击页面的时候不收起键盘，只微信小程序有效
 		holdKeyboard: {
 			type: Boolean,
-			default: defprops.textarea.holdKeyboard
+			default: () => uni.$u.props.textarea.holdKeyboard
 		},
 		// 最大输入长度，设置为 -1 的时候不限制最大长度
 		maxlength: {
 			type: [String, Number],
-			default: defprops.textarea.maxlength
+			default: () => uni.$u.props.textarea.maxlength
 		},
 		// 边框类型，surround-四周边框，bottom-底部边框
 		border: {
 			type: String,
-			default: defprops.textarea.border
+			default: () => uni.$u.props.textarea.border
 		},
 		// 用于处理或者过滤输入框内容的方法
 		formatter: {
 			type: [Function, null],
-			default: defprops.textarea.formatter
+			default: () => uni.$u.props.textarea.formatter
 		},
 		// 是否忽略组件内对文本合成系统事件的处理
 		ignoreCompositionEvent: {

package/components/u-toast/u-toast.vue

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

package/components/u-toolbar/props.js

@@ -1,35 +1,34 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否展示工具条
         show: {
             type: Boolean,
-            default: defprops.toolbar.show
+            default: () => uni.$u.props.toolbar.show
         },
         // 取消按钮的文字
         cancelText: {
             type: String,
-            default: defprops.toolbar.cancelText
+            default: () => uni.$u.props.toolbar.cancelText
         },
         // 确认按钮的文字
         confirmText: {
             type: String,
-            default: defprops.toolbar.confirmText
+            default: () => uni.$u.props.toolbar.confirmText
         },
         // 取消按钮的颜色
         cancelColor: {
             type: String,
-            default: defprops.toolbar.cancelColor
+            default: () => uni.$u.props.toolbar.cancelColor
         },
         // 确认按钮的颜色
         confirmColor: {
             type: String,
-            default: defprops.toolbar.confirmColor
+            default: () => uni.$u.props.toolbar.confirmColor
         },
         // 标题文字
         title: {
             type: String,
-            default: defprops.toolbar.title
+            default: () => uni.$u.props.toolbar.title
         }
     }
 }

package/components/u-tooltip/props.js

@@ -1,60 +1,59 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 需要显示的提示文字
         text: {
             type: [String, Number],
-            default: defprops.tooltip.text
+            default: () => uni.$u.props.tooltip.text
         },
         // 点击复制按钮时，复制的文本，为空则使用text值
         copyText: {
             type: [String, Number],
-            default: defprops.tooltip.copyText
+            default: () => uni.$u.props.tooltip.copyText
         },
         // 文本大小
         size: {
             type: [String, Number],
-            default: defprops.tooltip.size
+            default: () => uni.$u.props.tooltip.size
         },
         // 字体颜色
         color: {
             type: String,
-            default: defprops.tooltip.color
+            default: () => uni.$u.props.tooltip.color
         },
         // 弹出提示框时，文本的背景色
         bgColor: {
             type: String,
-            default: defprops.tooltip.bgColor
+            default: () => uni.$u.props.tooltip.bgColor
         },
         // 弹出提示的方向，top-上方，bottom-下方
         direction: {
             type: String,
-            default: defprops.tooltip.direction
+            default: () => uni.$u.props.tooltip.direction
         },
         // 弹出提示的z-index，nvue无效
         zIndex: {
             type: [String, Number],
-            default: defprops.tooltip.zIndex
+            default: () => uni.$u.props.tooltip.zIndex
         },
         // 是否显示复制按钮
         showCopy: {
             type: Boolean,
-            default: defprops.tooltip.showCopy
+            default: () => uni.$u.props.tooltip.showCopy
         },
         // 扩展的按钮组
         buttons: {
             type: Array,
-            default: defprops.tooltip.buttons
+            default: () => uni.$u.props.tooltip.buttons
         },
         // 是否显示透明遮罩以防止触摸穿透
         overlay: {
             type: Boolean,
-            default: defprops.tooltip.overlay
+            default: () => uni.$u.props.tooltip.overlay
         },
         // 是否显示复制成功或者失败的toast
         showToast: {
             type: Boolean,
-            default: defprops.tooltip.showToast
+            default: () => uni.$u.props.tooltip.showToast
         }
     }
 }

package/components/u-tr/props.js

@@ -1,4 +1,3 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
 

package/components/u-transition/props.js

@@ -1,25 +1,24 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否展示组件
         show: {
             type: Boolean,
-            default: defprops.transition.show
+            default: () => uni.$u.props.transition.show
         },
         // 使用的动画模式
         mode: {
             type: String,
-            default: defprops.transition.mode
+            default: () => uni.$u.props.transition.mode
         },
         // 动画的执行时间，单位ms
         duration: {
             type: [String, Number],
-            default: defprops.transition.duration
+            default: () => uni.$u.props.transition.duration
         },
         // 使用的动画过渡函数
         timingFunction: {
             type: String,
-            default: defprops.transition.timingFunction
+            default: () => uni.$u.props.transition.timingFunction
         }
     }
 }

package/components/u-transition/transition.js

@@ -1,8 +1,8 @@
 // 定义一个一定时间后自动成功的promise，让调用nextTick方法处，进入下一个then方法
 const waitTick = () => new Promise(resolve => setTimeout(resolve, 1000 / 50))
 // nvue动画模块实现细节抽离在外部文件
-// #ifdef APP-NVUE
-import animationMap from './nvue-ani-map.js'
+// #ifdef APP-NVUE
+import animationMap from './nvue-ani-map.js'
 // #endif
 
 // #ifndef APP-NVUE
@@ -20,8 +20,8 @@ const getClassNames = (name) => ({
 // https://weex.apache.org/zh/docs/modules/animation.html#transition
 const animation = uni.requireNativePlugin('animation')
 const getStyle = (name) => animationMap[name]
-// #endif
-
+// #endif
+
 import { nextTick } from 'vue'
 
 export default {
@@ -41,11 +41,10 @@ export default {
             this.inited = true
             this.display = true
             this.classes = classNames.enter
-			await nextTick();
+			await nextTick();
 			{
-				// #ifdef H5
+                // https://github.com/umicro/uView2.0/issues/545
 				await uni.$u.sleep(20)
-				// #endif
                 // 标识动画尚未结束
                 this.$emit('enter')
                 this.transitionEnded = false
@@ -66,7 +65,7 @@ export default {
             // 获得类名
             this.classes = classNames.leave
 
-            await nextTick();
+            await nextTick();
 			{
                // 动画正在离场的状态
                this.transitionEnded = false
@@ -94,7 +93,7 @@ export default {
                 opacity: 0
             }
             // 等待弹窗内容渲染完成
-            await nextTick();
+            await nextTick();
 			{
                 // 合并样式
                 this.viewStyle = currentStyle.enter

package/components/u-upload/props.js

@@ -1,45 +1,44 @@
-import defprops from '../../libs/config/props';
 export default {
     props: {
         // 接受的文件类型, 可选值为all media image file video
         accept: {
             type: String,
-            default: defprops.upload.accept
+            default: () => uni.$u.props.upload.accept
         },
         // 	图片或视频拾取模式，当accept为image类型时设置capture可选额外camera可以直接调起摄像头
         capture: {
             type: [String, Array],
-            default: defprops.upload.capture
+            default: () => uni.$u.props.upload.capture
         },
         // 当accept为video时生效，是否压缩视频，默认为true
         compressed: {
             type: Boolean,
-            default: defprops.upload.compressed
+            default: () => uni.$u.props.upload.compressed
         },
         // 当accept为video时生效，可选值为back或front
         camera: {
             type: String,
-            default: defprops.upload.camera
+            default: () => uni.$u.props.upload.camera
         },
         // 当accept为video时生效，拍摄视频最长拍摄时间，单位秒
         maxDuration: {
             type: Number,
-            default: defprops.upload.maxDuration
+            default: () => uni.$u.props.upload.maxDuration
         },
         // 上传区域的图标，只能内置图标
         uploadIcon: {
             type: String,
-            default: defprops.upload.uploadIcon
+            default: () => uni.$u.props.upload.uploadIcon
         },
         // 上传区域的图标的颜色，默认
         uploadIconColor: {
             type: String,
-            default: defprops.upload.uploadIconColor
+            default: () => uni.$u.props.upload.uploadIconColor
         },
         // 是否开启文件读取前事件
         useBeforeRead: {
             type: Boolean,
-            default: defprops.upload.useBeforeRead
+            default: () => uni.$u.props.upload.useBeforeRead
         },
         // 读取后的处理函数
         afterRead: {
@@ -54,72 +53,72 @@ export default {
         // 是否显示组件自带的图片预览功能
         previewFullImage: {
             type: Boolean,
-            default: defprops.upload.previewFullImage
+            default: () => uni.$u.props.upload.previewFullImage
         },
         // 最大上传数量
         maxCount: {
             type: [String, Number],
-            default: defprops.upload.maxCount
+            default: () => uni.$u.props.upload.maxCount
         },
         // 是否启用
         disabled: {
             type: Boolean,
-            default: defprops.upload.disabled
+            default: () => uni.$u.props.upload.disabled
         },
         // 预览上传的图片时的裁剪模式，和image组件mode属性一致
         imageMode: {
             type: String,
-            default: defprops.upload.imageMode
+            default: () => uni.$u.props.upload.imageMode
         },
         // 标识符，可以在回调函数的第二项参数中获取
         name: {
             type: String,
-            default: defprops.upload.name
+            default: () => uni.$u.props.upload.name
         },
         // 所选的图片的尺寸, 可选值为original compressed
         sizeType: {
             type: Array,
-            default: defprops.upload.sizeType
+            default: () => uni.$u.props.upload.sizeType
         },
         // 是否开启图片多选，部分安卓机型不支持
         multiple: {
             type: Boolean,
-            default: defprops.upload.multiple
+            default: () => uni.$u.props.upload.multiple
         },
         // 是否展示删除按钮
         deletable: {
             type: Boolean,
-            default: defprops.upload.deletable
+            default: () => uni.$u.props.upload.deletable
         },
         // 文件大小限制，单位为byte
         maxSize: {
             type: [String, Number],
-            default: defprops.upload.maxSize
+            default: () => uni.$u.props.upload.maxSize
         },
         // 显示已上传的文件列表
         fileList: {
             type: Array,
-            default: defprops.upload.fileList
+            default: () => uni.$u.props.upload.fileList
         },
         // 上传区域的提示文字
         uploadText: {
             type: String,
-            default: defprops.upload.uploadText
+            default: () => uni.$u.props.upload.uploadText
         },
         // 内部预览图片区域和选择图片按钮的区域宽度
         width: {
             type: [String, Number],
-            default: defprops.upload.width
+            default: () => uni.$u.props.upload.width
         },
         // 内部预览图片区域和选择图片按钮的区域高度
         height: {
             type: [String, Number],
-            default: defprops.upload.height
+            default: () => uni.$u.props.upload.height
         },
         // 是否在上传完成后展示预览图
         previewImage: {
             type: Boolean,
-            default: defprops.upload.previewImage
+            default: () => uni.$u.props.upload.previewImage
         }
     }
 }

package/libs/config/props/actionSheet.js

@@ -13,7 +13,7 @@ export default {
         show: false,
         title: '',
         description: '',
-        actions: () => [],
+        actions: [],
         index: '',
         cancelText: '',
         closeOnClickAction: true,

package/libs/config/props/album.js

@@ -10,7 +10,7 @@
 export default {
     // album 组件
     album: {
-        urls: () => [],
+        urls: [],
         keyName: '',
         singleSize: 180,
         multipleSize: 70,

package/libs/config/props/avatarGroup.js

@@ -10,7 +10,7 @@
 export default {
     // avatarGroup 组件
     avatarGroup: {
-        urls: () => [],
+        urls: [],
         maxCount: 5,
         shape: 'circle',
         mode: 'scaleToFill',

package/libs/config/props/backtop.js

@@ -19,9 +19,9 @@ export default {
         bottom: 100,
         right: 20,
         zIndex: 9,
-        iconStyle: () => ({
+        iconStyle: {
             color: '#909399',
             fontSize: '19px'
-        })
+        }
     }
 }

package/libs/config/props/badge.js

@@ -20,7 +20,7 @@ export default {
         color: null,
         shape: 'circle',
         numberType: 'overflow',
-        offset: () => [],
+        offset: [],
         inverted: false,
         absolute: false
     }

package/libs/config/props/calendar.js

@@ -16,7 +16,7 @@ export default {
         mode: 'single',
         startText: '开始',
         endText: '结束',
-        customList: () => [],
+        customList: [],
         color: '#3c9cff',
         minDate: 0,
         maxDate: 0,
@@ -35,8 +35,8 @@ export default {
         maxRange: Number.MAX_SAFE_INTEGER, // Infinity
         rangePrompt: '',
         showRangePrompt: true,
-        allowSameDay: false,
-		round: 0,
+        allowSameDay: false,
+		round: 0,
 		monthNum: 3
     }
 }

package/libs/config/props/checkboxGroup.js

@@ -11,7 +11,7 @@ export default {
     // checkbox-group组件
     checkboxGroup: {
         name: '',
-        value: () => [],
+        value: [],
         shape: 'square',
         disabled: false,
         activeColor: '#2979ff',

package/libs/config/props/datetimePicker.js

@@ -32,6 +32,6 @@ export default {
         confirmColor: '#3c9cff',
         visibleItemCount: 5,
         closeOnClickOverlay: false,
-        defaultIndex: () => []
+        defaultIndex: []
     }
 }

package/libs/config/props/form.js

@@ -10,13 +10,13 @@
 export default {
     // form 组件
     form: {
-        model: () => ({}),
-        rules: () => ({}),
+        model: {},
+        rules: {},
         errorType: 'message',
         borderBottom: true,
         labelPosition: 'left',
         labelWidth: 45,
         labelAlign: 'left',
-        labelStyle: () => ({})
+        labelStyle: {}
     }
 }

package/libs/config/props/formItem.js

@@ -12,6 +12,7 @@ export default {
     formItem: {
         label: '',
         prop: '',
+        rule: '',
         borderBottom: '',
         labelWidth: '',
         rightIcon: '',

package/libs/config/props/indexList.js

@@ -12,7 +12,7 @@ export default {
     indexList: {
         inactiveColor: '#606266',
         activeColor: '#5677fc',
-        indexList: () => [],
+        indexList: [],
         sticky: true,
         customNavHeight: 0
     }

package/libs/config/props/noticeBar.js

@@ -10,7 +10,7 @@
 export default {
     // noticeBar
     noticeBar: {
-        text: () => [],
+        text: [],
         direction: 'row',
         step: false,
         icon: 'volume',

package/libs/config/props/picker.js

@@ -14,7 +14,7 @@ export default {
 		popupMode: 'bottom',
         showToolbar: true,
         title: '',
-        columns: () => [],
+        columns: [],
         loading: false,
         itemHeight: 44,
         cancelText: '取消',
@@ -24,7 +24,7 @@ export default {
         visibleItemCount: 5,
         keyName: 'text',
         closeOnClickOverlay: false,
-        defaultIndex: () => [],
+        defaultIndex: [],
 		immediateChange: false
     }
 }