uview-plus 3.0.14 → 3.1.0

package/components/u-link/u-link.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';
 
 	/**
 	 * link 超链接
@@ -26,7 +28,7 @@
 	 */
 	export default {
 		name: "u-link",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 		computed: {
 			linkStyle() {
 				const style = {

package/components/u-list/props.js

@@ -1,74 +1,75 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 控制是否出现滚动条，仅nvue有效
         showScrollbar: {
             type: Boolean,
-            default: uni.$u.props.list.showScrollbar
+            default: defprops.list.showScrollbar
         },
         // 距底部多少时触发scrolltolower事件
         lowerThreshold: {
             type: [String, Number],
-            default: uni.$u.props.list.lowerThreshold
+            default: defprops.list.lowerThreshold
         },
         // 距顶部多少时触发scrolltoupper事件，非nvue有效
         upperThreshold: {
             type: [String, Number],
-            default: uni.$u.props.list.upperThreshold
+            default: defprops.list.upperThreshold
         },
         // 设置竖向滚动条位置
         scrollTop: {
             type: [String, Number],
-            default: uni.$u.props.list.scrollTop
+            default: defprops.list.scrollTop
         },
         // 控制 onscroll 事件触发的频率，仅nvue有效
         offsetAccuracy: {
             type: [String, Number],
-            default: uni.$u.props.list.offsetAccuracy
+            default: defprops.list.offsetAccuracy
         },
         // 启用 flexbox 布局。开启后，当前节点声明了display: flex就会成为flex container，并作用于其孩子节点，仅微信小程序有效
         enableFlex: {
             type: Boolean,
-            default: uni.$u.props.list.enableFlex
+            default: defprops.list.enableFlex
         },
         // 是否按分页模式显示List，默认值false
         pagingEnabled: {
             type: Boolean,
-            default: uni.$u.props.list.pagingEnabled
+            default: defprops.list.pagingEnabled
         },
         // 是否允许List滚动
         scrollable: {
             type: Boolean,
-            default: uni.$u.props.list.scrollable
+            default: defprops.list.scrollable
         },
         // 值应为某子元素id（id不能以数字开头）
         scrollIntoView: {
             type: String,
-            default: uni.$u.props.list.scrollIntoView
+            default: defprops.list.scrollIntoView
         },
         // 在设置滚动条位置时使用动画过渡
         scrollWithAnimation: {
             type: Boolean,
-            default: uni.$u.props.list.scrollWithAnimation
+            default: defprops.list.scrollWithAnimation
         },
         // iOS点击顶部状态栏、安卓双击标题栏时，滚动条返回顶部，只对微信小程序有效
         enableBackToTop: {
             type: Boolean,
-            default: uni.$u.props.list.enableBackToTop
+            default: defprops.list.enableBackToTop
         },
         // 列表的高度
         height: {
             type: [String, Number],
-            default: uni.$u.props.list.height
+            default: defprops.list.height
         },
         // 列表宽度
         width: {
             type: [String, Number],
-            default: uni.$u.props.list.width
+            default: defprops.list.width
         },
         // 列表前后预渲染的屏数，1代表一个屏幕的高度，1.5代表1个半屏幕高度
         preLoadScreen: {
             type: [String, Number],
-            default: uni.$u.props.list.preLoadScreen
+            default: defprops.list.preLoadScreen
         }
         // vue下，是否开启虚拟列表
 

package/components/u-list/u-list.vue

@@ -38,6 +38,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
@@ -65,7 +67,7 @@
 	 */
 	export default {
 		name: 'u-list',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 		watch: {
 			scrollIntoView(n) {
 				this.scrollIntoViewById(n)

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

@@ -1,9 +1,10 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 用于滚动到指定item
         anchor: {
             type: [String, Number],
-            default: uni.$u.props.listItem.anchor
+            default: defprops.listItem.anchor
         }
     }
 }

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

@@ -17,6 +17,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
@@ -29,7 +31,7 @@
 	 */
 	export default {
 		name: 'u-list-item',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				// 节点信息

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

@@ -1,59 +1,60 @@
+import defprops from '../../libs/config/props';
 export default {
     props: {
         // 是否显示组件
         show: {
             type: Boolean,
-            default: uni.$u.props.loadingIcon.show
+            default: defprops.loadingIcon.show
         },
         // 颜色
         color: {
             type: String,
-            default: uni.$u.props.loadingIcon.color
+            default: defprops.loadingIcon.color
         },
         // 提示文字颜色
         textColor: {
             type: String,
-            default: uni.$u.props.loadingIcon.textColor
+            default: defprops.loadingIcon.textColor
         },
         // 文字和图标是否垂直排列
         vertical: {
             type: Boolean,
-            default: uni.$u.props.loadingIcon.vertical
+            default: defprops.loadingIcon.vertical
         },
         // 模式选择，circle-圆形，spinner-花朵形，semicircle-半圆形
         mode: {
             type: String,
-            default: uni.$u.props.loadingIcon.mode
+            default: defprops.loadingIcon.mode
         },
         // 图标大小，单位默认px
         size: {
             type: [String, Number],
-            default: uni.$u.props.loadingIcon.size
+            default: defprops.loadingIcon.size
         },
         // 文字大小
         textSize: {
             type: [String, Number],
-            default: uni.$u.props.loadingIcon.textSize
+            default: defprops.loadingIcon.textSize
         },
         // 文字内容
         text: {
             type: [String, Number],
-            default: uni.$u.props.loadingIcon.text
+            default: defprops.loadingIcon.text
         },
         // 动画模式
         timingFunction: {
             type: String,
-            default: uni.$u.props.loadingIcon.timingFunction
+            default: defprops.loadingIcon.timingFunction
         },
         // 动画执行周期时间
         duration: {
             type: [String, Number],
-            default: uni.$u.props.loadingIcon.duration
+            default: defprops.loadingIcon.duration
         },
         // mode=circle时的暗边颜色
         inactiveColor: {
             type: String,
-            default: uni.$u.props.loadingIcon.inactiveColor
+            default: defprops.loadingIcon.inactiveColor
         }
     }
-}
+}

package/components/u-loading-icon/u-loading-icon.vue

@@ -58,7 +58,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';
 	// #ifdef APP-NVUE
 	const animation = weex.requireModule('animation');
 	// #endif
@@ -82,7 +84,7 @@
 	 */
 	export default {
 		name: 'u-loading-icon',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				// Array.form可以通过一个伪数组对象创建指定长度的数组

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

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

package/components/u-loading-page/u-loading-page.vue

@@ -48,6 +48,8 @@
 
 <script>
 import props from "./props.js";
+import mpMixin from '../../libs/mixin/mpMixin.js';
+import mixin from '../../libs/mixin/mixin.js';
 /**
  * loadingPage 加载动画
  * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
@@ -66,7 +68,7 @@ import props from "./props.js";
  */
 export default {
     name: "u-loading-page",
-    mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+    mixins: [mpMixin, mixin, props],
     data() {
         return {};
     },

package/components/u-loadmore/props.js

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

package/components/u-loadmore/u-loadmore.vue

@@ -53,6 +53,8 @@
 
 <script>
 	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 
 	/**
 	 * loadmore 加载更多
@@ -81,7 +83,7 @@
 	 */
 	export default {
 		name: "u-loadmore",
-		mixins: [uni.$u.mpMixin, uni.$u.mixin,props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				// 粗点

package/components/u-modal/props.js

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

package/components/u-modal/u-modal.vue

@@ -90,7 +90,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';
 	/**
 	 * Modal 模态框
 	 * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作。
@@ -118,7 +120,7 @@
 	 */
 	export default {
 		name: 'u-modal',
-		mixins: [uni.$u.mpMixin, uni.$u.mixin, props],
+		mixins: [mpMixin, mixin, props],
 		data() {
 			return {
 				loading: false