uview-plus 3.2.7 → 3.2.9

package/components/u-skeleton/u-skeleton.vue

@@ -11,8 +11,8 @@
 			    v-if="avatar"
 			    :class="[`u-skeleton__wrapper__avatar--${avatarShape}`, animate && 'animate']"
 			    :style="{
-						height: $u.addUnit(avatarSize),
-						width: $u.addUnit(avatarSize)
+						height: addUnit(avatarSize),
+						width: addUnit(avatarSize)
 					}"
 			></view>
 			<view
@@ -25,7 +25,7 @@
 				    v-if="title"
 				    :style="{
 							width: uTitleWidth,
-							height: $u.addUnit(titleHeight),
+							height: addUnit(titleHeight),
 						}"
 				    :class="[animate && 'animate']"
 				></view>
@@ -49,9 +49,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, sleep, error } from '../../libs/function/index';
+	import test from '../../libs/function/test';
 	// #ifdef APP-NVUE
 	// 由于weex为阿里的KPI业绩考核的产物，所以不支持百分比单位，这里需要通过dom查询组件的宽度
 	const dom = uni.requireNativePlugin('dom')
@@ -90,26 +92,26 @@
 		computed: {
 			rowsArray() {
 				if (/%$/.test(this.rowsHeight)) {
-					uni.$u.error('rowsHeight参数不支持百分比单位')
+					error('rowsHeight参数不支持百分比单位')
 				}
 				const rows = []
 				for (let i = 0; i < this.rows; i++) {
 					let item = {},
 						// 需要预防超出数组边界的情况
-						rowWidth = uni.$u.test.array(this.rowsWidth) ? (this.rowsWidth[i] || (i === this.rows - 1 ? '70%' : '100%')) : i ===
+						rowWidth = test.array(this.rowsWidth) ? (this.rowsWidth[i] || (i === this.rows - 1 ? '70%' : '100%')) : i ===
 						this.rows - 1 ? '70%' : this.rowsWidth,
-						rowHeight = uni.$u.test.array(this.rowsHeight) ? (this.rowsHeight[i] || '18px') : this.rowsHeight
+						rowHeight = test.array(this.rowsHeight) ? (this.rowsHeight[i] || '18px') : this.rowsHeight
 					// 如果有title占位图，第一个段落占位图的外边距需要大一些，如果没有title占位图，第一个段落占位图则无需外边距
 					// 之所以需要这么做，是因为weex的无能，以提升性能为借口不支持css的一些伪类
 					item.marginTop = !this.title && i === 0 ? 0 : this.title && i === 0 ? '20px' : '12px'
 					// 如果设置的为百分比的宽度，转换为px值，因为nvue不支持百分比单位
 					if (/%$/.test(rowWidth)) {
 						// 通过parseInt提取出百分比单位中的数值部分，除以100得到百分比的小数值
-						item.width = uni.$u.addUnit(this.width * parseInt(rowWidth) / 100)
+						item.width = addUnit(this.width * parseInt(rowWidth) / 100)
 					} else {
-						item.width = uni.$u.addUnit(rowWidth)
+						item.width = addUnit(rowWidth)
 					}
-					item.height = uni.$u.addUnit(rowHeight)
+					item.height = addUnit(rowHeight)
 					rows.push(item)
 				}
 				// console.log(rows);
@@ -119,11 +121,11 @@
 				let tWidth = 0
 				if (/%$/.test(this.titleWidth)) {
 					// 通过parseInt提取出百分比单位中的数值部分，除以100得到百分比的小数值
-					tWidth = uni.$u.addUnit(this.width * parseInt(this.titleWidth) / 100)
+					tWidth = addUnit(this.width * parseInt(this.titleWidth) / 100)
 				} else {
-					tWidth = uni.$u.addUnit(this.titleWidth)
+					tWidth = addUnit(this.titleWidth)
 				}
-				return uni.$u.addUnit(tWidth)
+				return addUnit(tWidth)
 			},
 			
 		},
@@ -131,6 +133,7 @@
 			this.init()
 		},
 		methods: {
+			addUnit,
 			init() {
 				this.getComponentWidth()
 				// #ifdef APP-NVUE
@@ -140,7 +143,7 @@
 			async setNvueAnimation() {
 				// #ifdef APP-NVUE
 				// 为了让opacity:1的状态保持一定时间，这里做一个延时
-				await uni.$u.sleep(500)
+				await sleep(500)
 				const skeleton = this.$refs['u-skeleton__wrapper'];
 				skeleton && this.loading && this.animate && animation.transition(skeleton, {
 					styles: {
@@ -165,7 +168,7 @@
 			// 获取组件的宽度
 			async getComponentWidth() {
 				// 延时一定时间，以获取dom尺寸
-				await uni.$u.sleep(20)
+				await sleep(20)
 				// #ifndef APP-NVUE
 				this.$uGetRect('.u-skeleton__wrapper__content').then(size => {
 					this.width = size.width

package/components/u-slider/mpwxs.js

@@ -1,3 +1,4 @@
+import { sleep } from '../../libs/function/index';
 export default {
     data() {
         return {
@@ -23,7 +24,7 @@ export default {
         // 获取slider尺寸
         getSliderRect() {
             // 获取滑块条的尺寸信息
-            uni.$u.sleep().then(() => {
+            sleep().then(() => {
                 this.$uGetRect('.u-slider').then((rect) => {
                     this.info.width = rect.width
                     this.info.left = rect.left
@@ -39,4 +40,4 @@ export default {
             this.$emit(e.event, e.value ? e.value : this.value)
         }
     }
-}
+}

package/components/u-slider/nvue - /345/211/257/346/234/254.js"

@@ -8,7 +8,7 @@ const BindingX = uni.requireNativePlugin('bindingx')
 const dom = uni.requireNativePlugin('dom')
 // nvue中用于操作元素动画的库，类似于uni.animation，只不过uni.animation不能用于nvue
 const animation = uni.requireNativePlugin('animation')
-
+import { range } from '../../libs/function/index';
 export default {
 	data() {
 		return {
@@ -141,7 +141,7 @@ export default {
 			}, (e) => {
 				if (e.state === 'end' || e.state === 'exit') {
 					// 
-					this.x = uni.$u.range(0, left + width, e.deltaX + this.x)
+					this.x = range(0, left + width, e.deltaX + this.x)
 					// 根据偏移值，得出移动的百分比，进而修改双向绑定的v-model的值
 					const value = (this.x / width) * 100
 					const percent = this.formatStep(value)

package/components/u-slider/nvue.js

@@ -8,7 +8,7 @@ const BindingX = uni.requireNativePlugin('bindingx')
 const dom = uni.requireNativePlugin('dom')
 // nvue中用于操作元素动画的库，类似于uni.animation，只不过uni.animation不能用于nvue
 const animation = uni.requireNativePlugin('animation')
-
+import { range } from '../../libs/function/index';
 export default {
     data() {
         return {
@@ -180,7 +180,7 @@ export default {
         // 移动点占总长度的百分比，此处需要先除以step，是为了保证step大于1时，比如10，那么在滑动11,12px这样的
         // 距离时，实际上滑块是不会滑动的，到了16,17px，经过四舍五入后，就变成了20px，进行了下一个跳变
         format(value) {
-            return Math.round(uni.$u.range(this.min, this.max, value) / this.step) * this.step
+            return Math.round(range(this.min, this.max, value) / this.step) * this.step
         },
         getRange() {
             const {

package/components/u-slider/u-slider.vue

@@ -20,15 +20,18 @@
 	</view>
 </template>
 
-<script>
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+<script>
+	import props from './props';
+	import mpMixin from '../../libs/mixin/mpMixin';
+	import mixin from '../../libs/mixin/mixin';
+	import { addStyle, getPx } from '../../libs/function/index.js';
 	export default {
 		name: 'up-slider',
 		mixins: [mpMixin, mixin, props],
 		emits: ["changing", "change", "update:modelValue"],
-		methods: {
+		methods: {
+			addStyle,
+			getPx,
 			// 拖动过程中触发
 			changingHandler(e) {
 				const {

package/components/u-status-bar/u-status-bar.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, sys } from '../../libs/function/index';
 	/**
 	 * StatbusBar 状态栏占位
 	 * @description 本组件主要用于状态填充，比如在自定导航栏的时候，它会自动适配一个恰当的状态栏高度。
@@ -30,9 +31,9 @@
 			style() {
 				const style = {}
 				// 状态栏高度，由于某些安卓和微信开发工具无法识别css的顶部状态栏变量，所以使用js获取的方式
-				style.height = uni.$u.addUnit(uni.$u.sys().statusBarHeight, 'px')
+				style.height = addUnit(sys().statusBarHeight, 'px')
 				style.backgroundColor = this.bgColor
-				return uni.$u.deepMerge(style, uni.$u.addStyle(this.customStyle))
+				return deepMerge(style, addStyle(this.customStyle))
 			}
 		},
 	}

package/components/u-steps/u-steps.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 test from '../../libs/function/test';
 	/**
 	 * Steps 步骤条
 	 * @description 该组件一般用于完成一个任务要分几个步骤，标识目前处于第几步的场景。
@@ -50,7 +51,7 @@
 			updateChildData() {
 				this.children.map(child => {
 					// 先判断子组件是否存在对应的方法
-					uni.$u.test.func((child || {}).updateFromParent()) && child.updateFromParent()
+					test.func((child || {}).updateFromParent()) && child.updateFromParent()
 				})
 			},
 			// 接受子组件的通知，去修改其他子组件的数据

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

@@ -47,9 +47,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 { sleep, error } from '../../libs/function/index';
+	import color from '../../libs/config/color';
 	// #ifdef APP-NVUE
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
@@ -103,7 +105,7 @@
 					style.height = this.size.height + 'px'
 					// style.top = this.size.height / 2 + 'px'
 				}
-				style.backgroundColor = this.parent.children?.[this.index + 1]?.error ? uni.$u.color.error : this.index <
+				style.backgroundColor = this.parent.children?.[this.index + 1]?.error ? color.error : this.index <
 					this
 					.parentData
 					.current ? this.parentData.activeColor : this.parentData.inactiveColor
@@ -134,7 +136,7 @@
 						color = this.parentData.activeColor
 						break
 					case 'error':
-						color = uni.$u.color.error
+						color = color.error
 						break
 					case 'process':
 						color = this.parentData.dot ? this.parentData.activeColor : 'transparent'
@@ -160,7 +162,7 @@
 		},
 		mounted() {
 			this.parent && this.parent.updateFromChild()
-			uni.$u.sleep().then(() => {
+			sleep().then(() => {
 				this.getStepsItemRect()
 			})
 		},
@@ -169,7 +171,7 @@
 				// 初始化数据
 				this.updateParentData()
 				if (!this.parent) {
-					return uni.$u.error('u-steps-item必须要搭配u-steps组件使用')
+					return error('u-steps-item必须要搭配u-steps组件使用')
 				}
 				this.index = this.parent.children.indexOf(this)
 				this.childLength = this.parent.children.length

package/components/u-sticky/u-sticky.vue

@@ -14,9 +14,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, deepMerge, getPx, guid, sys, os } from '../../libs/function/index';
+	import zIndex from '../../libs/config/zIndex';
 	/**
 	 * sticky 吸顶
 	 * @description 该组件与CSS中position: sticky属性实现的效果一致，当组件达到预设的到顶部距离时， 就会固定在指定位置，组件位置大于预设的顶部距离时，会重新按照正常的布局排列。
@@ -39,7 +41,7 @@
 			return {
 				cssSticky: false, // 是否使用css的sticky实现
 				stickyTop: 0, // 吸顶的top值，因为可能受自定义导航栏影响，最终的吸顶值非offsetTop值
-				elId: uni.$u.guid(),
+				elId: guid(),
 				left: 0, // js模式时，吸顶的内容因为处于postition: fixed模式，为了和原来保持一致的样式，需要记录并重新设置它的left，height，width属性
 				width: 'auto',
 				height: 'auto',
@@ -53,7 +55,7 @@
 					if (this.cssSticky) {
 						style.position = 'sticky'
 						style.zIndex = this.uZindex
-						style.top = uni.$u.addUnit(this.stickyTop)
+						style.top = addUnit(this.stickyTop)
 					} else {
 						style.height = this.fixed ? this.height + 'px' : 'auto'
 					}
@@ -67,7 +69,7 @@
 					// #endif
 				}
 				style.backgroundColor = this.bgColor
-				return uni.$u.deepMerge(uni.$u.addStyle(this.customStyle), style)
+				return deepMerge(addStyle(this.customStyle), style)
 			},
 			// 吸顶内容的样式
 			stickyContent() {
@@ -82,7 +84,7 @@
 				return style
 			},
 			uZindex() {
-				return this.zIndex ? this.zIndex : uni.$u.zIndex.sticky
+				return this.zIndex ? this.zIndex : zIndex.sticky
 			}
 		},
 		mounted() {
@@ -137,7 +139,7 @@
 				observer && observer.disconnect()
 			},
 			getStickyTop() {
-				this.stickyTop = uni.$u.getPx(this.offsetTop) + uni.$u.getPx(this.customNavHeight)
+				this.stickyTop = getPx(this.offsetTop) + getPx(this.customNavHeight)
 			},
 			async checkSupportCssSticky() {
 				// #ifdef H5
@@ -148,7 +150,7 @@
 				// #endif
 
 				// 如果安卓版本高于8.0，依然认为是支持css sticky的(因为安卓7在某些机型，可能不支持sticky)
-				if (uni.$u.os() === 'android' && Number(uni.$u.sys().system) > 8) {
+				if (os() === 'android' && Number(sys().system) > 8) {
 					this.cssSticky = true
 				}
 
@@ -158,7 +160,7 @@
 				// #endif
 
 				// ios上，从ios6开始，都是支持css sticky的
-				if (uni.$u.os() === 'ios') {
+				if (os() === 'ios') {
 					this.cssSticky = true
 				}
 

package/components/u-subsection/u-subsection.vue

@@ -3,7 +3,7 @@
         class="u-subsection"
         ref="u-subsection"
         :class="[`u-subsection--${mode}`]"
-        :style="[$u.addStyle(customStyle), wrapperStyle]"
+        :style="[addStyle(customStyle), wrapperStyle]"
     >
         <view
             class="u-subsection__bar cursor-pointer"
@@ -53,8 +53,9 @@ const dom = uni.requireNativePlugin("dom");
 const animation = uni.requireNativePlugin("animation");
 // #endif
 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, sleep } from '../../libs/function/index';
 /**
  * Subsection 分段器
  * @description 该分段器一般用于用户从几个选项中选择某一个的场景
@@ -102,7 +103,7 @@ export default {
                 // 故用animation模块进行位移
                 const ref = this.$refs?.["u-subsection__bar"]?.ref;
                 // 不存在ref的时候(理解为第一次初始化时，需要渲染dom，进行一定延时再获取ref)，这里的100ms是经过测试得出的结果(某些安卓需要延时久一点)，勿随意修改
-                uni.$u.sleep(ref ? 0 : 100).then(() => {
+                sleep(ref ? 0 : 100).then(() => {
                     animation.transition(this.$refs["u-subsection__bar"].ref, {
                         styles: {
                             transform: `translateX(${
@@ -162,7 +163,7 @@ export default {
                 const style = {};
                 style.fontWeight =
                     this.bold && this.innerCurrent === index ? "bold" : "normal";
-                style.fontSize = uni.$u.addUnit(this.fontSize);
+                style.fontSize = addUnit(this.fontSize);
                 // subsection模式下，激活时默认为白色的文字
                 if (this.mode === "subsection") {
                     style.color =
@@ -190,9 +191,10 @@ export default {
     },
 	emits: ["change"],
     methods: {
+        addStyle,
         init() {
             this.innerCurrent = this.current
-            uni.$u.sleep().then(() => this.getRect());
+            sleep().then(() => this.getRect());
         },
 		// 判断展示文本
 		getText(item) {

package/components/u-swipe-action/u-swipe-action.vue

@@ -5,9 +5,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';
 	/**
 	 * SwipeAction 滑动单元格 
 	 * @description 该组件一般用于左滑唤出操作菜单的场景，用的最多的是左滑删除操作

package/components/u-swipe-action-item/nvue - backup.js

@@ -2,7 +2,7 @@
 const dom = uni.requireNativePlugin('dom')
 // nvue中用于操作元素动画的库，类似于uni.animation，只不过uni.animation不能用于nvue
 const animation = uni.requireNativePlugin('animation')
-
+import { sleep } from '../../libs/function/index';
 export default {
     data() {
         return {
@@ -41,7 +41,7 @@ export default {
             immediate: true,
             handler(n) {
                 // if(n === true) {
-                // 	uni.$u.sleep(50).then(() => {
+                // 	sleep(50).then(() => {
                 // 		this.openSwipeAction()
                 // 	})
                 // } else {
@@ -51,7 +51,7 @@ export default {
         }
     },
     mounted() {
-        uni.$u.sleep(20).then(() => {
+        sleep(20).then(() => {
             this.queryRect()
         })
     },

package/components/u-swipe-action-item/nvue.js

@@ -2,7 +2,7 @@
 const dom = uni.requireNativePlugin('dom');
 const bindingX = uni.requireNativePlugin('bindingx');
 const animation = uni.requireNativePlugin('animation');
-
+import { getPx, getDuration } from '../../libs/function/index';
 export default {
 	data() {
 		return {
@@ -99,7 +99,7 @@ export default {
 						this.$nextTick(() => {
 							this.status = deltaX <= -this.buttonsWidth ? 'open' : 'close'
 						})
-					} else if(Math.abs(deltaX) > uni.$u.getPx(this.threshold)) {
+					} else if(Math.abs(deltaX) > getPx(this.threshold)) {
 						// 在移动大于阈值、并且小于总按钮宽度时，进行自动打开或者关闭
 						// 移动距离大于0时，意味着需要关闭状态
 						if(Math.abs(deltaX) < this.buttonsWidth) {
@@ -155,7 +155,7 @@ export default {
 				styles: {
 					transform: `translateX(${x}px)`,
 				},
-				duration: uni.$u.getDuration(this.duration, false),
+				duration: getDuration(this.duration, false),
 				timingFunction: 'ease-in-out'
 			}, () => {
 				this.moving = false

package/components/u-swipe-action-item/u-swipe-action-item.vue

@@ -16,7 +16,7 @@
 						}, item.style]">
 						<u-icon v-if="item.icon" :name="item.icon"
 							:color="item.style && item.style.color ? item.style.color : '#ffffff'"
-							:size="item.iconSize ? $u.addUnit(item.iconSize) : item.style && item.style.fontSize ? $u.getPx(item.style.fontSize) * 1.2 : 17"
+							:size="item.iconSize ? addUnit(item.iconSize) : item.style && item.style.fontSize ? getPx(item.style.fontSize) * 1.2 : 17"
 							:customStyle="{
 								marginRight: item.text ? '2px' : 0
 							}"></u-icon>
@@ -60,9 +60,10 @@
 <!-- #endif -->
 <script>
 	import touch from '../../libs/mixin/touch.js'
-	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, getPx, sleep } from '../../libs/function/index';
 	// #ifdef APP-NVUE
 	import nvue from './nvue.js';
 	// #endif
@@ -138,11 +139,13 @@
 			this.init()
 		},
 		methods: {
+			addUnit,
+			getPx,
 			init() {
 				// 初始化父组件数据
 				this.updateParentData()
 				// #ifndef APP-NVUE
-				uni.$u.sleep().then(() => {
+				sleep().then(() => {
 					this.queryRect()
 				})
 				// #endif