uview-plus 3.8.86 → 3.8.106

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

@@ -32,14 +32,14 @@
 		</view>
 		<!-- #ifdef APP-VUE || MP-WEIXIN || MP-QQ || H5  -->
 		<view class="u-swipe-action-item__content" @touchstart="wxs.touchstart" @touchmove="wxs.touchmove"
-			@touchend="wxs.touchend" :status="status" :change:status="wxs.statusChange" :size="size"
+			@touchend="wxs.touchend" @touchcancel="wxs.touchcancel" :status="status" :change:status="wxs.statusChange" :size="size"
 			:change:size="wxs.sizeChange">
 			<slot></slot>
 		</view>
 		<!-- #endif -->
 		<!-- #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO-->
 		<view class="u-swipe-action-item__content" @click="clickHandler" @touchstart="touchstart" @touchmove="touchmove"
-			@touchend="touchend" :style="sliderStyle">
+			@touchend="touchend" @touchcancel="touchcancel" :style="sliderStyle">
 			<slot></slot>
 		</view>
 		<!-- <view class="u-swipe-action-item__content" @touchstart="mysjs.touchstart" @touchmove="mysjs.touchmove"
@@ -81,16 +81,18 @@
 	 * @property {String | Number}	index			标识符，如果是v-for，可用index索引
 	 * @property {Boolean}			disabled		是否禁用（默认 false ）
 	 * @property {Boolean}			autoClose		是否自动关闭其他swipe按钮组（默认 true ）
+	 * @property {Boolean}			scrolling		是否正在横向滑动，可用于v-model:scrolling暂停外部滚动（默认 false ）
 	 * @property {Number}			threshold		滑动距离阈值，只有大于此值，才被认为是要打开菜单（默认 30 ）
 	 * @property {Array}			options			右侧按钮内容
 	 * @property {String | Number}	duration		动画过渡时间，单位ms（默认 350 ）
+	 * @event {Function(value)}	scrolling	横向滑动状态变化时触发，参数为Boolean
 	 * @event {Function(index)}	open	组件打开时触发
 	 * @event {Function(index)}	close	组件关闭时触发
 	 * @example	<u-swipe-action><u-swipe-action-item :options="options1" ></u-swipe-action-item></u-swipe-action>
 	 */
 	export default {
 		name: 'u-swipe-action-item',
-		emits: ['click', 'update:show'],
+		emits: ['click', 'update:show', 'update:scrolling', 'scrolling'],
 		mixins: [
 			mpMixin,
 			mixin,
@@ -118,7 +120,9 @@
 				},
 				// 当前状态，open-打开，close-关闭
 				status: '',
-				sliderStyle: {}
+				sliderStyle: {},
+				// 内部缓存横向滑动状态，避免一次手势重复触发相同事件
+				innerScrolling: this.scrolling
 			}
 		},
 		watch: {
@@ -142,6 +146,14 @@
 				} else {
 					this.status = 'close'
 				}
+			},
+			scrolling(newValue) {
+				this.innerScrolling = !!newValue
+			},
+			disabled(newValue) {
+				if (newValue) {
+					this.setScrolling(false)
+				}
 			}
 		},
 		computed: {
@@ -160,6 +172,11 @@
 		},
 		beforeUmount() {
 			this.closeHandler()
+			this.setScrolling(false)
+		},
+		beforeUnmount() {
+			this.closeHandler()
+			this.setScrolling(false)
 		},
 		methods: {
 			addUnit,
@@ -177,6 +194,13 @@
 				// 此方法在mixin中
 				this.getParentData('u-swipe-action')
 			},
+			setScrolling(value) {
+				const next = !!value
+				if (this.innerScrolling === next) return
+				this.innerScrolling = next
+				this.$emit('update:scrolling', next)
+				this.$emit('scrolling', next)
+			},
 			// #ifndef APP-NVUE
 			// 查询节点
 			queryRect() {

package/components/u-switch/u-switch.vue

@@ -212,7 +212,7 @@
 		border-style: solid;
 		justify-content: flex-end;
 		align-items: center;
-		// 由于weex为阿里逗着玩的KPI项目，导致bug奇多，这必须要写这一行，
+		// 由于weex bug奇多，这必须要写这一行，
 		// 否则在iOS上，点击页面任意地方，都会触发switch的点击事件
 		overflow: hidden;
 

package/components/u-tabbar/u-tabbar.vue

@@ -98,7 +98,8 @@
 					this.inactiveBackgroundColor,
 					this.itemShape,
 					this.iconScale,
-					this.textMode
+					this.textMode,
+					this.borderColor
 				]
 			},
 			updatePlaceholder() {

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

@@ -11,10 +11,8 @@
 					class="u-tabbar-item__icon"
 					:class="iconClassNames"
 				>
-					<view v-if="isMidButton" class="u-tabbar-item__mid-button-arc">
-						<svg viewBox="0 0 72 72" preserveAspectRatio="none">
-							<path d="M 4 36 A 32 32 0 0 1 68 36"></path>
-						</svg>
+					<view v-if="isMidButton" class="u-tabbar-item__mid-button-border">
+						<view class="u-tabbar-item__mid-button-border-circle" :style="midButtonBorderCircleStyle"></view>
 					</view>
 					<view v-if="isMidButton" class="u-tabbar-item__mid-button-inner"></view>
 					<up-icon
@@ -22,6 +20,7 @@
 						:name="resolvedIconName"
 						:color="isMidButton ? resolvedMidButtonIconColor : (isActive ? resolvedActiveColor : resolvedInactiveColor)"
 						:size="isMidButton ? midButtonIconSize : 24"
+						:customStyle="midButtonIconStyle"
 					></up-icon>
 					<template v-else>
 						<slot
@@ -94,7 +93,8 @@
 					inactiveBackgroundColor: '',
 					itemShape: 'default',
 					iconScale: 1.1,
-					textMode: 'always'
+					textMode: 'always',
+					borderColor: ''
 				}
 			}
 		},
@@ -135,10 +135,41 @@
 				if (this.midButtonIconColor) return this.midButtonIconColor
 				return this.isMidButton ? '#3c9cff' : this.resolvedActiveColor
 			},
+			midButtonIconStyle() {
+				return this.isMidButton
+					? {
+						position: 'relative',
+						zIndex: 2
+					}
+					: {}
+			},
+			hasMidButtonText() {
+				return !!this.$slots.text || String(this.text || '').length > 0
+			},
+			resolvedMidButtonOffsetY() {
+				const offset = Number.parseFloat(this.midButtonOffsetY)
+				return Number.isFinite(offset) ? offset : -10
+			},
+			midButtonTranslateY() {
+				return `${this.resolvedMidButtonOffsetY}px`
+			},
+			midButtonBorderClipHeight() {
+				const clipBaseHeight = this.hasMidButtonText ? 15.5 : 7
+				const clipHeight = clipBaseHeight - this.resolvedMidButtonOffsetY
+				return `${Math.min(Math.max(clipHeight, 0), 64)}px`
+			},
+			midButtonBorderCircleStyle() {
+				return this.isMidButton && this.parentData.borderColor
+					? {
+						borderColor: this.parentData.borderColor
+					}
+					: {}
+			},
 			itemClassNames() {
 				return [
 					this.isActive ? 'u-tabbar-item--active' : 'u-tabbar-item--inactive',
 					this.isMidButton ? 'u-tabbar-item--mid-button' : '',
+					this.isMidButton && !this.hasMidButtonText ? 'u-tabbar-item--mid-button-no-text' : '',
 					`u-tabbar-item--${this.resolvedStyleType}`,
 					this.resolvedAnimationType !== 'none' && this.isActive ? `u-tabbar-item--anim-${this.resolvedAnimationType}` : '',
 					this.resolvedItemShape !== 'default' ? `u-tabbar-item--shape-${this.resolvedItemShape}` : '',
@@ -276,6 +307,11 @@
 
 			&--mid-button {
 				justify-content: center;
+				position: relative;
+				z-index: 1;
+				/* #ifndef APP-NVUE */
+				transform: translateY(v-bind('midButtonTranslateY'));
+				/* #endif */
 			}
 		}
 
@@ -381,9 +417,6 @@
 	
 	// 中间按钮样式
 	.u-tabbar-item--mid-button {
-		/* #ifndef APP-NVUE */
-		transform: translateY(v-bind('`${midButtonOffsetY}px`'));
-		/* #endif */
 		z-index: 2;
 		flex: 1;
 	}
@@ -401,26 +434,36 @@
 		overflow: visible;
 	}
 
-	.u-tabbar-item__mid-button-arc {
+	.u-tabbar-item__mid-button-border {
 		position: absolute;
-		left: -4px;
-		top: -4px;
-		width: calc(100% + 8px);
-		height: calc(100% + 8px);
+		left: 0;
+		top: 0;
+		width: 64px;
+		height: v-bind('midButtonBorderClipHeight');
+		box-sizing: border-box;
+		background: transparent;
+		overflow: hidden;
 		pointer-events: none;
 		z-index: 0;
 	}
 
-	.u-tabbar-item__mid-button-arc svg {
-		width: 100%;
-		height: 100%;
+	/* #ifdef APP-NVUE */
+	.u-tabbar-item__mid-button-border {
+		height: 15.5px;
 	}
 
-	.u-tabbar-item__mid-button-arc path {
-		fill: none;
-		stroke: none;
-		stroke-width: 0;
-		stroke-linecap: round;
+	.u-tabbar-item--mid-button-no-text .u-tabbar-item__mid-button-border {
+		height: 7px;
+	}
+	/* #endif */
+
+	.u-tabbar-item__mid-button-border-circle {
+		width: 64px;
+		height: 64px;
+		box-sizing: border-box;
+		background: transparent;
+		border: 1px solid var(--up-border-color, rgba(0, 0, 0, 0.08));
+		border-radius: 999px;
 	}
 
 	.u-tabbar-item__mid-button-inner {

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-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-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-upload/u-upload.vue

@@ -875,7 +875,7 @@
 			bottom: $u-upload-success-bottom;
 			right: $u-upload-success-right;
 			@include flex;
-			// 由于weex(nvue)为阿里巴巴的KPI(部门业绩考核)的laji产物，不支持css绘制三角形
+			// 由于weex(nvue)不支持css绘制三角形
 			// 所以在nvue下使用图片，非nvue下使用css实现
 			/* #ifndef APP-NVUE */
 			border-style: $u-upload-success-border-style;