uview-plus 3.0.17 → 3.1.0

package/components/u-textarea/props.js

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

package/components/u-textarea/u-textarea.vue

@@ -42,6 +42,8 @@
 
 <script>
 import props from "./props.js";
+import mpMixin from '../../libs/mixin/mpMixin.js';
+import mixin from '../../libs/mixin/mixin.js';
 /**
  * Textarea 文本域
  * @description 文本域此组件满足了可能出现的表单信息补充，编辑等实际逻辑的功能，内置了字数校验等
@@ -81,7 +83,7 @@ import props from "./props.js";
  */
 export default {
     name: "u-textarea",
-    mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+    mixins: [mpMixin, mixin, props],
 	data() {
 		return {
 			// 输入框的值

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

@@ -39,6 +39,8 @@
 </template>
 
 <script>
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	/**
 	 * toast 消息提示
 	 * @description 此组件表现形式类似uni的uni.showToastAPI，但也有不同的地方。
@@ -63,7 +65,7 @@
 	 */
 	export default {
 		name: 'u-toast',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin],
+		mixins: [mpMixin, mixin],
 		data() {
 			return {
 				isShow: false,

package/components/u-toolbar/props.js

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

package/components/u-toolbar/u-toolbar.vue

@@ -37,6 +37,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	/**
 	 * Toolbar 工具条
 	 * @description 
@@ -52,7 +54,7 @@
 	 */
 	export default {
 		name: 'u-toolbar',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 		methods: {
 			// 点击取消按钮
 			cancel() {

package/components/u-tooltip/props.js

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

package/components/u-tooltip/u-tooltip.vue

@@ -91,6 +91,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	// #ifdef APP-NVUE 
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
@@ -119,7 +121,7 @@
 	 */
 	export default {
 		name: 'u-tooltip',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				// 是否展示气泡

package/components/u-tr/props.js

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

package/components/u-tr/u-tr.vue

@@ -6,6 +6,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	/**
 	 * Tr  
 	 * @description 
@@ -16,7 +18,7 @@
 	 */
 	export default {
 		name: 'u-tr',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				

package/components/u-transition/props.js

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

package/components/u-transition/u-transition.vue

@@ -14,6 +14,8 @@
 
 <script>
 import props from './props.js';
+import mpMixin from '../../libs/mixin/mpMixin.js';
+import mixin from '../../libs/mixin/mixin.js';
 // 组件的methods方法，由于内容较长，写在外部文件中通过mixin引入
 import transition from "./transition.js";
 /**
@@ -61,7 +63,7 @@ export default {
 	    }
 	},
 	// 将mixin挂在到组件中，uni.$u.mixin实际上为一个vue格式对象
-	mixins: [uni.$u.mpMixin, uni.$u.mixin, transition, props],
+	mixins: [mpMixin, mixin, transition, props],
 	watch: {
 		show: {
 			handler(newVal) {

package/components/u-upload/props.js

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

package/components/u-upload/u-upload.vue

@@ -128,8 +128,10 @@
 	import {
 		chooseFile
 	} from './utils';
-	import mixin from './mixin.js';
+	import mixinUp from './mixin.js';
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 
 	/**
 	 * upload 上传
@@ -166,7 +168,7 @@
 	 */
 	export default {
 		name: "u-upload",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, mixin,props],
+		mixins: [mpMixin, mixin, mixinUp, props],
 		data() {
 			return {
 				// #ifdef APP-NVUE

package/package.json

@@ -2,7 +2,7 @@
 	"id": "uview-plus",
 	"name": "uview-plus",
 	"displayName": "uview-plus3.0重磅发布，利剑出鞘，一统江湖",
-	"version": "3.0.17",
+	"version": "3.1.0",
 	"description": "uview-plus已兼容vue3，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
 	"keywords": [
         "uview",