uview-plus 3.2.8 → 3.2.10

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: {

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

@@ -1,7 +1,7 @@
 <template>
 	<view
 		class="u-loading-icon"
-		:style="[$u.addStyle(customStyle)]"
+		:style="[addStyle(customStyle)]"
 		:class="[vertical && 'u-loading-icon--vertical']"
 		v-if="show"
 	>
@@ -12,8 +12,8 @@
 			ref="ani"
 			:style="{
 				color: color,
-				width: $u.addUnit(size),
-				height: $u.addUnit(size),
+				width: addUnit(size),
+				height: addUnit(size),
 				borderTopColor: color,
 				borderBottomColor: otherBorderColor,
 				borderLeftColor: otherBorderColor,
@@ -39,8 +39,8 @@
 					:animating="true"
 					:style="{
 						color: color,
-						width: $u.addUnit(size),
-						height: $u.addUnit(size)
+						width: addUnit(size),
+						height: addUnit(size)
 					}"
 				/>
 				<!-- #endif -->
@@ -50,7 +50,7 @@
 			v-if="text"
 			class="u-loading-icon__text"
 			:style="{
-				fontSize: $u.addUnit(textSize),
+				fontSize: addUnit(textSize),
 				color: textColor,
 			}"
 		>{{text}}</text>
@@ -58,9 +58,11 @@
 </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 } from '../../libs/function/index';
+	import { colorGradient } from '../../libs/function/colorGradient';
 	// #ifdef APP-NVUE
 	const animation = weex.requireModule('animation');
 	// #endif
@@ -104,7 +106,7 @@
 			// 之所以需要这么做的原因是，比如父组件传了color为红色，那么需要另外的三个边为浅红色
 			// 而不能是固定的某一个其他颜色(因为这个固定的颜色可能浅蓝，导致效果没有那么细腻良好)
 			otherBorderColor() {
-				const lightColor = uni.$u.colorGradient(this.color, '#ffffff', 100)[80]
+				const lightColor = colorGradient(this.color, '#ffffff', 100)[80]
 				if (this.mode === 'circle') {
 					return this.inactiveColor ? this.inactiveColor : lightColor
 				} else {
@@ -129,6 +131,8 @@
 			this.init()
 		},
 		methods: {
+			addUnit,
+			addStyle,
 			init() {
 				setTimeout(() => {
 					// #ifdef APP-NVUE

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

@@ -20,14 +20,14 @@
                         class="u-loading-page__warpper__loading-icon__img"
                         mode="widthFit"
 						:style="{
-							width: $u.addUnit(iconSize),
-						    height: $u.addUnit(iconSize)
+							width: addUnit(iconSize),
+						    height: addUnit(iconSize)
 						}"
                     ></image>
                     <u-loading-icon
                         v-else
                         :mode="loadingMode"
-                        :size="$u.addUnit(iconSize)"
+                        :size="addUnit(iconSize)"
                         :color="loadingColor"
                     ></u-loading-icon>
                 </view>
@@ -35,7 +35,7 @@
                     <text
                         class="u-loading-page__warpper__text"
                         :style="{
-                            fontSize: $u.addUnit(fontSize),
+                            fontSize: addUnit(fontSize),
                             color: color,
                         }"
                         >{{ loadingText }}</text
@@ -48,8 +48,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 { addUnit } from '../../libs/function/index';
 /**
  * loadingPage 加载动画
  * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
@@ -72,7 +73,9 @@ export default {
     data() {
         return {};
     },
-    methods: {},
+    methods: {
+        addUnit
+    }
 };
 </script>
 

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

@@ -2,12 +2,12 @@
 	<view
 	    class="u-loadmore"
 	    :style="[
-			$u.addStyle(customStyle),
+			addStyle(customStyle),
 			{
 				backgroundColor: bgColor,
-				marginBottom: $u.addUnit(marginBottom),
-				marginTop: $u.addUnit(marginTop),
-				height: $u.addUnit(height),
+				marginBottom: addUnit(marginBottom),
+				marginTop: addUnit(marginTop),
+				height: addUnit(height),
 			},
 		]"
 	>
@@ -52,10 +52,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 } from '../../libs/function/index';
 	/**
 	 * loadmore 加载更多
 	 * @description 此组件一般用于标识页面底部加载数据时的状态。
@@ -95,8 +95,8 @@
 			loadTextStyle() {
 				return {
 					color: this.color,
-					fontSize: uni.$u.addUnit(this.fontSize),
-					lineHeight: uni.$u.addUnit(this.fontSize),
+					fontSize: addUnit(this.fontSize),
+					lineHeight: addUnit(this.fontSize),
 					backgroundColor: this.bgColor,
 				}
 			},
@@ -112,6 +112,8 @@
 		},
 		emits: ["loadmore"],
 		methods: {
+			addStyle,
+			addUnit,
 			loadMore() {
 				// 只有在“加载更多”的状态下才发送点击事件，内容不满一屏时无法触发底部上拉事件，所以需要点击来触发
 				if (this.status == 'loadmore') this.$emit('loadmore');

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

@@ -6,7 +6,7 @@
 		:customStyle="{
 			borderRadius: '6px', 
 			overflow: 'hidden',
-			marginTop: `-${$u.addUnit(negativeTop)}`
+			marginTop: `-${addUnit(negativeTop)}`
 		}"
 		:closeOnClickOverlay="closeOnClickOverlay"
 		:safeAreaInsetBottom="false"
@@ -16,7 +16,7 @@
 		<view
 			class="u-modal"
 			:style="{
-				width: $u.addUnit(width),
+				width: addUnit(width),
 			}"
 		>
 			<text
@@ -90,9 +90,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 } from '../../libs/function/index';
 	/**
 	 * Modal 模态框
 	 * @description 弹出模态框，常用于消息提示、消息确认、在当前页面内完成特定的交互操作。
@@ -135,6 +136,7 @@
 		},
 		emits: ["confirm", "cancel", "close"],
 		methods: {
+			addUnit,
 			// 点击确定按钮
 			confirmHandler() {
 				// 如果配置了异步关闭，将按钮值为loading状态

package/components/u-navbar/u-navbar.vue

@@ -4,7 +4,7 @@
 			class="u-navbar__placeholder"
 			v-if="fixed && placeholder"
 			:style="{
-				height: $u.addUnit($u.getPx(height) + $u.sys().statusBarHeight,'px'),
+				height: addUnit(getPx(height) + sys().statusBarHeight,'px'),
 			}"
 		></view>
 		<view :class="[fixed && 'u-navbar--fixed']">
@@ -16,7 +16,7 @@
 				class="u-navbar__content"
 				:class="[border && 'u-border-bottom']"
 				:style="{
-					height: $u.addUnit(height),
+					height: addUnit(height),
 					backgroundColor: bgColor,
 				}"
 			>
@@ -46,8 +46,8 @@
 					<text
 						class="u-line-1 u-navbar__content__title"
 						:style="[{
-							width: $u.addUnit(titleWidth),
-						}, $u.addStyle(titleStyle)]"
+							width: addUnit(titleWidth),
+						}, addStyle(titleStyle)]"
 					>{{ title }}</text>
 				</slot>
 				<view
@@ -73,9 +73,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, getPx, sys } from '../../libs/function/index';
 	/**
 	 * Navbar 自定义导航栏
 	 * @description 此组件一般用于在特殊情况下，需要自定义导航栏的时候用到，一般建议使用uni-app带的导航栏。
@@ -109,6 +110,10 @@
 		},
 		emits: ["leftClick", "rightClick"],
 		methods: {
+			addStyle,
+			addUnit,
+			sys,
+			getPx,
 			// 点击左侧区域
 			leftClick() {
 				// 如果配置了autoBack，自动返回上一页

package/components/u-no-network/u-no-network.vue

@@ -43,10 +43,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 { toast } from '../../libs/function/index';
 	/**
 	 * noNetwork 无网络提示
 	 * @description 该组件无需任何配置，引入即可，内部自动处理所有功能和事件。
@@ -94,10 +94,10 @@
 						this.networkType = res.networkType
 						this.emitEvent(this.networkType)
 						if (res.networkType == 'none') {
-							uni.$u.toast('无网络连接')
+							toast('无网络连接')
 							this.isConnected = false
 						} else {
-							uni.$u.toast('网络已连接')
+							toast('网络已连接')
 							this.isConnected = true
 						}
 					}

package/components/u-notice-bar/u-notice-bar.vue

@@ -4,7 +4,7 @@
 		v-if="show"
 		:style="[{
 			backgroundColor: bgColor
-		}, $u.addStyle(customStyle)]"
+		}, addStyle(customStyle)]"
 	>
 		<template v-if="direction === 'column' || (direction === 'row' && step)">
 			<u-column-notice
@@ -39,10 +39,10 @@
 	</view>
 </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 } from '../../libs/function/index';
 	/**
 	 * noticeBar 滚动通知
 	 * @description 该组件用于滚动通告场景，有多种模式可供选择
@@ -76,6 +76,7 @@
 		},
 		emits: ["click", "close"],
 		methods: {
+			addStyle,
 			// 点击通告栏
 			click(index) {
 				this.$emit('click', index)

package/components/u-notify/u-notify.vue

@@ -7,7 +7,7 @@
 		<view
 			class="u-notify"
 			:class="[`u-notify--${tmpConfig.type}`]"
-			:style="[backgroundColor, $u.addStyle(customStyle)]"
+			:style="[backgroundColor, addStyle(customStyle)]"
 		>
 			<u-status-bar v-if="tmpConfig.safeAreaInsetTop"></u-status-bar>
 			<view class="u-notify__warpper">
@@ -23,7 +23,7 @@
 				<text
 					class="u-notify__warpper__text"
 					:style="{
-						fontSize: $u.addUnit(tmpConfig.fontSize),
+						fontSize: addUnit(tmpConfig.fontSize),
 						color: tmpConfig.color
 					}"
 				>{{ tmpConfig.message }}</text>
@@ -33,9 +33,11 @@
 </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 defProps from '../../libs/config/props.js';
+	import { addUnit, addStyle, deepMerge } from '../../libs/function/index';
 	/**
 	 * notify 顶部提示
 	 * @description 该组件一般用于页面顶部向下滑出一个提示，尔后自动收起的场景
@@ -63,21 +65,21 @@
 				timer: null,
 				config: {
 					// 到顶部的距离
-					top: uni.$u.props.notify.top,
+					top: defProps.notify.top,
 					// type主题，primary，success，warning，error
-					type: uni.$u.props.notify.type,
+					type: defProps.notify.type,
 					// 字体颜色
-					color: uni.$u.props.notify.color,
+					color: defProps.notify.color,
 					// 背景颜色
-					bgColor: uni.$u.props.notify.bgColor,
+					bgColor: defProps.notify.bgColor,
 					// 展示的文字内容
-					message: uni.$u.props.notify.message,
+					message: defProps.notify.message,
 					// 展示时长，为0时不消失，单位ms
-					duration: uni.$u.props.notify.duration,
+					duration: defProps.notify.duration,
 					// 字体大小
-					fontSize: uni.$u.props.notify.fontSize,
+					fontSize: defProps.notify.fontSize,
 					// 是否留出顶部安全距离（状态栏高度）
-					safeAreaInsetTop: uni.$u.props.notify.safeAreaInsetTop
+					safeAreaInsetTop: defProps.notify.safeAreaInsetTop
 				},
 				// 合并后的配置，避免多次调用组件后，可能会复用之前使用的配置参数
 				tmpConfig: {}
@@ -94,7 +96,7 @@
 					// #endif
 				}
 				const style = {
-					top: uni.$u.addUnit(this.tmpConfig.top === 0 ? top : this.tmpConfig.top),
+					top: addUnit(this.tmpConfig.top === 0 ? top : this.tmpConfig.top),
 					// 因为组件底层为u-transition组件，必须将其设置为fixed定位
 					// 让其出现在导航栏底部
 					position: 'fixed',
@@ -135,9 +137,11 @@
 			})
 		},
 		methods: {
+			addStyle,
+			addUnit,
 			show(options) {
 				// 不将结果合并到this.config变量，避免多次调用u-toast，前后的配置造成混乱
-				this.tmpConfig = uni.$u.deepMerge(this.config, options)
+				this.tmpConfig = deepMerge(this.config, options)
 				// 任何定时器初始化之前，都要执行清除操作，否则可能会造成混乱
 				this.clearTimer()
 				this.open = true

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

@@ -91,9 +91,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 { getPx, addUnit } from '../../libs/function/index';
 	/**
 	 * numberBox 步进器
 	 * @description 该组件一般用于商城购物选择物品数量的场景。
@@ -165,14 +166,14 @@
 		computed: {
 			getCursorSpacing() {
 				// 判断传入的单位，如果为px单位，需要转成px
-				return uni.$u.getPx(this.cursorSpacing)
+				return getPx(this.cursorSpacing)
 			},
 			// 按钮的样式
 			buttonStyle() {
 				return (type) => {
 					const style = {
 						backgroundColor: this.bgColor,
-						height: uni.$u.addUnit(this.buttonSize),
+						height: addUnit(this.buttonSize),
 						color: this.color
 					}
 					if (this.isDisabled(type)) {
@@ -187,8 +188,8 @@
 				const style = {
 					color: this.color,
 					backgroundColor: this.bgColor,
-					height: uni.$u.addUnit(this.buttonSize),
-					width: uni.$u.addUnit(this.inputWidth)
+					height: addUnit(this.buttonSize),
+					width: addUnit(this.inputWidth)
 				}
 				return style
 			},

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

@@ -39,10 +39,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 { randomArray } from '../../libs/function/index';
 	/**
 	 * keyboard 键盘组件
 	 * @description
@@ -72,19 +72,19 @@
 					if (!this.random) {
 						return [1, 2, 3, 4, 5, 6, 7, 8, 9, 0];
 					} else {
-						return uni.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 0]);
+						return randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, 0]);
 					}
 				} else if (!this.dotDisabled && this.mode == 'number') {
 					if (!this.random) {
 						return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0];
 					} else {
-						return uni.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0]);
+						return randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.dot, 0]);
 					}
 				} else if (this.mode == 'card') {
 					if (!this.random) {
 						return [1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0];
 					} else {
-						return uni.$u.randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0]);
+						return randomArray([1, 2, 3, 4, 5, 6, 7, 8, 9, this.cardX, 0]);
 					}
 				}
 			},

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

@@ -11,10 +11,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 { addStyle, deepMerge } from '../../libs/function/index';
 	/**
 	 * overlay 遮罩
 	 * @description 创建一个遮罩层，用于强调特定的页面元素，并阻止用户对遮罩下层的内容进行操作，一般用于弹窗场景
@@ -41,7 +41,7 @@
 					bottom: 0,
 					'background-color': `rgba(0, 0, 0, ${this.opacity})`
 				}
-				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
+				return deepMerge(style, addStyle(this.customStyle))
 			}
 		},
 		emits: ["click"],