uview-plus 3.3.6 → 3.3.7

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

@@ -20,10 +20,10 @@
 				width: addUnit(width),
 			}"
 		>
-			<text
+			<view
 				class="u-modal__title"
 				v-if="title"
-			>{{ title }}</text>
+			>{{ title }}</view>
 			<view
 				class="u-modal__content"
 				:style="{
@@ -174,7 +174,7 @@
 		overflow: hidden;
 
 		&__title {
-			display: block;
+			display: flex;
 			font-size: 16px;
 			font-weight: bold;
 			color: $u-content-color;

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

@@ -166,12 +166,7 @@
 				this.timer = null
 			}
 		},
-		// #ifdef VUE2
-		beforeDestroy() {
-		// #endif
-		// #ifdef VUE3
 		beforeUnmount() {
-		// #endif
 			this.clearTimer()
 		}
 	}

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

@@ -259,6 +259,7 @@
 				const val = this.format(this.currentValue);
 				if (val !== this.currentValue) {
 					this.currentValue = val
+					this.emitChange(val)
 				}
 			},
 			// 判断是否出于禁止操作状态

package/components/u-parse/node/node.vue

@@ -168,7 +168,7 @@ export default {
     }
     // #endif
   },
-  beforeDestroy () {
+  beforeUnmount () {
     // #ifdef H5 || APP-PLUS
     if (this.observer) {
       this.observer.disconnect()

package/components/u-parse/u-parse.vue

@@ -126,13 +126,7 @@ export default {
 			this.setContent(this.content)
 		}
 	},
-	// #ifdef VUE2
-	// beforeDestroy()
-	// #endif
-	// #ifdef VUE3
-	beforeUnmount()
-	// #endif
-	{
+	beforeUnmount() {
 		this._hook('onDetached')
 	},
 	methods: {

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

@@ -112,6 +112,7 @@ export default {
 		// 监听默认索引的变化，重新设置对应的值
 		defaultIndex: {
 			immediate: true,
+			deep:true,
 			handler(n) {
 				this.setIndexs(n, true)
 			}

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

@@ -177,15 +177,17 @@
 				}
 			},
 		},
-		emits: ["open", "close", "click"],
+		emits: ["open", "close", "click", "update:show"],
 		methods: {
 			// 点击遮罩
 			overlayClick() {
 				if (this.closeOnClickOverlay) {
+					this.$emit('update:show', false)
 					this.$emit('close')
 				}
 			},
 			close(e) {
+				this.$emit('update:show', false)
 				this.$emit('close')
 			},
 			afterEnter() {

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

@@ -275,16 +275,9 @@
 				this.$emit('close')
 			}
 		},
-		// #ifdef APP-NVUE
-		// #ifdef VUE2
-		beforeDestroy() {
-		// #endif
-		// #ifdef VUE3
 		beforeUnmount() {
-		// #endif
 			this.stopAnimation = true
-		},
-		// #endif
+		}
 	};
 </script>
 

package/components/u-scroll-list/nvue.js

@@ -6,7 +6,7 @@ export default {
         // 此处不写注释，请自行体会
         nvueScrollHandler(e) {
             const anchor = this.$refs['u-scroll-list__scroll-view'].ref
-            const element = {}
+            let element = {}
             if (this.$refs['u-scroll-list__indicator__line__bar']) {
                 element = this.$refs['u-scroll-list__indicator__line__bar'].ref
             }

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

@@ -22,8 +22,9 @@
 		<!-- #ifdef MP-WEIXIN || APP-VUE || H5 || MP-QQ -->
 		<!-- 以上平台，支持wxs -->
 		<scroll-view
-			class="u-scroll-list__scroll-view"
+			class="u-scroll-list__scroll-view scroll-view-native"
 			scroll-x
+			enable-flex
 			@scroll="wxs.scroll"
 			@scrolltoupper="wxs.scrolltoupper"
 			@scrolltolower="wxs.scrolltolower"
@@ -38,7 +39,7 @@
 			<!-- #ifndef APP-NVUE || MP-WEIXIN || H5 || APP-VUE || MP-QQ -->
 			<!-- 非以上平台，只能使用普通js实现 -->
 			<scroll-view
-				class="u-scroll-list__scroll-view"
+				class="u-scroll-list__scroll-view scroll-view-js"
 				scroll-x
 				@scroll="scrollHandler"
 				@scrolltoupper="scrolltoupperHandler"
@@ -204,6 +205,8 @@ export default {
 
 	&__scroll-view {
 		@include flex;
+		// 缺少会在enable-flex模式下高度异常
+		align-items: flex-start;
 
 		&__content {
 			@include flex;

package/components/u-slider/props.js

@@ -1,5 +1,6 @@
 import { defineMixin } from '../../libs/vue'
 import defProps from '../../libs/config/props.js'
+
 export const props = defineMixin({
     props: {
         // 最小可选值
@@ -17,20 +18,30 @@ export const props = defineMixin({
             type: [Number, String],
             default: () => defProps.slider.step
         },
-		// #ifdef VUE3
-		// 当前取值
-		modelValue: {
-			type: [String, Number],
-			default: () => defProps.slider.value
-		},
-		// #endif
-		// #ifdef VUE2
-		// 当前取值
-		value: {
-			type: [String, Number],
-			default: () => defProps.slider.value
-		},
-		// #endif
+        // #ifdef VUE3
+        // 当前取值
+        modelValue: {
+            type: [String, Number],
+            default: () => defProps.slider.value
+        },
+        // #endif
+        // #ifdef VUE2
+        // 当前取值
+        value: {
+            type: [String, Number],
+            default: () => defProps.slider.value
+        },
+        // #endif
+        // 是否区间模式
+        isRange: {
+            type: Boolean,
+            default: false
+        },
+        // 双滑块时值
+        rangeValue: {
+            type: [Array],
+            default: [0, 0]
+        },
         // 滑块右侧已选择部分的背景色
         activeColor: {
             type: String,
@@ -51,15 +62,30 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.slider.blockColor
         },
-		// 禁用状态
-		disabled: {
-			type: Boolean,
-			default: () => defProps.slider.disabled
-		},
+        // 用户对滑块的自定义颜色
+        blockStyle: {
+            type: Object,
+            default: () => defProps.slider.blockStyle
+        },
+        // 禁用状态
+        disabled: {
+            type: Boolean,
+            default: () => defProps.slider.disabled
+        },
         // 是否显示当前的选择值
         showValue: {
             type: Boolean,
             default: () => defProps.slider.showValue
+        },
+        // 是否渲染uni-app框架内置组件
+        useNative: {
+            type: Boolean,
+            default: () => defProps.slider.useNative
+        },
+        // 滑块高度
+        height: {
+            type: String,
+            default: () => defProps.slider.height
         }
     }
 })

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

@@ -3,7 +3,82 @@
 		class="u-slider"
 		:style="[addStyle(customStyle)]"
 	>
+		<template v-if="!useNative || isRange">
+			<view ref="u-slider-inner" class="u-slider-inner" @tap="onClick"
+				:class="[disabled ? 'u-slider--disabled' : '']" :style="{
+					height: (isRange && showValue) ? (getPx(blockSize) + 24) + 'px' : (getPx(blockSize)) + 'px',
+				}"
+			>
+				<view ref="u-slider__base"
+					class="u-slider__base"
+					:style="[
+						{
+							height: height,
+							backgroundColor: inactiveColor
+						}
+					]"
+				>
+				</view>
+				<view
+					class="u-slider__gap"
+					:style="[
+						barStyle,
+						{
+							height: height,
+							marginTop: '-' + height,
+							backgroundColor: activeColor
+						}
+					]"
+				>
+				</view>
+				<view v-if="isRange"
+					class="u-slider__gap u-slider__gap-0"
+					:style="[
+						barStyle0,
+						{
+							height: height,
+							marginTop: '-' + height,
+							backgroundColor: inactiveColor
+						}
+					]"
+				>
+				</view>
+				<text v-if="isRange && showValue"
+					class="u-slider__show-range-value" :style="{left: (getPx(barStyle0.width) + getPx(blockSize)/2) + 'px'}">
+					{{ this.rangeValue[0] }}
+				</text>
+				<text v-if="isRange && showValue"
+					class="u-slider__show-range-value" :style="{left: (getPx(barStyle.width) + getPx(blockSize)/2) + 'px'}">
+					{{ this.rangeValue[1] }}
+				</text>
+				<template v-if="isRange">
+					<view class="u-slider__button-wrap u-slider__button-wrap-0" @touchstart="onTouchStart($event, 0)"
+						@touchmove="onTouchMove($event, 0)" @touchend="onTouchEnd($event, 0)"
+						@touchcancel="onTouchEnd($event, 0)" :style="{left: (getPx(barStyle0.width) + getPx(blockSize)/2) + 'px'}">
+						<slot v-if="$slots.default  || $slots.$default"/>
+						<view v-else class="u-slider__button" :style="[blockStyle, {
+							height: getPx(blockSize, true),
+							width: getPx(blockSize, true),
+							backgroundColor: blockColor
+						}]"></view>
+					</view>
+				</template>
+				<view class="u-slider__button-wrap" @touchstart="onTouchStart"
+					@touchmove="onTouchMove" @touchend="onTouchEnd"
+					@touchcancel="onTouchEnd" :style="{left: (getPx(barStyle.width) + getPx(blockSize)/2) + 'px'}">
+					<slot v-if="$slots.default  || $slots.$default"/>
+					<view v-else class="u-slider__button" :style="[blockStyle, {
+						height: getPx(blockSize, true),
+						width: getPx(blockSize, true),
+						backgroundColor: blockColor
+					}]"></view>
+				</view>
+			</view>
+			<view class="u-slider__show-value" v-if="showValue && !isRange">{{ modelValue }}</view>
+		</template>
 		<slider
+			class="u-slider__native"
+			v-else
 			:min="min"
 			:max="max"
 			:step="step"
@@ -24,15 +99,105 @@
 	import { props } from './props';
 	import { mpMixin } from '../../libs/mixin/mpMixin';
 	import { mixin } from '../../libs/mixin/mixin';
-	import { addStyle, getPx } from '../../libs/function/index.js';
+	import { addStyle, getPx, sleep } from '../../libs/function/index.js';
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom')
+	// #endif
+	/**
+	 * slider 滑块选择器
+	 * @tutorial https://uview-plus.jiangruyi.com/components/slider.html
+	 * @property {Number | String} value 滑块默认值（默认0）
+	 * @property {Number | String} min 最小值（默认0）
+	 * @property {Number | String} max 最大值（默认100）
+	 * @property {Number | String} step 步长（默认1）
+	 * @property {Number | String} blockWidth 滑块宽度，高等于宽（30）
+	 * @property {Number | String} height 滑块条高度，单位rpx（默认6）
+	 * @property {String} inactiveColor 底部条背景颜色（默认#c0c4cc）
+	 * @property {String} activeColor 底部选择部分的背景颜色（默认#2979ff）
+	 * @property {String} blockColor 滑块颜色（默认#ffffff）
+	 * @property {Object} blockStyle 给滑块自定义样式，对象形式
+	 * @property {Boolean} disabled 是否禁用滑块(默认为false)
+	 * @event {Function} changing 正在滑动中
+	 * @event {Function} change 滑动结束
+	 * @example <up-slider v-model="value" />
+	 */
 	export default {
-		name: 'up-slider',
+		name: 'u-slider',
 		mixins: [mpMixin, mixin, props],
-		emits: ["changing", "change", "update:modelValue"],
+		emits: ["start", "changing", "change", "update:modelValue"],
+		data() {
+			return {
+				startX: 0,
+				status: 'end',
+				newValue: 0,
+				distanceX: 0,
+				startValue0: 0,
+				startValue: 0,
+				barStyle0: {},
+				barStyle: {},
+				sliderRect: {
+					left: 0,
+					width: 0
+				}
+			};
+		},
+		watch: {
+			// #ifdef VUE3
+			modelValue(n) {
+				// 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
+				if(this.status == 'end') this.updateValue(this.modelValue, false);
+			},
+			// #endif
+			// #ifdef VUE2
+			value(n) {
+				// 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
+				if(this.status == 'end') this.updateValue(this.value, false);
+			}
+			// #endif
+		},
+		created() {
+		},
+		async mounted() {
+			// 获取滑块条的尺寸信息
+			if (!this.useNative) {
+				// #ifndef APP-NVUE
+				this.$uGetRect('.u-slider__base').then(rect => {
+					this.sliderRect = rect;
+					this.init()
+				});
+				// #endif
+				// #ifdef APP-NVUE
+				await sleep(30) // 不延迟会出现size获取都为0的问题
+				const ref = this.$refs['u-slider__base']
+				ref &&
+					dom.getComponentRect(ref, (res) => {
+						// console.log(res)
+						this.sliderRect = {
+							left: res.size.left,
+							width: res.size.width
+						};
+						this.init()
+					})
+				// #endif
+			}
+		},
 		methods: {
 			addStyle,
 			getPx,
-			// 拖动过程中触发
+			init() {
+				if (this.isRange) {
+					this.updateValue(this.rangeValue[0], false, 0);
+					this.updateValue(this.rangeValue[1], false, 1);
+				} else {
+					// #ifdef VUE3
+					this.updateValue(this.modelValue, false);
+					// #endif
+					// #ifdef VUE2
+					this.updateValue(this.value, false);
+					// #endif
+				}
+			},
+			// native拖动过程中触发
 			changingHandler(e) {
 				const {
 					value
@@ -47,7 +212,7 @@
 				// 触发事件
 				this.$emit('changing', value)
 			},
-			// 滑动结束时触发
+			// native滑动结束时触发
 			changeHandler(e) {
 				const {
 					value
@@ -60,12 +225,216 @@
                 this.$emit("input", value);
                 // #endif
 				// 触发事件
-				this.$emit('change', value)
+				this.$emit('change', value);
+			},
+			onTouchStart(event, index = 1) {
+				if (this.disabled) return;
+				this.startX = 0;
+				// 触摸点集
+				let touches = event.touches[0];
+				// 触摸点到屏幕左边的距离
+				this.startX = touches.clientX;
+				// 此处的this.modelValue虽为props值，但是通过$emit('update:modelValue')进行了修改
+				if (this.isRange) {
+					this.startValue0 = this.format(this.rangeValue[0], 0);
+					this.startValue = this.format(this.rangeValue[1], 1);
+				} else {
+					// #ifdef VUE3
+					this.startValue = this.format(this.modelValue);
+					// #endif
+					// #ifdef VUE2
+					this.startValue = this.format(this.value);
+					// #endif
+				}
+				// 标示当前的状态为开始触摸滑动
+				this.status = 'start';
+			},
+			onTouchMove(event, index = 1) {
+				if (this.disabled) return;
+				// 连续触摸的过程会一直触发本方法，但只有手指触发且移动了才被认为是拖动了，才发出事件
+				// 触摸后第一次移动已经将status设置为moving状态，故触摸第二次移动不会触发本事件
+				if (this.status == 'start') this.$emit('start');
+				let touches = event.touches[0];
+				// console.log('touchs', touches)
+				// 滑块的左边不一定跟屏幕左边接壤，所以需要减去最外层父元素的左边值
+				let clientX = 0;
+				// #ifndef APP-NVUE
+				clientX = touches.clientX;
+				// #endif
+				// #ifdef APP-NVUE
+				clientX = touches.screenX;
+				// #endif
+				this.distanceX = clientX - this.sliderRect.left;
+				// 获得移动距离对整个滑块的值，此为带有多位小数的值，不能用此更新视图
+				// 否则造成通信阻塞，需要每改变一个step值时修改一次视图
+				this.newValue = ((this.distanceX / this.sliderRect.width) * (this.max - this.min)) + parseFloat(this.min);
+				this.status = 'moving';
+				// 发出moving事件
+				this.$emit('changing');
+				this.updateValue(this.newValue, true, index);
+			},
+			onTouchEnd(event, index = 1) {
+				if (this.disabled) return;
+				if (this.status === 'moving') {
+					this.updateValue(this.newValue, false, index);
+					this.$emit('change');
+				}
+				this.status = 'end';
+			},
+			updateValue(value, drag, index = 1) {
+				// 去掉小数部分，同时也是对step步进的处理
+				let valueFormat = this.format(value, index);
+				// 不允许滑动的值超过max最大值
+				if(valueFormat > this.max ) {
+					valueFormat = this.max
+				}
+				// 设置移动的距离，不能用百分比，因为NVUE不支持。
+				let width = Math.min((valueFormat - this.min) / (this.max - this.min) * this.sliderRect.width, this.sliderRect.width)
+				let barStyle = {
+					width: width + 'px'
+				};
+				// 移动期间无需过渡动画
+				if (drag == true) {
+					barStyle.transition = 'none';
+				} else {
+					// 非移动期间，删掉对过渡为空的声明，让css中的声明起效
+					delete barStyle.transition;
+				}
+				// 修改value值
+				if (this.isRange) {
+					this.rangeValue[index] = valueFormat;
+					this.$emit("update:modelValue", this.rangeValue);
+				} else {
+					// #ifdef VUE3
+					this.$emit("update:modelValue", valueFormat);
+					// #endif
+					// #ifdef VUE2
+					this.$emit("input", valueFormat);
+					// #endif
+				}
+
+				switch (index) {
+					case 0:
+						this.barStyle0 = {...barStyle};
+						break;
+					case 1:
+						this.barStyle = {...barStyle};
+						break;
+					default:
+						break;
+				}
+				
+			},
+			format(value, index = 1) {
+				// 将小数变成整数，为了减少对视图的更新，造成视图层与逻辑层的阻塞
+				if (this.isRange) {
+					switch (index) {
+						case 0:
+							return Math.round(
+								Math.max(this.min, Math.min(value, this.rangeValue[1] - this.step,this.max))
+								/ this.step
+							) * this.step;
+							break;
+						case 1:
+							return Math.round(
+								Math.max(this.min, this.rangeValue[0] + this.step, Math.min(value, this.max))
+								/ this.step
+							) * this.step;
+							break;
+						default:
+							break;
+					}
+				} else {
+					return Math.round(
+						Math.max(this.min, Math.min(value, this.max))
+						/ this.step
+					) * this.step;
+				}
+			},
+			onClick(event) {
+				if (this.disabled) return;
+				// 直接点击滑块的情况，计算方式与onTouchMove方法相同
+				const value = ((event.detail.x - this.sliderRect.left) / this.sliderRect.width) * 100;
+				this.updateValue(value, false);
 			}
-		},
+		}
 	}
 </script>
 
 <style lang="scss" scoped>
 	@import "../../libs/css/components.scss";
+	.u-slider {
+		position: relative;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+
+		&__native {
+			flex: 1;
+		}
+
+		&-inner {
+			flex: 1;
+			position: relative;
+			border-radius: 999px;
+			padding: 10px 18px;
+			justify-content: center;
+		}
+
+		&__show-value {
+			margin: 10px 18px 10px 0px;
+		}
+
+		&__show-range-value {
+			padding-top: 2px;
+			font-size: 12px;
+			line-height: 12px;
+			position: absolute;
+    		bottom: 0;
+		}
+
+		&__base {
+			background-color: #ebedf0;
+		}
+
+		/* #ifndef APP-NVUE */
+		&-inner:before {
+			position: absolute;
+			right: 0;
+			left: 0;
+			content: '';
+			top: -8px;
+			bottom: -8px;
+			z-index: -1;
+		}
+		/* #endif */
+
+		&__gap {
+			position: relative;
+			border-radius: 999px;
+			transition: width 0.2s;
+			background-color: #1989fa;
+		}
+
+		&__button {
+			width: 24px;
+			height: 24px;
+			border-radius: 50%;
+			box-shadow: 0 1px 2px rgba(0, 0, 0, 0.5);
+			background-color: #fff;
+			transform: scale(0.9);
+			/* #ifdef H5 */
+			cursor: pointer;
+			/* #endif */
+		}
+
+		&__button-wrap {
+			position: absolute;
+			// transform: translate3d(50%, -50%, 0);
+		}
+
+		&--disabled {
+			opacity: 0.5;
+		}
+	}
 </style>

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

@@ -200,12 +200,7 @@
 				// #endif
 			}
 		},
-		// #ifdef VUE2
-		beforeDestroy() {
-		// #endif
-		// #ifdef VUE3
 		beforeUnmount() {
-		// #endif
 			this.disconnectObserver('contentObserver')
 		}
 	}

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

@@ -167,12 +167,7 @@ export default {
 		getContentRef() {
 			return this.$refs['u-swipe-action-item__content'].ref
 		},
-		// #ifdef VUE2
-		beforeDestroy() {
-		// #endif
-		// #ifdef VUE3
 		beforeUnmount() {
-		// #endif
 			this.unbindBindingX()
 		}
 	}