uview-plus 3.8.55 → 3.8.106

package/components/u-tabs/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import TabsDefaultProps from './tabs'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(TabsDefaultProps)
 export const props = defineMixin({
     props: {
         // 滑块的移动过渡时间，单位ms

package/components/u-tabs/u-tabs.vue

@@ -7,7 +7,7 @@
 					class="u-tabs__wrapper__scroll-view" :show-scrollbar="false" ref="u-tabs__wrapper__scroll-view">
 					<view class="u-tabs__wrapper__nav" ref="u-tabs__wrapper__nav">
 						<view class="u-tabs__wrapper__nav__item" v-for="(item, index) in tabList" :key="index"
-							@tap="clickHandler(item, index)" @longpress="longPressHandler(item,index)"
+							@tap="clickHandler(item, index, $event)" @longpress="longPressHandler(item,index)"
 							:ref="`u-tabs__wrapper__nav__item-${index}`"
 							:style="[itemComputedStyle, {flex: scrollable ? '' : 1}]" :class="[`u-tabs__wrapper__nav__item-${index}`,
 								shapeMode && `u-tabs__wrapper__nav__item--${shapeMode}`,
@@ -108,7 +108,7 @@
 	 * @property {String}	keyName	 从`list`元素对象中读取的键名（默认 'name' ）
 	 * @property {String}	shapeMode 标签形态模式，可选capsule/card/pill-arrow/tag（默认 '' ）
 	 * @event {Function(index)} change 标签改变时触发 index: 点击了第几个tab，索引从0开始
-	 * @event {Function(index)} click 点击标签时触发 index: 点击了第几个tab，索引从0开始
+	 * @event {Function(item, index, event)} click 点击标签时触发，event 为原始点击事件
 	 * @event {Function(index)} longPress 长按标签时触发 index: 点击了第几个tab，索引从0开始
 	 * @example <u-tabs :list="list" :is-scroll="false" :current="current" @change="change" @longPress="longPress"></u-tabs>
 	 */
@@ -195,10 +195,13 @@
 					const isActive = index == this.innerCurrent
 					const defaultActiveColor = defProps.tabs?.activeStyle?.color || '#303133'
 					const defaultInactiveColor = defProps.tabs?.inactiveStyle?.color || '#606266'
-					const isActiveStyleOverridden = this.upHasProp('activeStyle')
-						|| (customeStyle && customeStyle.color && customeStyle.color !== defaultActiveColor)
-					const isInactiveStyleOverridden = this.upHasProp('inactiveStyle')
-						|| (customeStyle && customeStyle.color && customeStyle.color !== defaultInactiveColor)
+					const hasCustomColor = customeStyle
+						&& Object.prototype.hasOwnProperty.call(customeStyle, 'color')
+						&& String(customeStyle.color ?? '').trim() !== ''
+					const isActiveStyleOverridden = hasCustomColor && (this.upHasProp('activeStyle')
+						|| customeStyle.color !== defaultActiveColor)
+					const isInactiveStyleOverridden = hasCustomColor && (this.upHasProp('inactiveStyle')
+						|| customeStyle.color !== defaultInactiveColor)
 					if (isActive && ['pill-arrow', 'tag'].includes(this.shapeMode) && !isActiveStyleOverridden) {
 						style.color = '#ffffff'
 					} else if (isActive && !isActiveStyleOverridden) {
@@ -267,12 +270,12 @@
 				// #endif
 			},
 			// 点击某一个标签
-			clickHandler(item, index) {
+			clickHandler(item, index, event) {
 				// 因为标签可能为disabled状态，所以click是一定会发出的，但是change事件是需要可用的状态才发出
 				this.$emit('click', {
 					...item,
 					index
-				}, index)
+				}, index, event)
 				// 如果disabled状态，返回
 				if (item.disabled) return
 				// 如果点击当前不触发change

package/components/u-tabs-item/props.js

@@ -1,5 +1,7 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps({ tabsItem: {} })
 export const props = defineMixin({
     props: {
 

package/components/u-tabs-pro/u-tabs-pro.vue

@@ -0,0 +1,212 @@
+<template>
+	<view class="u-tabs-pro" :class="customClass" :style="customStyle">
+		<up-tabs
+			:list="safeList"
+			:keyName="keyName"
+			:current="innerCurrent"
+			:lineColor="resolvedLineColor"
+			:activeStyle="activeStyle"
+			:inactiveStyle="inactiveStyle"
+			:lineWidth="lineWidth"
+			:lineHeight="lineHeight"
+			:lineBgSize="lineBgSize"
+			:itemStyle="itemStyle"
+			:scrollable="scrollable"
+			:duration="Number(duration)"
+			:iconStyle="iconStyle"
+			:shapeMode="shapeMode"
+			@update:current="updateCurrent"
+			@click="clickHandler"
+			@longPress="longPressHandler"
+			@change="changeHandler"
+		>
+			<template v-if="$slots.left" #left>
+				<slot name="left" />
+			</template>
+			<template v-if="$slots.icon" #icon="scope">
+				<slot name="icon" :item="scope.item" :keyName="scope.keyName" :index="scope.index" />
+			</template>
+			<template v-if="$slots.tab || $slots.content" #content="scope">
+				<slot name="tab" :item="scope.item" :keyName="scope.keyName" :index="scope.index">
+					<slot name="content" :item="scope.item" :keyName="scope.keyName" :index="scope.index" />
+				</slot>
+			</template>
+			<template v-if="$slots.right" #right>
+				<slot name="right" />
+			</template>
+		</up-tabs>
+		<view
+			v-if="showContent"
+			class="u-tabs-pro__content"
+			:class="contentClass"
+			:style="contentStyle"
+		>
+			<slot
+				:current="innerCurrent"
+				:index="innerCurrent"
+				:item="currentItem"
+				:value="currentValue"
+				:list="safeList"
+			/>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { mpMixin } from '../../libs/mixin/mpMixin'
+	import { mixin } from '../../libs/mixin/mixin'
+
+	export default {
+		name: 'u-tabs-pro',
+		mixins: [mpMixin, mixin],
+		props: {
+			list: {
+				type: Array,
+				default: () => []
+			},
+			keyName: {
+				type: String,
+				default: 'name'
+			},
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			contentMode: {
+				type: String,
+				default: 'static'
+			},
+			lineColor: {
+				type: String,
+				default: ''
+			},
+			activeStyle: {
+				type: [String, Object],
+				default: () => ({})
+			},
+			inactiveStyle: {
+				type: [String, Object],
+				default: () => ({})
+			},
+			lineWidth: {
+				type: [String, Number],
+				default: 20
+			},
+			lineHeight: {
+				type: [String, Number],
+				default: 3
+			},
+			lineBgSize: {
+				type: String,
+				default: 'cover'
+			},
+			itemStyle: {
+				type: [String, Object],
+				default: () => ({ height: '44px' })
+			},
+			scrollable: {
+				type: Boolean,
+				default: true
+			},
+			duration: {
+				type: [Number, String],
+				default: 300
+			},
+			iconStyle: {
+				type: [String, Object],
+				default: () => ({})
+			},
+			shapeMode: {
+				type: String,
+				default: ''
+			},
+			showContent: {
+				type: Boolean,
+				default: true
+			},
+			contentClass: {
+				type: String,
+				default: ''
+			},
+			contentStyle: {
+				type: [String, Object, Array],
+				default: ''
+			},
+			bindIndexRef: {
+				type: String,
+				default: ''
+			}
+		},
+		emits: ['click', 'longPress', 'change', 'update:current'],
+		data() {
+			return {
+				innerCurrent: 0
+			}
+		},
+		computed: {
+			safeList() {
+				return Array.isArray(this.list) ? this.list : []
+			},
+			currentItem() {
+				return this.safeList[this.innerCurrent] || null
+			},
+			currentValue() {
+				return this.currentItem ? this.currentItem[this.keyName] : undefined
+			},
+			resolvedLineColor() {
+				return this.lineColor || undefined
+			}
+		},
+		watch: {
+			current: {
+				immediate: true,
+				handler(value) {
+					this.innerCurrent = this.normalizeCurrent(value)
+				}
+			},
+			list: {
+				deep: true,
+				handler() {
+					const nextCurrent = this.normalizeCurrent(this.innerCurrent)
+					if (nextCurrent !== this.innerCurrent) {
+						this.innerCurrent = nextCurrent
+						this.$emit('update:current', nextCurrent)
+					}
+				}
+			}
+		},
+		methods: {
+			normalizeCurrent(value) {
+				const parsed = Number(value)
+				const nextValue = Number.isFinite(parsed) ? parsed : 0
+				const maxIndex = Math.max(this.safeList.length - 1, 0)
+				return Math.min(Math.max(nextValue, 0), maxIndex)
+			},
+			updateCurrent(value) {
+				const nextCurrent = this.normalizeCurrent(value)
+				this.innerCurrent = nextCurrent
+				this.$emit('update:current', nextCurrent)
+			},
+			clickHandler(item, index, event) {
+				this.$emit('click', item, index, event)
+			},
+			longPressHandler(item, index) {
+				this.$emit('longPress', item, index)
+			},
+			changeHandler(item, index) {
+				this.updateCurrent(index)
+				this.$emit('change', item, index)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-tabs-pro {
+		width: 100%;
+
+		&__content {
+			width: 100%;
+		}
+	}
+</style>

package/components/u-tag/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import TagDefaultProps from './tag'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(TagDefaultProps)
 export const props = defineMixin({
     props: {
         // 标签类型info、primary、success、warning、error

package/components/u-td/props.js

@@ -1,5 +1,7 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps({ td: {} })
 export const props = defineMixin({
     props: {
 

package/components/u-text/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import TextDefaultProps from './text'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(TextDefaultProps)
 export const props = defineMixin({
     props: {
         // 主题颜色

package/components/u-text/text.js

@@ -33,7 +33,7 @@ export default {
         lineHeight: '',
         align: 'left',
         wordWrap: 'normal',
-		flex1: true
+		flex1: false
     }
 
 }

package/components/u-text/u-text.vue

@@ -73,10 +73,22 @@ import value from './value.js'
 import { mpMixin } from '../../libs/mixin/mpMixin';
 import { mixin } from '../../libs/mixin/mixin';
 import { buttonMixin } from '../../libs/mixin/button';
-import { openType } from '../../libs/mixin/openType';
-import { addStyle, addUnit, deepMerge } from '../../libs/function/index';
-/**
- * Text 文本
+import { openType } from '../../libs/mixin/openType';
+import { addStyle, addUnit, deepMerge } from '../../libs/function/index';
+
+function normalizeLineHeight(value) {
+    const valueString = String(value).trim()
+    const numericValue = Number(valueString)
+    const isUnitless =
+        /^[+-]?(?:\d+\.?\d*|\.\d+)$/.test(valueString) &&
+        numericValue > 0 &&
+        numericValue < 10
+
+    return isUnitless ? valueString : addUnit(value)
+}
+
+/**
+ * Text 文本
  * @description 此组件集成了文本类在项目中的常用功能，包括状态，拨打电话，格式化日期，*替换，超链接...等功能。 您大可不必在使用特殊文本时自己定义，text组件几乎涵盖您能使用的大部分场景。
  * @tutorial https://uview-plus.jiangruyi.com/components/loading.html
  * @property {String} 					type		主题颜色
@@ -97,7 +109,7 @@ import { addStyle, addUnit, deepMerge } from '../../libs/function/index';
  * @property {Object | String} 			iconStyle	图标的样式 （默认 {fontSize: '15px'} ）
  * @property {String} 					decoration	文字装饰，下划线，中划线等，可选值 none|underline|line-through（默认 'none' ）
  * @property {Object | String | Number}	margin		外边距，对象、字符串，数值形式均可（默认 0 ）
- * @property {String | Number} 			lineHeight	文本行高
+ * @property {String | Number} 			lineHeight	文本行高，支持带单位值或无单位倍数（如 1.2）
  * @property {String} 					align		文本对齐方式，可选值left|center|right（默认 'left' ）
  * @property {String} 					wordWrap	文字换行，可选值break-word|normal|anywhere（默认 'normal' ）
  * @event {Function} click  点击触发事件
@@ -139,7 +151,7 @@ export default {
             }
             this.isNvue && this.lines && (style.lines = this.lines)
             this.lineHeight &&
-                (style.lineHeight = addUnit(this.lineHeight))
+                (style.lineHeight = normalizeLineHeight(this.lineHeight))
             !this.isNvue && this.block && (style.display = 'block')
             return deepMerge(style, addStyle(this.customStyle))
         },

package/components/u-textarea/props.js

@@ -1,6 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import TextareaDefaultProps from './textarea'
+import { registerComponentProps } from '../../libs/config/props.js'
 
+const defProps = registerComponentProps(TextareaDefaultProps)
 export const props = defineMixin({
 	props: {
 		// 输入框的内容

package/components/u-textarea/u-textarea.vue

@@ -34,7 +34,7 @@
             class="u-textarea__count"
             :style="countStyle"
             v-if="count"
-            >{{ innerValue.length }}/{{ maxlength }}</text
+            >{{ valueLength }}/{{ maxlength }}</text
         >
 		<!-- #endif -->
     </view>
@@ -106,7 +106,7 @@ export default {
 	    value: {
 	        immediate: true,
 	        handler(newVal, oldVal) {
-	            this.innerValue = newVal;
+	            this.innerValue = this.normalizeValue(newVal);
 	            /* #ifdef H5 */
 	            // 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
 	            if (
@@ -126,7 +126,7 @@ export default {
         modelValue: {
 	        immediate: true,
 	        handler(newVal, oldVal) {
-	            this.innerValue = newVal;
+	            this.innerValue = this.normalizeValue(newVal);
 	            /* #ifdef H5 */
 	            // 在H5中，外部value变化后，修改input中的值，不会触发@input事件，此时手动调用值变化方法
 	            if (
@@ -144,6 +144,10 @@ export default {
         // #endif
 	},
     computed: {
+        // 字数统计安全取值，避免 v-model 为 null/undefined/number 时访问 length 报错
+        valueLength() {
+            return String(this.innerValue ?? '').length
+        },
         placeholderStyleInner() {
             if (this.placeholderStyle) {
                 return addStyle(this.placeholderStyle, typeof this.placeholderStyle === 'string' ? 'string' : 'object')
@@ -225,6 +229,12 @@ export default {
     methods: {
         addStyle,
         addUnit,
+		// 统一将外部值归一为可安全展示/统计的内容
+		normalizeValue(value) {
+			if (value === null || value === undefined) return ''
+			// textarea 展示与统计均按字符串处理
+			return typeof value === 'number' ? String(value) : value
+		},
 		// 在微信小程序中，不支持将函数当做props参数，故只能通过ref形式调用
 		setFormatter(e) {
 			this.innerFormatter = e
@@ -241,10 +251,11 @@ export default {
             this.$emit("linechange", e);
         },
         onInput(e) {
-			let { value = "" } = e.detail || {};
+			let { value } = e.detail || {};
+			value = this.normalizeValue(value)
 			// 格式化过滤方法
 			const formatter = this.formatter || this.innerFormatter
-			const formatValue = formatter(value)
+			const formatValue = this.normalizeValue(formatter(value))
 			// 为了避免props的单向数据流特性，需要先将innerValue值设置为当前值，再在$nextTick中重新赋予设置后的值才有效
 			this.innerValue = value
 			this.$nextTick(() => {

package/components/u-th/props.js

@@ -1,5 +1,7 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps({ th: {} })
 export const props = defineMixin({
     props: {
 

package/components/u-toolbar/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import ToolbarDefaultProps from './toolbar'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(ToolbarDefaultProps)
 export const props = defineMixin({
     props: {
         // 是否展示工具条

package/components/u-tooltip/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import TooltipDefaultProps from './tooltip'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(TooltipDefaultProps)
 export const props = defineMixin({
     props: {
         // 需要显示的提示文字
@@ -76,6 +79,11 @@ export const props = defineMixin({
         show: {
             type: Boolean,
             default: () => defProps.tooltip.show
+        },
+        // 是否开启单例模式，开启该属性的tooltip同一页面同时只显示一个
+        singleton: {
+            type: Boolean,
+            default: () => defProps.tooltip.singleton
         }
     }
-})
+})

package/components/u-tooltip/tooltip.js

@@ -24,6 +24,7 @@ export default {
         popupBgColor: '',
         triggerMode: 'longpress',
         forcePosition: {},
-        show: false
+        show: false,
+        singleton: false
     }
 }

package/components/u-tooltip/u-tooltip.vue

@@ -108,6 +108,7 @@
 	// #ifdef APP-NVUE 
 	const dom = uni.requireNativePlugin('dom')
 	// #endif
+	let activeSingletonTooltip = null
 	/**
 	 * Tooltip 
 	 * @description 
@@ -123,9 +124,12 @@
 	 * @property {Boolean}			showCopy	 是否显示复制按钮（默认 true ）
 	 * @property {Array}			buttons		 扩展的按钮组
 	 * @property {Boolean}			overlay		 是否显示透明遮罩以防止触摸穿透（默认 true ）
+	 * @property {Boolean}			singleton	 是否开启单例模式，开启该属性的tooltip同一页面同时只显示一个（默认 false ）
 	 * @property {Object}			customStyle	 定义需要用到的外部样式
 	 * 
-	 * @event {Function} 
+	 * @event {Function}			open		 打开时触发
+	 * @event {Function}			close		 关闭时触发
+	 * @event {Function}			update:show 显示状态变化时触发
 	 * @example 
 	 */
 	export default {
@@ -240,7 +244,13 @@
 		mounted() {
 			this.init()
 		},
-		emits: ["click", "open", "close"],
+		beforeUnmount() {
+			this.clearActiveTooltip()
+		},
+		beforeDestroy() {
+			this.clearActiveTooltip()
+		},
+		emits: ["click", "open", "close", "update:show"],
 		methods: {
 			addStyle,
 			addUnit,
@@ -262,15 +272,33 @@
 			},
 			// 打开tooltip
 			open() {
+				if (this.singleton && activeSingletonTooltip && activeSingletonTooltip !== this) {
+					activeSingletonTooltip.close()
+				}
+				if (this.singleton) {
+					activeSingletonTooltip = this
+				}
+				if (this.showTooltip && this.tooltipTop === 0) return
 				this.tooltipTop = 0
 				this.showTooltip = true
+				this.$emit('update:show', true)
 				this.$emit('open')
 			},
 			// 关闭tooltip
 			close() {
+				if (activeSingletonTooltip === this) {
+					activeSingletonTooltip = null
+				}
+				if (!this.showTooltip) return
 				this.showTooltip = false
+				this.$emit('update:show', false)
 				this.$emit('close')
 			},
+			clearActiveTooltip() {
+				if (activeSingletonTooltip === this) {
+					activeSingletonTooltip = null
+				}
+			},
 			// 点击透明遮罩
 			overlayClickHandler() {
 				this.close()
@@ -405,4 +433,4 @@
 			}
 		}
 	}
-</style>
+</style>

package/components/u-tr/props.js

@@ -1,5 +1,7 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps({ tr: {} })
 export const props = defineMixin({
     props: {