uview-plus 3.2.7 → 3.2.9

package/components/u-image/u-image.vue

@@ -19,19 +19,19 @@
 				:lazy-load="lazyLoad"
 				class="u-image__image"
 				:style="{
-					borderRadius: shape == 'circle' ? '10000px' : $u.addUnit(radius),
-					width: $u.addUnit(width),
-					height: $u.addUnit(height)
+					borderRadius: shape == 'circle' ? '10000px' : addUnit(radius),
+					width: addUnit(width),
+					height: addUnit(height)
 				}"
 			></image>
 			<view
 				v-if="showLoading && loading"
 				class="u-image__loading"
 				:style="{
-					borderRadius: shape == 'circle' ? '50%' : $u.addUnit(radius),
+					borderRadius: shape == 'circle' ? '50%' : addUnit(radius),
 					backgroundColor: this.bgColor,
-					width: $u.addUnit(width),
-					height: $u.addUnit(height)
+					width: addUnit(width),
+					height: addUnit(height)
 				}"
 			>
 				<slot name="loading">
@@ -46,9 +46,9 @@
 				v-if="showError && isError && !loading"
 				class="u-image__error"
 				:style="{
-					borderRadius: shape == 'circle' ? '50%' : $u.addUnit(radius),
-					width: $u.addUnit(width),
-					height: $u.addUnit(height)
+					borderRadius: shape == 'circle' ? '50%' : addUnit(radius),
+					width: addUnit(width),
+					height: addUnit(height)
 				}"
 			>
 				<slot name="error">
@@ -64,9 +64,10 @@
 </template>
 
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { addUnit, addStyle, deepMerge } from '../../libs/function/index';
 	/**
 	 * Image 图片
 	 * @description 此组件为uni-app的image组件的加强版，在继承了原有功能外，还支持淡入动画、加载中、加载失败提示、圆角值和形状等。
@@ -131,10 +132,10 @@
 			wrapStyle() {
 				let style = {};
 				// 通过调用addUnit()方法，如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上rpx单位
-				style.width = this.$u.addUnit(this.width);
-				style.height = this.$u.addUnit(this.height);
+				style.width = addUnit(this.width);
+				style.height = addUnit(this.height);
 				// 如果是显示圆形，设置一个很多的半径值即可
-				style.borderRadius = this.shape == 'circle' ? '10000px' : uni.$u.addUnit(this.radius)
+				style.borderRadius = this.shape == 'circle' ? '10000px' : addUnit(this.radius)
 				// 如果设置圆角，必须要有hidden，否则可能圆角无效
 				style.overflow = this.radius > 0 ? 'hidden' : 'visible'
 				// if (this.fade) {
@@ -144,7 +145,7 @@
 				// 	style.transitionTimingFunction = 'ease-in-out'
 				// 	style.transitionProperty = 'opacity'
 				// }
-				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle));
+				return deepMerge(style, addStyle(this.customStyle));
 
 			}
 		},
@@ -153,6 +154,7 @@
 		},
 		emits: ['click', 'error', 'load'],
 		methods: {
+			addUnit,
 			// 点击图片
 			onClick() {
 				this.$emit('click')

package/components/u-index-anchor/u-index-anchor.vue

@@ -6,14 +6,14 @@
 	    class="u-index-anchor u-border-bottom"
 		:ref="`u-index-anchor-${text}`"
 	    :style="{
-			height: $u.addUnit(height),
+			height: addUnit(height),
 			backgroundColor: bgColor
 		}"
 	>
 		<text
 		    class="u-index-anchor__text"
 		    :style="{
-				fontSize: $u.addUnit(size),
+				fontSize: addUnit(size),
 				color: color
 			}"
 		>{{ text }}</text>
@@ -24,9 +24,10 @@
 </template>
 
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { addUnit, $parent, error } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
@@ -52,19 +53,20 @@
 			this.init()
 		},
 		methods: {
+			addUnit,
 			init() {
 				// 此处会活动父组件实例，并赋值给实例的parent属性
-				const indexList = uni.$u.$parent.call(this, 'u-index-list')
+				const indexList = $parent.call(this, 'u-index-list')
 				if (!indexList) { 
-					return uni.$u.error('u-index-anchor必须要搭配u-index-list组件使用')
+					return error('u-index-anchor必须要搭配u-index-list组件使用')
 				}
 				// 将当前实例放入到u-index-list中
 				indexList.anchors.push(this)
-				const indexListItem = uni.$u.$parent.call(this, 'u-index-item')
+				const indexListItem = $parent.call(this, 'u-index-item')
 				// #ifndef APP-NVUE
 				// 只有在非nvue下，u-index-anchor才是嵌套在u-index-item中的
 				if (!indexListItem) {
-					return uni.$u.error('u-index-anchor必须要搭配u-index-item组件使用')
+					return error('u-index-anchor必须要搭配u-index-item组件使用')
 				}
 				// 设置u-index-item的id为anchor的text标识符，因为非nvue下滚动列表需要依赖scroll-view滚动到元素的特性
 				indexListItem.id = this.text.charCodeAt(0)

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

@@ -15,9 +15,10 @@
 </template>
 
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { sleep, error } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	// 由于weex为阿里的KPI业绩考核的产物，所以不支持百分比单位，这里需要通过dom查询组件的宽度
 	const dom = uni.requireNativePlugin('dom')
@@ -53,9 +54,9 @@
 				// 此处会活动父组件实例，并赋值给实例的parent属性
 				this.getParentData('u-index-list')
 				if (!this.parent) {
-					return uni.$u.error('u-index-item必须要搭配u-index-list组件使用')
+					return error('u-index-item必须要搭配u-index-list组件使用')
 				}
-				uni.$u.sleep().then(() =>{
+				sleep().then(() =>{
 					this.getIndexItemRect().then(size => {
 						// 由于对象的引用特性，此处会同时生效到父组件的children数组的本实例的top属性中，供父组件判断读取
 						this.top = Math.ceil(size.top)

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

@@ -6,7 +6,7 @@
 			enable-back-to-top
 			:offset-accuracy="1"
 			:style="{
-				maxHeight: $u.addUnit(scrollViewHeight)
+				maxHeight: addUnit(scrollViewHeight)
 			}"
 			@scroll="scrollHandler"
 			ref="uList"
@@ -29,7 +29,7 @@
 			:scrollIntoView="scrollIntoView"
 			:offset-accuracy="1"
 			:style="{
-				maxHeight: $u.addUnit(scrollViewHeight)
+				maxHeight: addUnit(scrollViewHeight)
 			}"
 			scroll-y
 			@scroll="scrollHandler"
@@ -47,7 +47,7 @@
 		<view
 			class="u-index-list__letter"
 			ref="u-index-list__letter"
-			:style="{ top: $u.addUnit(letterInfo.top || 100) }"
+			:style="{ top: addUnit(letterInfo.top || 100) }"
 			@touchstart.prevent="touchStart"
 			@touchmove.prevent="touchMove"
 			@touchend.prevent="touchEnd"
@@ -73,7 +73,7 @@
 			:customStyle="{
 				position: 'fixed',
 				right: '50px',
-				top: $u.addUnit(indicatorTop),
+				top: addUnit(indicatorTop),
 				zIndex: 2
 			}"
 		>
@@ -81,8 +81,8 @@
 				class="u-index-list__indicator"
 				:class="['u-index-list__indicator--show']"
 				:style="{
-					height: $u.addUnit(indicatorHeight),
-					width: $u.addUnit(indicatorHeight)
+					height: addUnit(indicatorHeight),
+					width: addUnit(indicatorHeight)
 				}"
 			>
 				<text class="u-index-list__indicator__text">{{ uIndexList[activeIndex] }}</text>
@@ -100,9 +100,10 @@
 		}
 		return indexList;
 	}
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { addUnit, sys, sleep, getPx } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	// 由于weex为阿里的KPI业绩考核的产物，所以不支持百分比单位，这里需要通过dom查询组件的宽度
 	const dom = uni.requireNativePlugin('dom')
@@ -148,7 +149,7 @@
 				// scroll-view的高度
 				scrollViewHeight: 0,
 				// 系统信息
-				sys: uni.$u.sys(),
+				sys: sys(),
 				scrolling: false,
 				scrollIntoView: '',
 			}
@@ -172,7 +173,7 @@
 			uIndexList: {
 				immediate: true,
 				handler() {
-					uni.$u.sleep().then(() => {
+					sleep().then(() => {
 						this.setIndexListLetterInfo()
 					})
 				}
@@ -187,11 +188,12 @@
 			this.setIndexListLetterInfo()
 		},
 		methods: {
+			addUnit,
 			init() {
 				// 设置列表的高度为整个屏幕的高度
 				//减去this.customNavHeight，并将this.scrollViewHeight设置为maxHeight
 				//解决当u-index-list组件放在tabbar页面时,scroll-view内容较少时，还能滚动
-				let customNavHeight = uni.$u.getPx(this.customNavHeight)
+				let customNavHeight = getPx(this.customNavHeight)
 				this.scrollViewHeight = this.sys.windowHeight - customNavHeight
 			},
 			// 索引列表被触摸
@@ -226,7 +228,7 @@
 			// 触摸结束
 			touchEnd(e) {
 				// 延时一定时间后再隐藏指示器，为了让用户看的更直观，同时也是为了消除快速切换u-transition的show带来的影响
-				uni.$u.sleep(300).then(() => {
+				sleep(300).then(() => {
 					this.touching = false
 				})
 			},
@@ -254,7 +256,7 @@
 					const {
 						height
 					} = size
-					const sys = uni.$u.sys()
+					const sys = sys()
 					const windowHeight = sys.windowHeight
 					let customNavHeight = 0
 					// 消除各端导航栏非原生和原生导致的差异，让索引列表字母对屏幕垂直居中
@@ -267,7 +269,7 @@
 						customNavHeight = -(sys.statusBarHeight + 44)
 						// #endif
 					} else {
-						customNavHeight = uni.$u.getPx(this.customNavHeight)
+						customNavHeight = getPx(this.customNavHeight)
 					}
 					this.letterInfo = {
 						height,
@@ -286,7 +288,7 @@
 				} = this.letterInfo
 				// 对H5的pageY进行修正，这是由于uni-app自作多情在H5中将触摸点的坐标跟H5的导航栏结合导致的问题
 				// #ifdef H5
-				pageY += uni.$u.sys().windowTop
+				pageY += sys().windowTop
 				// #endif
 				// 对第一和最后一个字母做边界处理，因为用户可能在字母列表上触摸到两端的尽头后依然继续滑动
 				if (pageY < top) {
@@ -311,7 +313,7 @@
 				// #ifdef MP-WEIXIN
 				// 微信小程序下，scroll-view的scroll-into-view属性无法对slot中的内容的id生效，只能通过设置scrollTop的形式去移动滚动条
 				const customNavHeight = this.customNavHeight
-				this.scrollTop = this.children[currentIndex].top - uni.$u.getPx(customNavHeight)
+				this.scrollTop = this.children[currentIndex].top - getPx(customNavHeight)
 				// #endif
 				// #ifdef APP-NVUE
 				// 在nvue中，由于cell和header为同级元素，所以实际是需要对header(anchor)进行偏移
@@ -335,7 +337,7 @@
 				if (this.touching || this.scrolling) return
 				// 每过一定时间取样一次，减少资源损耗以及可能带来的卡顿
 				this.scrolling = true
-				uni.$u.sleep(10).then(() => {
+				sleep(10).then(() => {
 					this.scrolling = false
 				})
 				let scrollTop = 0

package/components/u-input/u-input.vue

@@ -77,8 +77,9 @@
 
 <script>
 import props from "./props.js";
-import mpMixin from '../../libs/mixin/mpMixin.js';
-import mixin from '../../libs/mixin/mixin.js';
+import mpMixin from '../../libs/mixin/mpMixin';
+import mixin from '../../libs/mixin/mixin';
+import { addStyle, addUnit, deepMerge, formValidate, $parent, sleep, os } from '../../libs/function/index';
 /**
  * Input 输入框
  * @description  此组件为一个输入框，默认没有边框和样式，是专门为配合表单组件u-form而设计的，利用它可以快速实现表单验证，输入内容，下拉选择等功能。
@@ -153,7 +154,7 @@ export default {
                     this.valueChange();
                 } else {
 					// 尝试调用u-form的验证方法
-					uni.$u.formValidate(this, "change");
+					formValidate(this, "change");
 				}
                 /* #endif */
                 this.firstChange = false;
@@ -176,7 +177,7 @@ export default {
                     this.valueChange();
                 } else {
 					// 尝试调用u-form的验证方法
-					uni.$u.formValidate(this, "change");
+					formValidate(this, "change");
 				}
                 /* #endif */
                 this.firstChange = false;
@@ -223,13 +224,13 @@ export default {
                 style.paddingLeft = "9px";
                 style.paddingRight = "9px";
             }
-            return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle));
+            return deepMerge(style, addStyle(this.customStyle));
         },
         // 输入框的样式
         inputStyle() {
             const style = {
                 color: this.color,
-                fontSize: uni.$u.addUnit(this.fontSize),
+                fontSize: addUnit(this.fontSize),
 				textAlign: this.inputAlign
             };
             return style;
@@ -261,11 +262,11 @@ export default {
             this.$emit("blur", event.detail.value);
             // H5端的blur会先于点击清除控件的点击click事件触发，导致focused
             // 瞬间为false，从而隐藏了清除控件而无法被点击到
-            uni.$u.sleep(150).then(() => {
+            sleep(150).then(() => {
                 this.focused = false;
             });
             // 尝试调用u-form的验证方法
-            uni.$u.formValidate(this, "blur");
+            formValidate(this, "blur");
         },
         // 输入框聚焦时触发
         onFocus(event) {
@@ -295,7 +296,7 @@ export default {
                 this.changeFromInner = true;
                 this.$emit("change", value);
                 // 尝试调用u-form的验证方法
-                uni.$u.formValidate(this, "change");
+                formValidate(this, "change");
             });
         },
         // 点击清除控件
@@ -313,8 +314,8 @@ export default {
          */
         clickHandler() {
             // #ifdef APP-NVUE
-            if (uni.$u.os() === "android") {
-                const formItem = uni.$u.$parent.call(this, "u-form-item");
+            if (os() === "android") {
+                const formItem = $parent.call(this, "u-form-item");
                 if (formItem) {
                     formItem.clickHandler();
                 }

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

@@ -68,9 +68,9 @@
 </template>
 
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
 
 	/**
 	 * keyboard 键盘

package/components/u-line/u-line.vue

@@ -8,9 +8,10 @@
 </template>
 
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { addUnit, addStyle, deepMerge } from '../../libs/function/index';
 	/**
 	 * line 线条
 	 * @description 此组件一般用于显示一根线条，用于分隔内容块，有横向和竖向两种模式，且能设置0.5px线条，使用也很简单
@@ -36,18 +37,18 @@
 					// 此处采用兼容分开写，兼容nvue的写法
 					style.borderBottomWidth = '1px'
 					style.borderBottomStyle = this.dashed ? 'dashed' : 'solid'
-					style.width = uni.$u.addUnit(this.length)
+					style.width = addUnit(this.length)
 					if (this.hairline) style.transform = 'scaleY(0.5)'
 				} else {
 					// 如果是竖向线条，边框宽度为1px，再通过transform缩小一半，就是0.5px了
 					style.borderLeftWidth = '1px'
 					style.borderLeftStyle = this.dashed ? 'dashed' : 'solid'
-					style.height = uni.$u.addUnit(this.length)
+					style.height = addUnit(this.length)
 					if (this.hairline) style.transform = 'scaleX(0.5)'
 				}
 
 				style.borderColor = this.color
-				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
+				return deepMerge(style, addStyle(this.customStyle))
 			}
 		}
 	}

package/components/u-line-progress/u-line-progress.vue

@@ -1,14 +1,14 @@
 <template>
 	<view
 	    class="u-line-progress"
-	    :style="[$u.addStyle(customStyle)]"
+	    :style="[addStyle(customStyle)]"
 	>
 		<view
 		    class="u-line-progress__background"
 		    ref="u-line-progress__background"
 		    :style="[{
 				backgroundColor: inactiveColor,
-				height: $u.addUnit(height),
+				height: addUnit(height),
 			}]"
 		>
 		</view>
@@ -24,9 +24,10 @@
 </template>
 
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { addUnit, addStyle, sleep, range } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
@@ -60,20 +61,22 @@
 				let style = {}
 				style.width = this.lineWidth
 				style.backgroundColor = this.activeColor
-				style.height = uni.$u.addUnit(this.height)
+				style.height = addUnit(this.height)
 				return style
 			},
 			innserPercentage() {
 				// 控制范围在0-100之间
-				return uni.$u.range(0, 100, this.percentage)
+				return range(0, 100, this.percentage)
 			}
 		},
 		mounted() {
 			this.init()
 		},
 		methods: {
+			addStyle,
+			addUnit,
 			init() {
-				uni.$u.sleep(20).then(() => {
+				sleep(20).then(() => {
 					this.resizeProgressWidth()
 				})
 			},

package/components/u-link/u-link.vue

@@ -2,15 +2,15 @@
 	<text
 	    class="u-link"
 	    @tap.stop="openLink"
-	    :style="[linkStyle, $u.addStyle(customStyle)]"
+	    :style="[linkStyle, addStyle(customStyle)]"
 	>{{text}}</text>
 </template>
 
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
-
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { addStyle, addUnit, getPx, toast } from '../../libs/function/index';
 	/**
 	 * link 超链接
 	 * @description 该组件为超链接组件，在不同平台有不同表现形式：在APP平台会通过plus环境打开内置浏览器，在小程序中把链接复制到粘贴板，同时提示信息，在H5中通过window.open打开链接。
@@ -33,9 +33,9 @@
 			linkStyle() {
 				const style = {
 					color: this.color,
-					fontSize: uni.$u.addUnit(this.fontSize),
+					fontSize: addUnit(this.fontSize),
 					// line-height设置为比字体大小多2px
-					lineHeight: uni.$u.addUnit(uni.$u.getPx(this.fontSize) + 2),
+					lineHeight: addUnit(getPx(this.fontSize) + 2),
 					textDecoration: this.underLine ? 'underline' : 'none'
 				}
 				// if (this.underLine) {
@@ -47,6 +47,7 @@
 		},
 		emits: ["click"],
 		methods: {
+			addStyle,
 			openLink() {
 				// #ifdef APP-PLUS
 				plus.runtime.openURL(this.href)
@@ -60,7 +61,7 @@
 					success: () => {
 						uni.hideToast();
 						this.$nextTick(() => {
-							uni.$u.toast(this.mpTips);
+							toast(this.mpTips);
 						})
 					}
 				});

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

@@ -37,9 +37,10 @@
 </template>
 
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { addUnit, addStyle, deepMerge, sleep, sys } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
@@ -79,18 +80,17 @@
 				innerScrollTop: 0,
 				// vue下，scroll-view在上拉加载时的偏移值
 				offset: 0,
-				sys: uni.$u.sys()
+				sys: sys()
 			}
 		},
 		computed: {
 			listStyle() {
-				const style = {},
-					addUnit = uni.$u.addUnit
+				const style = {};
 				if (this.width != 0) style.width = addUnit(this.width)
 				if (this.height != 0) style.height = addUnit(this.height)
 				// 如果没有定义列表高度，则默认使用屏幕高度
 				if (!style.height) style.height = addUnit(this.sys.windowHeight, 'px')
-				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
+				return deepMerge(style, addStyle(this.customStyle))
 			}
 		},
 		provide() {
@@ -132,14 +132,14 @@
 			},
 			// 滚动到底部触发事件
 			scrolltolower(e) {
-				uni.$u.sleep(30).then(() => {
+				sleep(30).then(() => {
 					this.$emit('scrolltolower')
 				})
 			},
 			// #ifndef APP-NVUE
 			// 滚动到底部时触发，非nvue有效
 			scrolltoupper(e) {
-				uni.$u.sleep(30).then(() => {
+				sleep(30).then(() => {
 					this.$emit('scrolltoupper')
 					// 这一句很重要，能绝对保证在性功能障碍的webview，滚动条到顶时，取消偏移值，让页面置顶
 					this.offset = 0

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

@@ -16,9 +16,10 @@
 </template>
 
 <script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { sys } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
@@ -38,7 +39,7 @@
 				rect: {},
 				index: 0,
 				show: true,
-				sys: uni.$u.sys()
+				sys: sys()
 			}
 		},
 		computed: {