uview-plus 3.0.17 → 3.1.3

package/components/u-number-keyboard/u-number-keyboard.vue

@@ -40,6 +40,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 
 	/**
 	 * keyboard 键盘组件
@@ -53,7 +55,7 @@
 	 * @example
 	 */
 	export default {
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				backspace: 'backspace', // 退格键内容

package/components/u-overlay/props.js

@@ -1,24 +1,25 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否显示遮罩
         show: {
             type: Boolean,
-            default: uni.$u.props.overlay.show
+            default: defprops.overlay.show
         },
         // 层级z-index
         zIndex: {
             type: [String, Number],
-            default: uni.$u.props.overlay.zIndex
+            default: defprops.overlay.zIndex
         },
         // 遮罩的过渡时间，单位为ms
         duration: {
             type: [String, Number],
-            default: uni.$u.props.overlay.duration
+            default: defprops.overlay.duration
         },
         // 不透明度值，当做rgba的第四个参数
         opacity: {
             type: [String, Number],
-            default: uni.$u.props.overlay.opacity
+            default: defprops.overlay.opacity
         }
     }
 }

package/components/u-overlay/u-overlay.vue

@@ -12,6 +12,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 
 	/**
 	 * overlay 遮罩
@@ -27,7 +29,7 @@
 	 */
 	export default {
 		name: "u-overlay",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin,props],
 		computed: {
 			overlayStyle() {
 				const style = {

package/components/u-parse/props.js

@@ -1,3 +1,4 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // #ifdef APP-PLUS-NVUE
@@ -6,38 +7,38 @@ export default {
         content: String,
         copyLink: {
 		  type: Boolean,
-		  default: uni.$u.props.parse.copyLink
+		  default: defprops.parse.copyLink
         },
         domain: String,
         errorImg: {
 		  type: String,
-		  default: uni.$u.props.parse.errorImg
+		  default: defprops.parse.errorImg
         },
         lazyLoad: {
 		  type: Boolean,
-		  default: uni.$u.props.parse.lazyLoad
+		  default: defprops.parse.lazyLoad
         },
         loadingImg: {
 		  type: String,
-		  default: uni.$u.props.parse.loadingImg
+		  default: defprops.parse.loadingImg
         },
         pauseVideo: {
 		  type: Boolean,
-		  default: uni.$u.props.parse.pauseVideo
+		  default: defprops.parse.pauseVideo
         },
         previewImg: {
 		  type: Boolean,
-		  default: uni.$u.props.parse.previewImg
+		  default: defprops.parse.previewImg
         },
         scrollTable: Boolean,
         selectable: Boolean,
         setTitle: {
 		  type: Boolean,
-		  default: uni.$u.props.parse.setTitle
+		  default: defprops.parse.setTitle
         },
         showImgMenu: {
 		  type: Boolean,
-		  default: uni.$u.props.parse.showImgMenu
+		  default: defprops.parse.showImgMenu
         },
         tagStyle: Object,
         useAnchor: null

package/components/u-picker/props.js

@@ -1,79 +1,80 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否展示picker弹窗
         show: {
             type: Boolean,
-            default: uni.$u.props.picker.show
+            default: defprops.picker.show
         },
         // 是否展示顶部的操作栏
         showToolbar: {
             type: Boolean,
-            default: uni.$u.props.picker.showToolbar
+            default: defprops.picker.showToolbar
         },
         // 顶部标题
         title: {
             type: String,
-            default: uni.$u.props.picker.title
+            default: defprops.picker.title
         },
         // 对象数组，设置每一列的数据
         columns: {
             type: Array,
-            default: uni.$u.props.picker.columns
+            default: defprops.picker.columns
         },
         // 是否显示加载中状态
         loading: {
             type: Boolean,
-            default: uni.$u.props.picker.loading
+            default: defprops.picker.loading
         },
         // 各列中，单个选项的高度
         itemHeight: {
             type: [String, Number],
-            default: uni.$u.props.picker.itemHeight
+            default: defprops.picker.itemHeight
         },
         // 取消按钮的文字
         cancelText: {
             type: String,
-            default: uni.$u.props.picker.cancelText
+            default: defprops.picker.cancelText
         },
         // 确认按钮的文字
         confirmText: {
             type: String,
-            default: uni.$u.props.picker.confirmText
+            default: defprops.picker.confirmText
         },
         // 取消按钮的颜色
         cancelColor: {
             type: String,
-            default: uni.$u.props.picker.cancelColor
+            default: defprops.picker.cancelColor
         },
         // 确认按钮的颜色
         confirmColor: {
             type: String,
-            default: uni.$u.props.picker.confirmColor
+            default: defprops.picker.confirmColor
         },
         // 每列中可见选项的数量
         visibleItemCount: {
             type: [String, Number],
-            default: uni.$u.props.picker.visibleItemCount
+            default: defprops.picker.visibleItemCount
         },
         // 选项对象中，需要展示的属性键名
         keyName: {
             type: String,
-            default: uni.$u.props.picker.keyName
+            default: defprops.picker.keyName
         },
         // 是否允许点击遮罩关闭选择器
         closeOnClickOverlay: {
             type: Boolean,
-            default: uni.$u.props.picker.closeOnClickOverlay
+            default: defprops.picker.closeOnClickOverlay
         },
         // 各列的默认索引
         defaultIndex: {
             type: Array,
-            default: uni.$u.props.picker.defaultIndex
+            default: defprops.picker.defaultIndex
         },
 		// 是否在手指松开时立即触发 change 事件。若不开启则会在滚动动画结束后触发 change 事件，只在微信2.21.1及以上有效
 		immediateChange: {
 			type: Boolean,
-			default: uni.$u.props.picker.immediateChange
+			default: defprops.picker.immediateChange
 		}
     }
 }

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

@@ -77,9 +77,11 @@
  * @event {Function} confirm	点击确定按钮，返回当前选择的值
  */
 import props from './props.js';
+import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 export default {
 	name: 'u-picker',
-	mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+	mixins: [mpMixin, mixin, props],
 	data() {
 		return {
 			// 上一次选择的列索引

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

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

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

@@ -8,6 +8,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	/**
 	 * PickerColumn 
 	 * @description 
@@ -18,7 +20,7 @@
 	 */
 	export default {
 		name: 'u-picker-column',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 	}
 </script>
 

package/components/u-popup/props.js

@@ -1,79 +1,80 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否展示弹窗
         show: {
             type: Boolean,
-            default: uni.$u.props.popup.show
+            default: defprops.popup.show
         },
         // 是否显示遮罩
         overlay: {
             type: Boolean,
-            default: uni.$u.props.popup.overlay
+            default: defprops.popup.overlay
         },
         // 弹出的方向，可选值为 top bottom right left center
         mode: {
             type: String,
-            default: uni.$u.props.popup.mode
+            default: defprops.popup.mode
         },
         // 动画时长，单位ms
         duration: {
             type: [String, Number],
-            default: uni.$u.props.popup.duration
+            default: defprops.popup.duration
         },
         // 是否显示关闭图标
         closeable: {
             type: Boolean,
-            default: uni.$u.props.popup.closeable
+            default: defprops.popup.closeable
         },
         // 自定义遮罩的样式
         overlayStyle: {
             type: [Object, String],
-            default: uni.$u.props.popup.overlayStyle
+            default: defprops.popup.overlayStyle
         },
         // 点击遮罩是否关闭弹窗
         closeOnClickOverlay: {
             type: Boolean,
-            default: uni.$u.props.popup.closeOnClickOverlay
+            default: defprops.popup.closeOnClickOverlay
         },
         // 层级
         zIndex: {
             type: [String, Number],
-            default: uni.$u.props.popup.zIndex
+            default: defprops.popup.zIndex
         },
         // 是否为iPhoneX留出底部安全距离
         safeAreaInsetBottom: {
             type: Boolean,
-            default: uni.$u.props.popup.safeAreaInsetBottom
+            default: defprops.popup.safeAreaInsetBottom
         },
         // 是否留出顶部安全距离（状态栏高度）
         safeAreaInsetTop: {
             type: Boolean,
-            default: uni.$u.props.popup.safeAreaInsetTop
+            default: defprops.popup.safeAreaInsetTop
         },
         // 自定义关闭图标位置，top-left为左上角，top-right为右上角，bottom-left为左下角，bottom-right为右下角
         closeIconPos: {
             type: String,
-            default: uni.$u.props.popup.closeIconPos
+            default: defprops.popup.closeIconPos
         },
         // 是否显示圆角
         round: {
             type: [Boolean, String, Number],
-            default: uni.$u.props.popup.round
+            default: defprops.popup.round
         },
         // mode=center，也即中部弹出时，是否使用缩放模式
         zoom: {
             type: Boolean,
-            default: uni.$u.props.popup.zoom
+            default: defprops.popup.zoom
         },
         // 弹窗背景色，设置为transparent可去除白色背景
         bgColor: {
             type: String,
-            default: uni.$u.props.popup.bgColor
+            default: defprops.popup.bgColor
         },
         // 遮罩的透明度，0-1之间
         overlayOpacity: {
             type: [Number, String],
-            default: uni.$u.props.popup.overlayOpacity
+            default: defprops.popup.overlayOpacity
         }
     }
 }

package/components/u-popup/u-popup.vue

@@ -45,7 +45,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';
 
 	/**
 	 * popup 弹窗
@@ -73,7 +75,7 @@
 	 */
 	export default {
 		name: 'u-popup',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				overlayDuration: this.duration + 50

package/components/u-radio/props.js

@@ -1,64 +1,65 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // radio的名称
         name: {
             type: [String, Number, Boolean],
-            default: uni.$u.props.radio.name
+            default: defprops.radio.name
         },
         // 形状，square为方形，circle为圆型
         shape: {
             type: String,
-            default: uni.$u.props.radio.shape
+            default: defprops.radio.shape
         },
         // 是否禁用
         disabled: {
             type: [String, Boolean],
-            default: uni.$u.props.radio.disabled
+            default: defprops.radio.disabled
         },
         // 是否禁止点击提示语选中单选框
         labelDisabled: {
             type: [String, Boolean],
-            default: uni.$u.props.radio.labelDisabled
+            default: defprops.radio.labelDisabled
         },
         // 选中状态下的颜色，如设置此值，将会覆盖parent的activeColor值
         activeColor: {
             type: String,
-            default: uni.$u.props.radio.activeColor
+            default: defprops.radio.activeColor
         },
         // 未选中的颜色
         inactiveColor: {
             type: String,
-            default: uni.$u.props.radio.inactiveColor
+            default: defprops.radio.inactiveColor
         },
         // 图标的大小，单位px
         iconSize: {
             type: [String, Number],
-            default: uni.$u.props.radio.iconSize
+            default: defprops.radio.iconSize
         },
         // label的字体大小，px单位
         labelSize: {
             type: [String, Number],
-            default: uni.$u.props.radio.labelSize
+            default: defprops.radio.labelSize
         },
         // label提示文字，因为nvue下，直接slot进来的文字，由于特殊的结构，无法修改样式
         label: {
             type: [String, Number],
-            default: uni.$u.props.radio.label
+            default: defprops.radio.label
         },
         // 整体的大小
         size: {
             type: [String, Number],
-            default: uni.$u.props.radio.size
+            default: defprops.radio.size
         },
         // 图标颜色
         color: {
             type: String,
-            default: uni.$u.props.radio.color
+            default: defprops.radio.color
         },
         // label的颜色
         labelColor: {
             type: String,
-            default: uni.$u.props.radio.labelColor
+            default: defprops.radio.labelColor
         }
     }
 }

package/components/u-radio/u-radio.vue

@@ -34,6 +34,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	/**
 	 * radio 单选框
 	 * @description 单选框用于有一个选择，用户只能选择其中一个的场景。搭配u-radio-group使用
@@ -58,7 +60,7 @@
 	export default {
 		name: "u-radio",
 		
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin,props],
 		data() {
 			return {
 				checked: false,

package/components/u-radio-group/props.js

@@ -1,93 +1,94 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // #ifdef VUE3
         // 绑定的值
         modelValue: {
             type: [String, Number, Boolean],
-            default: uni.$u.props.radioGroup.value
+            default: defprops.radioGroup.value
         },
         // #endif
         // #ifdef VUE2
         // 绑定的值
         value: {
             type: [String, Number, Boolean],
-            default: uni.$u.props.radioGroup.value
+            default: defprops.radioGroup.value
         },
         // #endif
         // 是否禁用全部radio
         disabled: {
             type: Boolean,
-            default: uni.$u.props.radioGroup.disabled
+            default: defprops.radioGroup.disabled
         },
         // 形状，circle-圆形，square-方形
         shape: {
             type: String,
-            default: uni.$u.props.radioGroup.shape
+            default: defprops.radioGroup.shape
         },
         // 选中状态下的颜色，如设置此值，将会覆盖parent的activeColor值
         activeColor: {
             type: String,
-            default: uni.$u.props.radioGroup.activeColor
+            default: defprops.radioGroup.activeColor
         },
         // 未选中的颜色
         inactiveColor: {
             type: String,
-            default: uni.$u.props.radioGroup.inactiveColor
+            default: defprops.radioGroup.inactiveColor
         },
         // 标识符
         name: {
             type: String,
-            default: uni.$u.props.radioGroup.name
+            default: defprops.radioGroup.name
         },
         // 整个组件的尺寸，默认px
         size: {
             type: [String, Number],
-            default: uni.$u.props.radioGroup.size
+            default: defprops.radioGroup.size
         },
         // 布局方式，row-横向，column-纵向
         placement: {
             type: String,
-            default: uni.$u.props.radioGroup.placement
+            default: defprops.radioGroup.placement
         },
         // label的文本
         label: {
             type: [String],
-            default: uni.$u.props.radioGroup.label
+            default: defprops.radioGroup.label
         },
         // label的颜色 （默认 '#303133' ）
         labelColor: {
             type: [String],
-            default: uni.$u.props.radioGroup.labelColor
+            default: defprops.radioGroup.labelColor
         },
         // label的字体大小，px单位
         labelSize: {
             type: [String, Number],
-            default: uni.$u.props.radioGroup.labelSize
+            default: defprops.radioGroup.labelSize
         },
         // 是否禁止点击文本操作checkbox(默认 false )
         labelDisabled: {
             type: Boolean,
-            default: uni.$u.props.radioGroup.labelDisabled
+            default: defprops.radioGroup.labelDisabled
         },
         // 图标颜色
         iconColor: {
             type: String,
-            default: uni.$u.props.radioGroup.iconColor
+            default: defprops.radioGroup.iconColor
         },
         // 图标的大小，单位px
         iconSize: {
             type: [String, Number],
-            default: uni.$u.props.radioGroup.iconSize
+            default: defprops.radioGroup.iconSize
         },
         // 竖向配列时，是否显示下划线
         borderBottom: {
             type: Boolean,
-            default: uni.$u.props.radioGroup.borderBottom
+            default: defprops.radioGroup.borderBottom
         },
         // 图标与文字的对齐方式
         iconPlacement: {
             type: String,
-            default: uni.$u.props.radio.iconPlacement
+            default: defprops.radio.iconPlacement
         }
     }
 }

package/components/u-radio-group/u-radio-group.vue

@@ -9,6 +9,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 
 	/**
 	 * radioRroup 单选框父组件
@@ -36,7 +38,7 @@
 	 */
 	export default {
 		name: 'u-radio-group',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 		computed: {
 			// 这里computed的变量，都是子组件u-radio需要用到的，由于头条小程序的兼容性差异，子组件无法实时监听父组件参数的变化
 			// 所以需要手动通知子组件，这里返回一个parentData变量，供watch监听，在其中去通知每一个子组件重新从父组件(u-radio-group)