uview-plus 3.7.0 → 3.7.28

package/components/u-coupon/u-coupon.vue

@@ -163,6 +163,7 @@
 		border-radius: 8rpx;
 		background: #ffebf0;
 		color: $u-main-color;
+        width: 100%;
 		
 		&--coupon {
 			border-radius: 16rpx;
@@ -210,8 +211,6 @@
 		&--card {
 			border-radius: 16rpx;
 		}
-
-        width: 100%;
 		
 		&--small {
 			// width: 520rpx;

package/components/u-form/u-form.vue

@@ -121,7 +121,7 @@
 				this.children.map((child) => {
 					// 如果u-form-item的prop在props数组中，则清除对应的校验结果信息
 					if (props[0] === undefined || props.includes(child.prop)) {
-						child.message = null;
+						child.message = '';
 					}
 				});
 			},
@@ -194,7 +194,7 @@
 											//没有配置，或者配置了showErrorMsg为true时候，才修改子组件message，默认没有配置
 											if(!options||options?.showErrorMsg==true){
 												child.message =
-													childErrors[0]?.message ? childErrors[0].message : null;
+													childErrors[0]?.message ? childErrors[0].message : '';
 											}
 											if (i == (rules.length - 1)) {
 												resolve(errorsRes)

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

@@ -1,5 +1,5 @@
 <template>
-	<view class="u-form-item" :class="{'u-form-item--error':(!!message && parentData['errorType'] === 'message')}">
+	<view class="u-form-item" :class="{'u-form-item--error':(message != '' && parentData['errorType'] === 'message')}">
 		<view
 			class="u-form-item__body"
 			@tap="clickHandler"
@@ -59,7 +59,7 @@
 		</view>
 		<slot name="error">
 			<text
-				v-if="!!message && parentData['errorType'] === 'message'"
+				v-if="message != '' && parentData['errorType'] === 'message'"
 				class="u-form-item__body__right__message"
 				:style="{
 					marginLeft:  addUnit((labelPosition || parentData['labelPosition']) === 'top' ? 0 : (labelWidth || parentData['labelWidth']))
@@ -68,8 +68,8 @@
 		</slot>
 		<u-line
 			v-if="borderBottom"
-			:color="message && parentData['errorType'] === 'border-bottom' ? color['error'] : propsLine['color']"
-			:customStyle="`margin-top: ${message && parentData['errorType'] === 'message' ? '5px' : 0}`"
+			:color="message != '' && parentData['errorType'] === 'border-bottom' ? color['error'] : propsLine['color']"
+			:customStyle="`margin-top: ${message != '' && parentData['errorType'] === 'message' ? '5px' : 0}`"
 		></u-line>
 	</view>
 </template>
@@ -167,7 +167,7 @@
 			},
 			// 移除u-form-item的校验结果
 			clearValidate() {
-				this.message = null
+				this.message = ''
 			},
 			// 清空当前的组件的校验结果，并重置为初始值
 			resetField() {
@@ -176,7 +176,7 @@
 				// 将up-form的model的prop属性链还原原始值
 				setProperty(this.parent.$props['model'], this.prop, value)
 				// 移除校验结果
-				this.message = null
+				this.message = ''
 			},
 			// 点击组件
 			clickHandler() {

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

@@ -68,7 +68,7 @@
 	// #endif
 	/**
 	 * loading 加载动画
-	 * @description 警此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
+	 * @description 此组件为一个小动画，目前用在uView的loadmore加载更多和switch开关等组件的正在加载状态场景。
 	 * @tutorial https://uview-plus.jiangruyi.com/components/loading.html
 	 * @property {Boolean}			show			是否显示组件  (默认 true)
 	 * @property {String}			color			动画活动区域的颜色，只对 mode = flower 模式有效（默认color['u-tips-color']）
@@ -346,3 +346,4 @@
 
 	/* #endif */
 </style>
+

package/components/u-qrcode/u-qrcode.vue

@@ -135,7 +135,7 @@ export default {
             default: () => false
         },
     },
-    emits: ['result', 'longpressCallback'],
+    emits: ['preview', 'result', 'longpressCallback'],
     data() {
         return {
             loading: false,

package/components/u-select/u-select.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="u-select">
-		<view class="u-select__content">
+		<view :class="['u-select__content', disabled && 'disabled']">
 			<view class="u-select__label" @click="openSelect">
 				<slot name="text" :currentLabel="currentLabel">
 					<text class="u-select__text" v-if="showOptionsLabel">
@@ -14,26 +14,16 @@
 					<up-icon name="arrow-down" :size="iconSize" :color="iconColor"></up-icon>
 				</slot>
 			</view>
-			<u-overlay
-				:show="isOpen"
-				@click="overlayClick"
-				v-if="overlay"
-				:zIndex="zIndex"
-				:duration="duration + 50"
-				:customStyle="overlayStyle"
-				:opacity="overlayOpacity"
-				@touchmove.stop.prevent="noop"
-			></u-overlay>
+			<u-overlay :show="isOpen" @click="overlayClick" v-if="overlay" :zIndex="zIndex" :duration="duration + 50"
+				:customStyle="overlayStyle" :opacity="overlayOpacity" @touchmove.stop.prevent="noop"></u-overlay>
 			<view class="u-select__options__wrap"
 				:style="{ overflowY: 'auto', zIndex: zIndex + 1, left: optionsWrapLeft, right: optionsWrapRight, maxHeight: maxHeight}">
 				<view class="u-select__options" v-if="isOpen">
 					<slot name="options">
-						<view class="u-select__options_item"
-							:class="current == item[keyName] ? 'active': ''"
-							:key="index" v-for="(item, index) in options"
-							@click="selectItem(item)">
+						<view class="u-select__options_item" :class="current == item[keyName] ? 'active': ''"
+							:key="index" v-for="(item, index) in options" @click="selectItem(item)">
 							<slot name="optionItem" :item="item">
-								<text class="u-select__item_text" :style="{color: itemColor}"> 
+								<text class="u-select__item_text" :style="{color: itemColor}">
 									{{item[labelName]}}
 								</text>
 							</slot>
@@ -46,176 +36,206 @@
 </template>
 
 <script>
-import { mpMixin } from '../../libs/mixin/mpMixin';
-import { mixin } from '../../libs/mixin/mixin';
-import { getWindowInfo } from '../../libs/function/index';
-export default {
-	name:"up-select",
-	mixins: [mpMixin, mixin],
-	emits: ['update:current', 'select'],
-	props: {
-		maxHeight: {
-			type: String,
-			default: '90vh'
-		},
-		overlay: {
-			type: Boolean,
-			default: true
-		},
-		overlayOpacity: {
-			type: Number,
-			default: 0.01
-		},
-		overlayStyle: {
-			type: Object,
-			default: () => {
-				return {}
+	import {
+		mpMixin
+	} from '../../libs/mixin/mpMixin';
+	import {
+		mixin
+	} from '../../libs/mixin/mixin';
+	import {
+		getWindowInfo
+	} from '../../libs/function/index';
+	export default {
+		name: "up-select",
+		mixins: [mpMixin, mixin],
+		emits: ['update:current', 'select'],
+		props: {
+			maxHeight: {
+				type: String,
+				default: '90vh'
+			},
+			overlay: {
+				type: Boolean,
+				default: true
+			},
+			overlayOpacity: {
+				type: Number,
+				default: 0.01
+			},
+			overlayStyle: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			duration: {
+				type: Number,
+				default: 300
+			},
+			label: {
+				type: String,
+				default: '选项'
+			},
+			options: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			keyName: {
+				type: String,
+				default: 'id'
+			},
+			labelName: {
+				type: String,
+				default: 'name'
+			},
+			showOptionsLabel: {
+				type: Boolean,
+				default: false
+			},
+			current: {
+				type: [String, Number],
+				default: ''
+			},
+			zIndex: {
+				type: Number,
+				default: 11000
+			},
+			itemColor: {
+				type: String,
+				default: '#333333'
+			},
+			iconColor: {
+				type: String,
+				default: ''
+			},
+			iconSize: {
+				type: [String],
+				default: '13px'
+			},
+			// 是否禁用
+			disabled: {
+				type: Boolean,
+				default: false
 			}
 		},
-		duration: {
-			type: Number,
-			default: 300
-		},
-		label: {
-			type: String,
-			default: '选项'
-		},
-		options: {
-			type: Array,
-			default: () => {
-				return []
+		data() {
+			return {
+				isOpen: false,
+				optionsWrapLeft: 'auto',
+				optionsWrapRight: 'auto'
 			}
 		},
-		keyName: {
-			type: String,
-			default: 'id'
-		},
-		labelName: {
-			type: String,
-			default: 'name'
-		},
-		showOptionsLabel: {
-			type: Boolean,
-			default: false
-		},
-		current: {
-			type: [String, Number],
-			default: ''
-		},
-		zIndex: {
-			type: Number,
-			default: 11000
-		},
-		itemColor: {
-			type: String,
-			default: '#333333'
-		},
-		iconColor: {
-			type: String,
-			default: ''
-		},
-		iconSize: {
-			type: [String],
-			default: '13px'
-		}
-	},
-	data() {
-		return {
-			isOpen: false,
-			optionsWrapLeft: 'auto',
-			optionsWrapRight: 'auto'
-		}
-	},
-	computed: {
-		currentLabel() {
-			let name = '';
-			this.options.forEach((ele) => {
-				if (ele[this.keyName] === this.current) {
-					name = ele[this.labelName];
-				}
-			});
-			return name;
-		}
-    },
-    methods: {
-      openSelect() {
-        this.isOpen = true;
-		this.$nextTick(() => {
-			if (this.isOpen) {
-				this.adjustOptionsWrapPosition();
+		computed: {
+			currentLabel() {
+				let name = '';
+				this.options.forEach((ele) => {
+					if (ele[this.keyName] === this.current) {
+						name = ele[this.labelName];
+					}
+				});
+				return name;
 			}
-		});
-      },
-	  overlayClick() {
-		  this.isOpen = false;
-	  },
-      selectItem(item) {
-        this.isOpen = false;
-        this.$emit('update:current', item[this.keyName]);
-        this.$emit('select', item);
-      },
-	  adjustOptionsWrapPosition() {
-		let wi = getWindowInfo();
-		let windowWidth = wi.windowWidth;
-		this.$uGetRect('.u-select__options__wrap').then(rect => {
-			if (rect.left + rect.width > windowWidth) {
-				// 如果右侧被遮挡，则调整到左侧
-				this.optionsWrapLeft = 'auto';
-				this.optionsWrapRight = `0px`;
+		},
+		methods: {
+			openSelect() {
+				if (this.disabled) return;
+				this.isOpen = true;
+				this.$nextTick(() => {
+					if (this.isOpen) {
+						this.adjustOptionsWrapPosition();
+					}
+				});
+			},
+			closeSelect() {
+				this.isOpen = false;
+			},
+			overlayClick() {
+				this.isOpen = false;
+			},
+			selectItem(item) {
+				this.isOpen = false;
+				this.$emit('update:current', item[this.keyName]);
+				this.$emit('select', item);
+			},
+			adjustOptionsWrapPosition() {
+				let wi = getWindowInfo();
+				let windowWidth = wi.windowWidth;
+				this.$uGetRect('.u-select__options__wrap').then(rect => {
+					if (rect.left + rect.width > windowWidth) {
+						// 如果右侧被遮挡，则调整到左侧
+						this.optionsWrapLeft = 'auto';
+						this.optionsWrapRight = `0px`;
+					}
+				});
 			}
-		});
-	  }
-    }
-}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-  .u-select__content {
-    position: relative;
-    .u-select__label {
-      display: flex;
-	  justify-content: space-between;
-      /* #ifdef H5 */
-      &:hover {
-        cursor: pointer;
-      }
-      /* #endif */
-    }
-    .u-select__text {
-      margin-right: 2px;
-    }
-	.u-select__options__wrap {
-		margin-bottom: 46px;
-		position: absolute;
-		top: 20px;
-		left: 0;
+	.u-select__content {
+		position: relative;
+
+		.u-select__label {
+			display: flex;
+			justify-content: space-between;
+
+			/* #ifdef H5 */
+			&:hover {
+				cursor: pointer;
+			}
+
+			/* #endif */
+		}
+
+		.u-select__text {
+			margin-right: 2px;
+		}
+
+		&.disabled {
+			opacity: 0.6;
+			pointer-events: none;
+		}
+
+		.u-select__options__wrap {
+			margin-bottom: 46px;
+			position: absolute;
+			top: 20px;
+			left: 0;
+		}
+
+		.u-select__options {
+			min-width: 100px;
+			box-sizing: border-box;
+			border-radius: 4px;
+			border: 1px solid #f1f1f1;
+			background-color: #fff;
+
+			.u-select__options_item {
+				padding: 10px 12px;
+				box-sizing: border-box;
+				width: 100%;
+				height: 100%;
+
+				&:hover {
+					background-color: #f7f7f7;
+				}
+
+				/* #ifdef H5 */
+				&:hover {
+					cursor: pointer;
+				}
+
+				.u-select__item_text {
+					&:hover {
+						cursor: pointer;
+					}
+				}
+
+				/* #endif */
+			}
+		}
 	}
-    .u-select__options {
-      min-width: 100px;
-	  box-sizing: border-box;
-      border-radius: 4px;
-      border: 1px solid #f1f1f1;
-      background-color: #fff;
-      .u-select__options_item {
-        padding: 10px 12px;
-		box-sizing: border-box;
-        width: 100%;
-        height: 100%;
-        &:hover {
-          background-color: #f7f7f7;
-        }
-        /* #ifdef H5 */
-        &:hover {
-          cursor: pointer;
-        }
-        .u-select__item_text {
-          &:hover {
-            cursor: pointer;
-          }
-        }
-        /* #endif */
-      }
-    }
-  }
 </style>
-