uview-plus 3.1.52 → 3.2.5

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

@@ -1,7 +1,7 @@
 <template>
 	<view class="u-number-box">
 		<view
-		    class="u-number-box__slot"
+		    class="u-number-box__slot cursor-pointer"
 		    @tap.stop="clickHandler('minus')"
 		    @touchstart="onTouchStart('minus')"
 		    @touchend.stop="clearTimeout"
@@ -11,7 +11,7 @@
 		</view>
 		<view
 		    v-else-if="showMinus"
-		    class="u-number-box__minus"
+		    class="u-number-box__minus cursor-pointer"
 		    @tap.stop="clickHandler('minus')"
 		    @touchstart="onTouchStart('minus')"
 		    @touchend.stop="clearTimeout"
@@ -60,7 +60,7 @@
 			<!-- #endif -->
 		</slot>
 		<view
-		    class="u-number-box__slot"
+		    class="u-number-box__slot cursor-pointer"
 		    @tap.stop="clickHandler('plus')"
 		    @touchstart="onTouchStart('plus')"
 		    @touchend.stop="clearTimeout"
@@ -70,7 +70,7 @@
 		</view>
 		<view
 		    v-else-if="showPlus"
-		    class="u-number-box__plus"
+		    class="u-number-box__plus cursor-pointer"
 		    @tap.stop="clickHandler('plus')"
 		    @touchstart="onTouchStart('plus')"
 		    @touchend.stop="clearTimeout"

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

@@ -38,7 +38,8 @@
 						:style="{
 							height: $u.addUnit(itemHeight),
 							lineHeight: $u.addUnit(itemHeight),
-							fontWeight: index1 === innerIndex[index] ? 'bold' : 'normal'
+							fontWeight: index1 === innerIndex[index] ? 'bold' : 'normal',
+							display: 'block'
 						}"
 					>{{ getItemText(item1) }}</view>
 				</picker-view-column>
@@ -79,7 +80,7 @@
  */
 import props from './props.js';
 import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+import mixin from '../../libs/mixin/mixin.js';
 export default {
 	name: 'u-picker',
 	mixins: [mpMixin, mixin, props],
@@ -194,6 +195,8 @@ export default {
 		setColumnValues(columnIndex, values) {
 			// 替换innerColumns数组中columnIndex索引的值为values，使用的是数组的splice方法
 			this.innerColumns.splice(columnIndex, 1, values)
+            // 替换完成之后将修改列之后的已选值置空
+			this.setLastIndex(this.innerIndex.slice(0, columnIndex))
 			// 拷贝一份原有的innerIndex做临时变量，将大于当前变化列的所有的列的默认索引设置为0
 			let tmpIndex = uni.$u.deepClone(this.innerIndex)
 			for (let i = 0; i < this.innerColumns.length; i++) {

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

@@ -57,7 +57,7 @@
 	 * @property {Boolean}			overlay				是否显示遮罩 （默认 true ）
 	 * @property {String}			mode				弹出方向（默认 'bottom' ）
 	 * @property {String | Number}	duration			动画时长，单位ms （默认 300 ）
-	 * @property {String | Number}	overlayDuration			遮罩层动画时长，单位ms （默认 350 ）
+	 * @property {String | Number}	overlayDuration		遮罩层动画时长，单位ms （默认 350 ）
 	 * @property {Boolean}			closeable			是否显示关闭图标（默认 false ）
 	 * @property {Object | String}	overlayStyle		自定义遮罩的样式
 	 * @property {String | Number}	overlayOpacity		遮罩透明度，0-1之间（默认 0.5）

package/components/u-radio/u-radio.vue

@@ -1,12 +1,12 @@
 <template>
 	<view
-	    class="u-radio"
+	    class="u-radio cursor-pointer"
 		@tap.stop="wrapperClickHandler"
 	    :style="[radioStyle]"
 	    :class="[`u-radio-label--${parentData.iconPlacement}`, parentData.borderBottom && parentData.placement === 'column' && 'u-border-bottom']"
 	>
 		<view
-		    class="u-radio__icon-wrap"
+		    class="u-radio__icon-wrap cursor-pointer"
 		    @tap.stop="iconClickHandler"
 		    :class="iconClasses"
 		    :style="[iconWrapStyle]"

package/components/u-rate/u-rate.vue

@@ -11,7 +11,7 @@
             @touchend.stop="touchEnd"
         >
             <view
-                class="u-rate__content__item"
+                class="u-rate__content__item cursor-pointer"
                 v-for="(item, index) in Number(count)"
                 :key="index"
                 :class="[elClass]"

package/components/u-read-more/u-read-more.vue

@@ -1,160 +1,164 @@
-<template>
-	<view class="u-read-more">
-		<view
-		    class="u-read-more__content"
-		    :style="{
-				height: isLongContent && status === 'close' ? $u.addUnit(showHeight) : $u.addUnit(contentHeight),
-				textIndent: textIndent
-			}"
-		>
-			<view
-			    class="u-read-more__content__inner"
-			    ref="u-read-more__content__inner"
-			    :class="[elId]"
-			>
-				<slot></slot>
-			</view>
-		</view>
-		<view
-		    class="u-read-more__toggle"
-		    :style="[innerShadowStyle]"
-		    v-if="isLongContent"
-		>
-			<slot name="toggle">
-				<view
-				    class="u-read-more__toggle__text"
-				    @tap="toggleReadMore"
-				>
-					<u--text
-					    :text="status === 'close' ? closeText : openText"
-					    :color="color"
-					    :size="fontSize"
-					    :lineHeight="fontSize"
-					    margin="0 5px 0 0"
-					></u--text>
-					<view class="u-read-more__toggle__icon">
-						<u-icon
-						    :color="color"
-						    :size="fontSize + 2"
-						    :name="status === 'close' ? 'arrow-down' : 'arrow-up'"
-						></u-icon>
-					</view>
-				</view>
-			</slot>
-		</view>
-	</view>
-</template>
-
-<script>
-	// #ifdef APP-NVUE
-	const dom = uni.requireNativePlugin('dom')
-	// #endif
-	import props from './props.js';
-	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
-	/**
-	 * readMore 阅读更多
-	 * @description 该组件一般用于内容较长，预先收起一部分，点击展开全部内容的场景。
-	 * @tutorial https://ijry.github.io/uview-plus/components/readMore.html
-	 * @property {String | Number}	showHeight	内容超出此高度才会显示展开全文按钮，单位px（默认 400 ）
-	 * @property {Boolean}			toggle		展开后是否显示收起按钮（默认 false ）
-	 * @property {String}			closeText	关闭时的提示文字（默认 '展开阅读全文' ）
-	 * @property {String}			openText	展开时的提示文字（默认 '收起' ）
-	 * @property {String}			color		提示文字的颜色（默认 '#2979ff' ）
-	 * @property {String | Number}	fontSize	提示文字的大小，单位px （默认 14 ）
-	 * @property {Object}			shadowStyle	显示阴影的样式
-	 * @property {String}			textIndent	段落首行缩进的字符个数 （默认 '2em' ）
-	 * @property {String | Number}	name		用于在 open 和 close 事件中当作回调参数返回
-	 * @event {Function} open 内容被展开时触发
-	 * @event {Function} close 内容被收起时触发
-	 * @example <u-read-more><rich-text :nodes="content"></rich-text></u-read-more>
-	 */
-	export default {
-		name: 'u-read-more',
-		mixins: [mpMixin, mixin, props],
-		data() {
-			return {
-				isLongContent: false, // 是否需要隐藏一部分内容
-				status: 'close', // 当前隐藏与显示的状态，close-收起状态，open-展开状态
-				elId: uni.$u.guid(), // 生成唯一class
-				contentHeight: 100, // 内容高度
-			}
-		},
-		computed: {
-			// 展开后无需阴影，收起时才需要阴影样式
-			innerShadowStyle() {
-				if (this.status === 'open') return {}
-				else return this.shadowStyle
-			}
-		},
-		mounted() {
-			this.init()
-		},
-		emits: ["open", "close"],
-		methods: {
-			async init() {
-				this.getContentHeight().then(height => {
-					this.contentHeight = height
-					// 判断高度，如果真实内容高度大于占位高度，则显示收起与展开的控制按钮
-					if (height > uni.$u.getPx(this.showHeight)) {
-						this.isLongContent = true
-						this.status = 'close'
-					}
-				})
-			},
-			// 获取内容的高度
-			async getContentHeight() {
-				// 延时一定时间再获取节点
-				await uni.$u.sleep(30)
-				return new Promise(resolve => {
-					// #ifndef APP-NVUE
-					this.$uGetRect('.' + this.elId).then(res => {
-						resolve(res.height)
-					})
-					// #endif
-
-					// #ifdef APP-NVUE
-					const ref = this.$refs['u-read-more__content__inner']
-					dom.getComponentRect(ref, (res) => {
-						resolve(res.size.height)
-					})
-					// #endif
-				})
-			},
-			// 展开或者收起
-			toggleReadMore() {
-				this.status = this.status === 'close' ? 'open' : 'close'
-				// 如果toggle为false，隐藏"收起"部分的内容
-				if (this.toggle == false) this.isLongContent = false
-				// 发出打开或者收齐的事件
-				this.$emit(this.status, this.name)
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-@import "../../libs/css/components.scss";
-
-.u-read-more {
-
-	&__content {
-		overflow: hidden;
-		color: $u-content-color;
-		font-size: 15px;
-		text-align: left;
-	}
-
-	&__toggle {
-		@include flex;
-		justify-content: center;
-
-		&__text {
-			@include flex;
-			align-items: center;
-			justify-content: center;
-			margin-top: 5px;
-		}
-	}
-}
-</style>
+<template>
+	<view class="u-read-more">
+		<view
+		    class="u-read-more__content"
+		    :style="{
+				height: isLongContent && status === 'close' ? $u.addUnit(showHeight) : $u.addUnit(contentHeight),
+				textIndent: textIndent
+			}"
+		>
+			<view
+			    class="u-read-more__content__inner"
+			    ref="u-read-more__content__inner"
+			    :class="[elId]"
+			>
+				<slot></slot>
+			</view>
+		</view>
+		<view
+		    class="u-read-more__toggle"
+		    :style="[innerShadowStyle]"
+		    v-if="isLongContent"
+		>
+			<slot name="toggle">
+				<view
+				    class="u-read-more__toggle__text"
+				    @tap="toggleReadMore"
+				>
+					<up-text
+					    :text="status === 'close' ? closeText : openText"
+					    :color="color"
+					    :size="fontSize"
+					    :lineHeight="fontSize"
+					    margin="0 5px 0 0"
+					></up-text>
+					<view class="u-read-more__toggle__icon">
+						<u-icon
+						    :color="color"
+						    :size="fontSize + 2"
+						    :name="status === 'close' ? 'arrow-down' : 'arrow-up'"
+						></u-icon>
+					</view>
+				</view>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const dom = uni.requireNativePlugin('dom')
+	// #endif
+	import props from './props.js';
+	import mpMixin from '../../libs/mixin/mpMixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
+	/**
+	 * readMore 阅读更多
+	 * @description 该组件一般用于内容较长，预先收起一部分，点击展开全部内容的场景。
+	 * @tutorial https://ijry.github.io/uview-plus/components/readMore.html
+	 * @property {String | Number}	showHeight	内容超出此高度才会显示展开全文按钮，单位px（默认 400 ）
+	 * @property {Boolean}			toggle		展开后是否显示收起按钮（默认 false ）
+	 * @property {String}			closeText	关闭时的提示文字（默认 '展开阅读全文' ）
+	 * @property {String}			openText	展开时的提示文字（默认 '收起' ）
+	 * @property {String}			color		提示文字的颜色（默认 '#2979ff' ）
+	 * @property {String | Number}	fontSize	提示文字的大小，单位px （默认 14 ）
+	 * @property {Object}			shadowStyle	显示阴影的样式
+	 * @property {String}			textIndent	段落首行缩进的字符个数 （默认 '2em' ）
+	 * @property {String | Number}	name		用于在 open 和 close 事件中当作回调参数返回
+	 * @event {Function} open 内容被展开时触发
+	 * @event {Function} close 内容被收起时触发
+	 * @example <u-read-more><rich-text :nodes="content"></rich-text></u-read-more>
+	 */
+	export default {
+		name: 'u-read-more',
+		mixins: [mpMixin, mixin, props],
+		data() {
+			return {
+				isLongContent: false, // 是否需要隐藏一部分内容
+				status: 'close', // 当前隐藏与显示的状态，close-收起状态，open-展开状态
+				elId: uni.$u.guid(), // 生成唯一class
+				contentHeight: 100, // 内容高度
+			}
+		},
+		computed: {
+			// 展开后无需阴影，收起时才需要阴影样式
+			innerShadowStyle() {
+				if (this.status === 'open') return {}
+				else return this.shadowStyle
+			}
+		},
+		mounted() {
+			this.init()
+		},
+		emits: ["open", "close"],
+		methods: {
+			async init() {
+				this.getContentHeight().then(height => {
+					this.contentHeight = height
+					// 判断高度，如果真实内容高度大于占位高度，则显示收起与展开的控制按钮
+					if (height > uni.$u.getPx(this.showHeight)) {
+						this.isLongContent = true
+						this.status = 'close'
+					} else {
+						// https://github.com/ijry/uview-plus/issues/270
+						this.isLongContent = false
+						this.status = 'close'
+					}
+				})
+			},
+			// 获取内容的高度
+			async getContentHeight() {
+				// 延时一定时间再获取节点
+				await uni.$u.sleep(30)
+				return new Promise(resolve => {
+					// #ifndef APP-NVUE
+					this.$uGetRect('.' + this.elId).then(res => {
+						resolve(res.height)
+					})
+					// #endif
+
+					// #ifdef APP-NVUE
+					const ref = this.$refs['u-read-more__content__inner']
+					dom.getComponentRect(ref, (res) => {
+						resolve(res.size.height)
+					})
+					// #endif
+				})
+			},
+			// 展开或者收起
+			toggleReadMore() {
+				this.status = this.status === 'close' ? 'open' : 'close'
+				// 如果toggle为false，隐藏"收起"部分的内容
+				if (this.toggle == false) this.isLongContent = false
+				// 发出打开或者收齐的事件
+				this.$emit(this.status, this.name)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+@import "../../libs/css/components.scss";
+
+.u-read-more {
+
+	&__content {
+		overflow: hidden;
+		color: $u-content-color;
+		font-size: 15px;
+		text-align: left;
+	}
+
+	&__toggle {
+		@include flex;
+		justify-content: center;
+
+		&__text {
+			@include flex;
+			align-items: center;
+			justify-content: center;
+			margin-top: 5px;
+		}
+	}
+}
+</style>

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

@@ -1,7 +1,7 @@
 <template>
 	<view
 		class="u-slider"
-		:style="[$u.addStyle(customStyle)]"
+		:style="[addStyle(customStyle)]"
 	>
 		<slider
 			:min="min"
@@ -10,7 +10,7 @@
 			:value="modelValue"
 			:activeColor="activeColor"
 			:backgroundColor="inactiveColor"
-			:blockSize="$u.getPx(blockSize)"
+			:blockSize="getPx(blockSize)"
 			:blockColor="blockColor"
 			:showValue="showValue"
 			:disabled="disabled"
@@ -20,15 +20,15 @@
 	</view>
 </template>
 
-<script>
+<script>
 	import props from './props.js';
 	import mpMixin from '../../libs/mixin/mpMixin.js';
-	import mixin from '../../libs/mixin/mixin.js';
+	import mixin from '../../libs/mixin/mixin.js';
 	export default {
-		name: 'u--slider',
+		name: 'up-slider',
 		mixins: [mpMixin, mixin, props],
 		emits: ["changing", "change", "update:modelValue"],
-		methods: {
+		methods: {
 			// 拖动过程中触发
 			changingHandler(e) {
 				const {