uview-plus 3.8.126 → 3.8.128

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

@@ -3,7 +3,7 @@
 		<view :class="['u-select__content', disabled && 'disabled']">
 			<view :class="['u-select__label', border && 'u-select__label--border']" :style="selectLabelStyle" @click="labelClick">
 				<slot name="text" :currentLabel="currentLabel">
-					<text class="u-select__text" :style="{ color: resolvedTextColor }" v-if="showOptionsLabel">
+					<text class="u-select__text" :style="{ color: resolvedTextColor }" v-if="showOptionsLabel && currentLabel">
 						{{ currentLabel }}
 					</text>
 					<text class="u-select__text" :style="{ color: resolvedTextColor }" v-else>
@@ -16,17 +16,25 @@
 			</view>
 			<up-overlay :show="isOpen" @click="overlayClick" v-if="overlay" :zIndex="zIndex" :duration="duration + 50"
 				:customStyle="overlayStyle" :opacity="overlayOpacity" @touchmove.stop.prevent="noop"></up-overlay>
+			<view class="u-select__arrow" :class="'u-select__arrow--' + optionsPlacement" :style="arrowStyle"
+				v-if="isOpen && arrow">
+				<view class="u-select__arrow__outer"></view>
+				<view class="u-select__arrow__inner"></view>
+			</view>
 			<view class="u-select__options__wrap" :style="optionsWrapStyle">
 				<view class="u-select__options" :style="optionsStyle" v-if="isOpen">
 					<slot name="options">
-						<view class="u-select__options_item" :class="current == item[keyName] ? 'active': ''"
-							:style="{ color: resolvedItemColor }"
+						<view class="u-select__options_item" :class="isSelected(item) ? 'active': ''"
+							:style="{ color: itemTextColor(item) }"
 							:key="index" v-for="(item, index) in options" @click="selectItem(item)">
-							<slot name="optionItem" :item="item">
-								<text class="u-select__item_text" :style="{color: resolvedItemColor}">
-									{{item[labelName]}}
-								</text>
-							</slot>
+							<view class="u-select__options_item__body">
+								<slot name="optionItem" :item="item" :selected="isSelected(item)">
+									<text class="u-select__item_text" :style="{color: itemTextColor(item)}">
+										{{item[labelName]}}
+									</text>
+								</slot>
+							</view>
+							<up-icon v-if="isSelected(item)" name="checkbox-mark" size="15px" :color="resolvedActiveColor"></up-icon>
 						</view>
 					</slot>
 				</view>
@@ -99,8 +107,9 @@
 				type: Boolean,
 				default: false
 			},
+			// 当前选中值，multiple 时传数组
 			current: {
-				type: [String, Number],
+				type: [String, Number, Array],
 				default: ''
 			},
 			zIndex: {
@@ -133,19 +142,45 @@
 			optionsWidth: {
 				type: [String, Number],
 				default: ''
+			},
+			// 下拉面板展开方向：auto 按上下剩余空间自动选择，bottom 固定向下，top 固定向上
+			placement: {
+				type: String,
+				default: 'auto'
+			},
+			// 是否显示下拉面板指向触发区的三角形指示器
+			arrow: {
+				type: Boolean,
+				default: true
+			},
+			// 是否多选，多选时 current 为数组且选中后面板不关闭
+			multiple: {
+				type: Boolean,
+				default: false
+			},
+			// 选中项的文字与勾选图标颜色，默认取主题主色
+			activeColor: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
 			return {
 				isOpen: false,
 				optionsWrapLeft: 'auto',
-				optionsWrapRight: 'auto'
+				optionsWrapRight: 'auto',
+				// 展开方向与空间不足时的限高，都在打开时按剩余空间重新计算
+				optionsPlacement: 'bottom',
+				optionsWrapMaxHeight: ''
 			}
 		},
 		computed: {
 			resolvedItemColor() {
 				return this.itemColor || this.upThemeVar('--up-main-color', '#303133');
 			},
+			resolvedActiveColor() {
+				return this.activeColor || this.upThemeVar('--up-primary', '#3c9cff');
+			},
 			resolvedTextColor() {
 				return this.upThemeVar('--up-main-color', '#303133');
 			},
@@ -174,14 +209,25 @@
 				}
 				return style;
 			},
+			panelGap() {
+				// 显示指示器时把间距留成三角形的高度，让它正好顶住面板边框
+				return this.arrow ? 6 : 4;
+			},
 			optionsWrapStyle() {
 				const style = {
 					overflowY: 'auto',
 					zIndex: this.zIndex + 1,
 					left: this.optionsWrapLeft,
 					right: this.optionsWrapRight,
-					maxHeight: this.maxHeight
+					maxHeight: this.optionsWrapMaxHeight || this.maxHeight
 				};
+				if (this.optionsPlacement === 'top') {
+					style.top = 'auto';
+					style.bottom = `calc(100% + ${this.panelGap}px)`;
+				} else {
+					style.top = `calc(100% + ${this.panelGap}px)`;
+					style.bottom = 'auto';
+				}
 				if (this.normalizedOptionsWidth) {
 					style.width = this.normalizedOptionsWidth;
 				}
@@ -195,15 +241,36 @@
 				}
 				return style;
 			},
+			arrowStyle() {
+				// 指示器画在滚动容器外面，否则会被面板自身的 overflow 裁掉
+				const style = {
+					zIndex: this.zIndex + 2,
+					left: this.optionsWrapLeft === 'auto' ? 'auto' : '12px',
+					right: this.optionsWrapLeft === 'auto' ? '12px' : 'auto'
+				};
+				if (this.optionsPlacement === 'top') {
+					style.top = 'auto';
+					style.bottom = '100%';
+				} else {
+					style.top = '100%';
+					style.bottom = 'auto';
+				}
+				return style;
+			},
+			currentList() {
+				if (Array.isArray(this.current)) return this.current;
+				if (this.current === '' || this.current === null || typeof this.current === 'undefined') return [];
+				return [this.current];
+			},
 			currentLabel() {
-				let name = '';
+				const names = [];
 				this.options.forEach((ele) => {
-					if (ele[this.keyName] === this.current) {
-						name = ele[this.labelName];
-					}
-				});
-				return name;
-			}
+					if (this.isSelected(ele)) {
+						names.push(ele[this.labelName]);
+					}
+				});
+				return names.join('、');
+			}
 		},
 		methods: {
 			labelClick() {
@@ -230,24 +297,76 @@
 				if (!this.closeOnClickOverlay) return;
 				this.closeSelect();
 			},
+			isSelected(item) {
+				const value = item[this.keyName];
+				if (this.multiple) {
+					return this.currentList.some((ele) => ele == value);
+				}
+				// 没有选中值时不能走宽松比较，否则 0 == '' 会把 key 为 0 的项误标成选中
+				if (this.current === '' || this.current === null || typeof this.current === 'undefined') {
+					return false;
+				}
+				return this.current == value;
+			},
+			itemTextColor(item) {
+				// 选项颜色是行内绑定的，选中态必须走同一个绑定，否则会被行内样式盖掉
+				return this.isSelected(item) ? this.resolvedActiveColor : this.resolvedItemColor;
+			},
 			selectItem(item) {
+				const value = item[this.keyName];
+				if (this.multiple) {
+					// 多选时保持面板展开，方便连续勾选
+					const list = this.currentList.slice();
+					const index = list.findIndex((ele) => ele == value);
+					if (index > -1) {
+						list.splice(index, 1);
+					} else {
+						list.push(value);
+					}
+					this.$emit('update:current', list);
+					this.$emit('select', item, list);
+					return;
+				}
 				this.isOpen = false;
-				this.$emit('update:current', item[this.keyName]);
+				this.$emit('update:current', value);
 				this.$emit('select', item);
 			},
 			adjustOptionsWrapPosition() {
+				// 每次打开都从"左对齐、向下、不限高"重新算，避免上一次的结果影响这次的测量
 				this.optionsWrapLeft = '0px';
 				this.optionsWrapRight = 'auto';
-				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`;
-					}
-				});
-			}
+				this.optionsWrapMaxHeight = '';
+				this.optionsPlacement = this.placement === 'top' ? 'top' : 'bottom';
+				this.$nextTick(() => {
+					if (!this.isOpen) return;
+					let wi = getWindowInfo();
+					let windowWidth = wi.windowWidth;
+					let windowHeight = wi.windowHeight;
+					Promise.all([
+						this.$uGetRect('.u-select__label'),
+						this.$uGetRect('.u-select__options__wrap')
+					]).then(([labelRect, wrapRect]) => {
+						if (!this.isOpen || !labelRect || !wrapRect) return;
+						if (wrapRect.left + wrapRect.width > windowWidth) {
+							// 如果右侧被遮挡，则调整到左侧
+							this.optionsWrapLeft = 'auto';
+							this.optionsWrapRight = `0px`;
+						}
+						// boundingClientRect 的坐标以窗口可用区域为原点，直接和 windowHeight 比即可
+						const spaceBelow = windowHeight - labelRect.bottom - this.panelGap;
+						const spaceAbove = labelRect.top - this.panelGap;
+						if (this.placement === 'auto' && wrapRect.height > spaceBelow && spaceAbove > spaceBelow) {
+							// 下方放不下且上方更宽裕时翻到触发区上方
+							this.optionsPlacement = 'top';
+						}
+						// 选定方向后仍放不下就限高滚动，否则面板会溢出窗口，并把页面撑高
+						const space = this.optionsPlacement === 'top' ? spaceAbove : spaceBelow;
+						if (space > 0 && wrapRect.height > space) {
+							this.optionsWrapMaxHeight = `${Math.floor(space)}px`;
+						}
+					});
+				});
+			}
 		}
 	}
 </script>
@@ -287,10 +406,56 @@
 			pointer-events: none;
 		}
 
+		.u-select__arrow {
+			position: absolute;
+			width: 0;
+			height: 0;
+			pointer-events: none;
+
+			.u-select__arrow__outer,
+			.u-select__arrow__inner {
+				position: absolute;
+				left: 0;
+				/* 三角形以锚点为中心，左右对齐时都不会贴到面板边角 */
+				margin-left: -6px;
+				width: 0;
+				height: 0;
+				border-style: solid;
+				border-color: transparent;
+			}
+
+			&--bottom {
+				.u-select__arrow__outer {
+					top: 0;
+					border-width: 0 6px 6px 6px;
+					border-bottom-color: var(--up-border-color, #f1f1f1);
+				}
+
+				.u-select__arrow__inner {
+					// 往面板里挪 1px，盖掉面板自身的边框，拼出缺口效果
+					top: 1px;
+					border-width: 0 6px 6px 6px;
+					border-bottom-color: var(--up-card-bg-color, #fff);
+				}
+			}
+
+			&--top {
+				.u-select__arrow__outer {
+					bottom: 0;
+					border-width: 6px 6px 0 6px;
+					border-top-color: var(--up-border-color, #f1f1f1);
+				}
+
+				.u-select__arrow__inner {
+					bottom: 1px;
+					border-width: 6px 6px 0 6px;
+					border-top-color: var(--up-card-bg-color, #fff);
+				}
+			}
+		}
+
 		.u-select__options__wrap {
-			margin-bottom: 46px;
 			position: absolute;
-			top: calc(100% + 4px);
 			left: 0;
 		}
 
@@ -303,6 +468,8 @@
 
 			.u-select__options_item {
 				padding: 10px 12px;
+				display: flex;
+				align-items: center;
 				box-sizing: border-box;
 				width: 100%;
 				height: 100%;
@@ -310,6 +477,14 @@
 				&:hover {
 					background-color: var(--up-bg-color, #f7f7f7);
 				}
+
+				&.active {
+					background-color: var(--up-primary-light, #ecf5ff);
+				}
+
+				.u-select__options_item__body {
+					flex: 1;
+				}
 
 				/* #ifdef H5 */
 				&:hover {

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

@@ -21,7 +21,6 @@
 				>
 				</view>
 				<view
-					@click="onClick"
 					class="u-slider__gap"
 					:style="[
 						barStyle,
@@ -52,7 +51,7 @@
 				<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="touchButtonStyle(barStyle0)">
+						@touchcancel="onTouchEnd($event, 0)" @click.stop="() => {}" :style="touchButtonStyle(barStyle0)">
 						<slot name="min" v-if="$slots.min || $slots.$min"/>
 						<view v-else class="u-slider__button" :style="[blockStyle, {
 							height: getPx(blockSize, true),
@@ -63,7 +62,7 @@
 				</template>
 				<view class="u-slider__button-wrap" @touchstart="onTouchStart"
 					@touchmove="onTouchMove" @touchend="onTouchEnd"
-					@touchcancel="onTouchEnd" :style="touchButtonStyle(barStyle)">
+					@touchcancel="onTouchEnd" @click.stop="() => {}" :style="touchButtonStyle(barStyle)">
 					<slot name="max" v-if="isRange && ($slots.max || $slots.$max)"/>
 					<slot v-else-if="$slots.default || $slots.$default"/>
 					<view v-else class="u-slider__button" :style="[blockStyle, {
@@ -153,8 +152,7 @@
 			modelValue(n) {
 				// 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
 				if (this.status == 'end') {
-					const $crtFmtValue = this.updateValue(this.modelValue, false);
-					this.$emit('change', $crtFmtValue);
+					this.updateValue(this.modelValue, false);
 				}
 			},
 			// #endif
@@ -162,8 +160,7 @@
 			value(n) {
 				// 只有在非滑动状态时，才可以通过value更新滑块值，这里监听，是为了让用户触发
 				if (this.status == 'end') {
-					const $crtFmtValue = this.updateValue(this.value, false);
-					this.$emit('change', $crtFmtValue);
+					this.updateValue(this.value, false);
 				}
 			},
 			// #endif
@@ -172,7 +169,6 @@
 					if (this.status == 'end') {
 						this.updateValue(this.rangeValue[0], false, 0);
 						this.updateValue(this.rangeValue[1], false, 1);
-						this.$emit('change', this.rangeValue);
 					}
             	},
             	deep:true
@@ -414,16 +410,24 @@
 				// nvue下暂时无法获取坐标
 				const min = this.toSliderNumber(this.min)
 				const max = this.toSliderNumber(this.max, 100)
+				const detail = event && event.detail ? event.detail : {}
+				const position = Number(this.vertical ? detail.y : detail.x)
+				const sliderSize = this.vertical ? this.sliderRect.height : this.sliderRect.width
+				// 少数端的tap没有坐标，滑块在弹窗里未显示时也量不到长度，
+				// 这两种情况下算出来的只会是min，别当成用户点了min发出去
+				if (!Number.isFinite(position) || !sliderSize) return
 				if (this.vertical) {
-					let clientY = event.detail.y - this.sliderRect.top
+					let clientY = position - this.sliderRect.top
 					// console.log(this.sliderRect.top, event.detail.y)
 					this.newValue = ((clientY / this.sliderRect.height) * (max - min)) + min
-					this.updateValue(this.newValue, false, 1)
 				} else {
-					let clientX = event.detail.x - this.sliderRect.left
+					let clientX = position - this.sliderRect.left
 					this.newValue = ((clientX / this.sliderRect.width) * (max - min)) + min
-					this.updateValue(this.newValue, false, 1)
 				}
+				// 点击等同于一次完整的取值，需要和拖动结束一样对外发出change，
+				// 否则单向绑定(:modelValue)时外部拿不到点击后的值
+				const $crtFmtValue = this.updateValue(this.newValue, false, 1)
+				this.$emit('change', $crtFmtValue)
 				// #endif
 			},
 			updateValue(value, drag, index = 1) {
@@ -572,6 +576,11 @@
 			flex-direction: column;
 			position: relative;
 			border-radius: 999px;
+			/* #ifndef APP-NVUE */
+			// 高度按 blockSize 内联下发，须以内容盒为基准；否则应用层的
+			// view { box-sizing: border-box } 会把上下 padding 从内容高度中扣掉，滑块与滑道错位
+			box-sizing: content-box;
+			/* #endif */
 			padding: 10px 18px;
 			justify-content: center;
 		}

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

@@ -187,6 +187,9 @@
 			}
 		},
 		mounted() {
+			// 抖音小程序等平台子组件 created 可能在父组件 created 之前执行，
+			// 此时 parent.children 尚未初始化，init 被跳过，此处补偿重试
+			this.init()
 			this.parent && this.parent.updateFromChild()
 			sleep().then(() => {
 				this.getStepsItemRect()
@@ -199,6 +202,12 @@
 				if (!this.parent) {
 					return error('u-steps-item必须要搭配u-steps组件使用')
 				}
+				// 抖音小程序等平台子组件 created 可能在父组件 created 之前执行，
+				// 此时 parent.children 尚未初始化（u-steps 在 created 中才赋值 children=[]），
+				// 跳过本次初始化，由 mounted 钩子补偿重试
+				if (!this.parent.children) {
+					return
+				}
 				this.index = this.parent.children.indexOf(this)
 				this.childLength = this.parent.children.length
 			},

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

@@ -239,6 +239,9 @@
 			this.init()
 		},
 		mounted() {
+			// 抖音小程序等平台子组件 created 可能在父组件 created 之前执行，
+			// 此时 parent.children 尚未初始化，init 被跳过，此处补偿重试
+			this.init()
 			this.scheduleMidButtonBorderMeasure()
 		},
 		watch: {
@@ -260,6 +263,13 @@
 				this.updateParentData()
 				if (!this.parent) {
 					error('up-tabbar-item必须搭配up-tabbar组件使用')
+					return
+				}
+				// 抖音小程序等平台子组件 created 可能在父组件 created 之前执行，
+				// 此时 parent.children 尚未初始化（u-tabbar 在 created 中才赋值 children=[]），
+				// 跳过本次初始化，由 mounted 钩子补偿重试
+				if (!this.parent.children) {
+					return
 				}
 				// 本子组件在u-tabbar的children数组中的索引
 				const index = this.parent.children.indexOf(this)
@@ -299,10 +309,11 @@
 			},
 			clickHandler() {
 				this.$nextTick(() => {
+					if (!this.parent || !this.parent.children) return
 					const index = this.parent.children.indexOf(this)
 					const name = this.name || index
 					// 点击的item为非激活的item才发出change事件
-					if (name !== this.parent.value) {
+					if (this.parent && name !== this.parent.value) {
 						this.parent.$emit('change', name)
 					}
 					this.$emit('click', name)

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

@@ -405,7 +405,11 @@
 			}
 
 			&__scroll-view {
-				@include flex;
+				// 这里不能声明 display: flex：各端 scroll-view 都把内容包在内层容器里，flex 作用不到内容上，
+				// 反而会让微信小程序告警「设置 enable-flex 属性以使 flexbox 布局生效」（issue #650）
+				/* #ifdef APP-NVUE */
+				flex-direction: row;
+				/* #endif */
 				flex: 1;
 			}
 

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

@@ -44,6 +44,7 @@
                 :send-message-img="sendMessageImg"
                 :show-message-card="showMessageCard"
                 :app-parameter="appParameter"
+                v-bind="$attrs"
             >
                 {{ value }}
             </button>
@@ -73,22 +74,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';
-
-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 文本
+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		主题颜色
@@ -109,7 +110,7 @@ function normalizeLineHeight(value) {
  * @property {Object | String} 			iconStyle	图标的样式 （默认 {fontSize: '15px'} ）
  * @property {String} 					decoration	文字装饰，下划线，中划线等，可选值 none|underline|line-through（默认 'none' ）
  * @property {Object | String | Number}	margin		外边距，对象、字符串，数值形式均可（默认 0 ）
- * @property {String | Number} 			lineHeight	文本行高，支持带单位值或无单位倍数（如 1.2）
+ * @property {String | Number} 			lineHeight	文本行高，支持带单位值或无单位倍数（如 1.2）
  * @property {String} 					align		文本对齐方式，可选值left|center|right（默认 'left' ）
  * @property {String} 					wordWrap	文字换行，可选值break-word|normal|anywhere（默认 'normal' ）
  * @event {Function} click  点击触发事件
@@ -123,6 +124,7 @@ export default {
     // #ifndef MP
     mixins: [mpMixin, mixin, value, props],
     // #endif
+	inheritAttrs: false,
 	emits: ['click'],
     computed: {
         wrapStyle() {
@@ -139,21 +141,21 @@ export default {
             }
 			return style;
         },
-        valueStyle() {
-            const style = {
-                textDecoration: this.decoration,
-                fontWeight: this.bold ? 'bold' : 'normal',
-                wordWrap: this.wordWrap,
-                fontSize: addUnit(this.size)
-            }
-            if (!this.type) {
-                style.color = this.color || this.upThemeVar('--up-content-color', this.$u?.color?.contentColor || '#606266')
-            }
-            this.isNvue && this.lines && (style.lines = this.lines)
-            this.lineHeight &&
-                (style.lineHeight = normalizeLineHeight(this.lineHeight))
-            !this.isNvue && this.block && (style.display = 'block')
-            return deepMerge(style, addStyle(this.customStyle))
+        valueStyle() {
+            const style = {
+                textDecoration: this.decoration,
+                fontWeight: this.bold ? 'bold' : 'normal',
+                wordWrap: this.wordWrap,
+                fontSize: addUnit(this.size)
+            }
+            if (!this.type) {
+                style.color = this.color || this.upThemeVar('--up-content-color', this.$u?.color?.contentColor || '#606266')
+            }
+            this.isNvue && this.lines && (style.lines = this.lines)
+            this.lineHeight &&
+                (style.lineHeight = normalizeLineHeight(this.lineHeight))
+            !this.isNvue && this.block && (style.display = 'block')
+            return deepMerge(style, addStyle(this.customStyle))
         },
         isNvue() {
             let nvue = false

package/components/u-textarea/props.js

@@ -40,6 +40,11 @@ export const props = defineMixin({
 			type: String,
 			default: () => defProps.textarea.confirmType
 		},
+		// 点击键盘右下角按钮时是否保持键盘不收起，confirmType 非 return 时有效
+		confirmHold: {
+			type: Boolean,
+			default: () => defProps.textarea.confirmHold
+		},
 		// 是否禁用
 		disabled: {
 			type: Boolean,

package/components/u-textarea/textarea.js

@@ -15,7 +15,10 @@ export default {
 		placeholderClass: 'textarea-placeholder',
 		placeholderStyle: '',
 		height: 70,
-		confirmType: 'done',
+		// 与 uni-app textarea 原生默认值保持一致：return 表示回车换行；
+		// 取 done/go/next/search/send 时回车会触发 confirm 且不换行
+		confirmType: 'return',
+		confirmHold: false,
 		disabled: false,
 		count: false,
 		focus: false,

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

@@ -21,6 +21,7 @@
             :holdKeyboard="holdKeyboard"
             :maxlength="maxlength"
             :confirm-type="confirmType"
+            :confirm-hold="confirmHold"
             :ignoreCompositionEvent="ignoreCompositionEvent"
             @focus="onFocus"
             @blur="onBlur"
@@ -55,7 +56,8 @@ import { addStyle, addUnit, deepMerge, formValidate, os } from '../../libs/funct
  * @property {String}			    placeholderClass		指定placeholder的样式类，注意页面或组件的style中写了scoped时，需要在类名前写/deep/ （ 默认 'input-placeholder' ）
  * @property {String | Object}	    placeholderStyle		指定placeholder的样式，字符串/对象形式，如"color: red;"
  * @property {String | Number}		height					输入框高度（默认 70 ）
- * @property {String}				confirmType				设置键盘右下角按钮的文字，仅微信小程序，App-vue和H5有效（默认 'done' ）
+ * @property {String}				confirmType				设置键盘右下角按钮的文字，仅微信小程序，App-vue和H5有效。为 'return' 时回车换行，取 'done'、'go'、'next'、'search'、'send' 时回车触发 confirm 且不换行（默认 'return' ）
+ * @property {Boolean}				confirmHold				点击键盘右下角按钮时是否保持键盘不收起，confirmType 非 'return' 时有效（默认 false ）
  * @property {Boolean}				disabled				是否禁用（默认 false ）
  * @property {Boolean}				count					是否显示统计字数（默认 false ）
  * @property {Boolean}				focus					是否自动获取焦点，nvue不支持，H5取决于浏览器的实现（默认 false ）