uview-plus 3.7.13 → 3.7.28

package/changelog.md

@@ -1,3 +1,45 @@
+## 3.7.28（2026-03-21）
+feat: 添加 up-switch 组件的圆点颜色属性
+
+## 3.7.27（2026-03-12）
+improvment: 优化up-form的错误提示message字段类型
+
+## 3.7.26（2026-03-09）
+add: up-select增加禁用功能
+
+## 3.7.25（2026-03-07）
+fix: 优化up-coupon规范化scss
+
+## 3.7.24（2026-03-06）
+fix: 修复up-table2 组件在小程序不显示单元格内容的问题
+
+## 3.7.23（2026-03-06）
+fix: up-cascader在开启auto-close时最后层级选择后未触发confirm
+
+## 3.7.22（2026-03-05）
+improvment: floatButton组件示例改为组合式API
+
+## 3.7.21（2026-03-05）
+feat: 新增禁用 iOS Safari 下拉刷新工具类、移除 H5 端图标复制限制、优化 u-copy 组件注释
+
+## 3.7.20（2026-02-26）
+improvement：box组件示例改为组合式API
+
+## 3.7.19（2026-02-25）
+improvement：agreement组件示例改为组合式API
+
+## 3.7.18（2026-02-24）
+improvement：barcode组件示例改为组合式API
+
+## 3.7.17（2026-02-11）
+fix: 修复steps组件current失效
+
+## 3.7.16（2026-02-09）
+improvment: choose组件示例改为组合式API
+
+## 3.7.14（2026-02-08）
+refactor: up-signature组件改用up-canvas组件
+
 ## 3.7.13（2026-02-07）
 add: 新增up-canvas组件
 

package/components/u-cascader/u-cascader.vue

@@ -276,6 +276,7 @@
 					if (this.autoClose) {
 						// 如果启用自动关闭，则触发change事件并关闭
 						this.emitChange();
+						this.handleConfirm();
 					} else {
 						// 否则只触发change事件，不关闭
 						this.emitChange(false);

package/components/u-copy/u-copy.vue

@@ -36,7 +36,7 @@ export default {
 			}
             content = typeof content === 'string' ? content : content.toString() // 复制内容，必须字符串，数字需要转换为字符串
             /**
-			* 小程序端 和 app端的复制逻辑
+			* 复制逻辑
 			*/
 			let that = this;
             uni.setClipboardData({

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-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,179 +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;
 			}
-		});
-      },
-	  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`;
+		},
+		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>
-

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

@@ -36,7 +36,7 @@
 			children() {
 				this.updateChildData()
 			},
-			parentData() {
+			parentDataCpu() {
 				this.updateChildData()
 			}
 		},

package/components/u-switch/props.js

@@ -27,6 +27,16 @@ export const props = defineMixin({
             type: String,
             default: () => defProps.switch.inactiveColor
         },
+        // 打开时圆点的颜色
+        dotActiveColor: {
+            type: String,
+            default: () => defProps.switch.dotActiveColor
+        },
+        // 关闭时圆点的颜色
+        dotInactiveColor: {
+            type: String,
+            default: () => defProps.switch.dotInactiveColor
+        },
         // 通过v-model双向绑定的值
         // #ifdef VUE3
         modelValue: {

package/components/u-switch/switch.js

@@ -15,6 +15,8 @@ export default {
         size: 25,
         activeColor: '#2979ff',
         inactiveColor: '#ffffff',
+        dotActiveColor: '#ffffff',
+        dotInactiveColor: '#ffffff',
         value: false,
         activeValue: true,
         inactiveValue: false,

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

@@ -46,17 +46,19 @@
 	 * switch 开关选择器
 	 * @description 选择开关一般用于只有两个选择，且只能选其一的场景。
 	 * @tutorial https://uview-plus.jiangruyi.com/components/switch.html
-	 * @property {Boolean}						loading			是否处于加载中（默认 false ）
-	 * @property {Boolean}						disabled		是否禁用（默认 false ）
-	 * @property {String | Number}				size			开关尺寸，单位px （默认 25 ）
-	 * @property {String}						activeColor		打开时的背景色 （默认 '#2979ff' ）
-	 * @property {String} 						inactiveColor	关闭时的背景色 （默认 '#ffffff' ）
-	 * @property {Boolean | String | Number}	value			通过v-model双向绑定的值 （默认 false ）
-	 * @property {Boolean | String | Number}	activeValue		打开选择器时通过change事件发出的值 （默认 true ）
-	 * @property {Boolean | String | Number}	inactiveValue	关闭选择器时通过change事件发出的值 （默认 false ）
-	 * @property {Boolean}						asyncChange		是否开启异步变更，开启后需要手动控制输入值 （默认 false ）
-	 * @property {String | Number}				space			圆点与外边框的距离 （默认 0 ）
-	 * @property {Object}						customStyle		定义需要用到的外部样式
+	 * @property {Boolean}						loading				是否处于加载中（默认 false ）
+	 * @property {Boolean}						disabled			是否禁用（默认 false ）
+	 * @property {String | Number}				size				开关尺寸，单位px （默认 25 ）
+	 * @property {String}						activeColor			打开时的背景色 （默认 '#2979ff' ）
+	 * @property {String} 						inactiveColor		关闭时的背景色 （默认 '#ffffff' ）
+	 * @property {String}						dotActiveColor		打开时圆点的颜色 （默认 '#ffffff' ）
+	 * @property {String} 						dotInactiveColor	关闭时圆点的颜色 （默认 '#ffffff' ）
+	 * @property {Boolean | String | Number}	value				通过v-model双向绑定的值 （默认 false ）
+	 * @property {Boolean | String | Number}	activeValue			打开选择器时通过change事件发出的值 （默认 true ）
+	 * @property {Boolean | String | Number}	inactiveValue		关闭选择器时通过change事件发出的值 （默认 false ）
+	 * @property {Boolean}						asyncChange			是否开启异步变更，开启后需要手动控制输入值 （默认 false ）
+	 * @property {String | Number}				space				圆点与外边框的距离 （默认 0 ）
+	 * @property {Object}						customStyle			定义需要用到的外部样式
 	 *
 	 * @event {Function} change 在switch打开或关闭时触发
 	 * @example <u-switch v-model="checked" active-color="red" inactive-color="#eee"></u-switch>
@@ -121,6 +123,7 @@
 				style.height = addUnit(this.size - this.space)
 				const translateX = this.isActive ? addUnit(this.space) : addUnit(this.size);
 				style.transform = `translateX(-${translateX})`
+				style.backgroundColor = this.isActive ? this.dotActiveColor : this.dotInactiveColor
 				return style
 			},
 			bgStyle() {
@@ -190,9 +193,8 @@
 			justify-content: center;
 			border-radius: 100px;
 			background-color: #fff;
-			border-radius: 100px;
 			box-shadow: 1px 1px 1px 0 rgba(0, 0, 0, 0.25);
-			transition-property: transform;
+			transition-property: transform, background-color;
 			transition-duration: 0.4s;
 			transition-timing-function: cubic-bezier(0.3, 1.05, 0.4, 1.05);
 		}

package/components/u-table2/u-table2.vue

@@ -28,47 +28,83 @@
                 </view>
             </view>
 
-            <!-- 表体 -->
-            <view class="u-table-body" :style="{ minWidth: scrollWidth, maxHeight: maxHeight ? maxHeight + 'px' : 'none' }">
-                <template v-if="data && data.length > 0">
-                    <table-row 
-                        v-for="(row, rowIndex) in sortedData"
-                        :key="row[rowKey] || rowIndex"
-                        :row="row" 
-                        :rowIndex="rowIndex"
-                        :parent-row="null"
-                        :columns="columns"
-                        :tree-props="treeProps"
-                        :row-key="rowKey"
-                        :expanded-keys="expandedKeys"
-                        :cell-style-inner="cellStyleInner"
-                        :is-expanded="isExpanded"
-                        :row-class-name="rowClassName"
-                        :stripe="stripe"
-                        :cell-class-name="cellClassName"
-                        :get-fixed-class="getFixedClass"
-                        :highlight-current-row="highlightCurrentRow"
-                        :current-row="currentRow"
-                        :handle-row-click="handleRowClick"
-                        :toggle-expand="toggleExpand"
-                        :level="1"
-                        :rowHeight="rowHeight"
-                        :hasTree="hasTree"
-                        :selectedRows="selectedRows"
-                        :expandWidth="expandWidth"
-                        :computedMainCol="computedMainCol"
-                        :span-method="spanMethod"
-                        @toggle-select="toggleSelect"
-                        @row-click="handleRowClick"
-                        @toggle-expand="toggleExpand"
-                    >
-                        <template v-slot:cellChild="scope">
-                            <slot name="cell" :row="scope.row" :column="scope.column" :prow="scope.prow"
-                                :rowIndex="scope.rowIndex" :columnIndex="scope.columnIndex" :level="scope.level">
-                            </slot>                      
-                        </template>
-                    </table-row>
-                </template>
+            <!-- 表体 -->
+            <view class="u-table-body" :style="{ minWidth: scrollWidth, maxHeight: maxHeight ? maxHeight + 'px' : 'none' }">
+                <template v-if="data && data.length > 0">
+                    <!-- #ifdef MP-WEIXIN -->
+                    <template v-for="(item, flatIndex) in flattenedSortedData" :key="item.row[rowKey] || flatIndex">
+                        <view class="u-table-row u-table-row-child" :class="[highlightCurrentRow && currentRow === item.row ? 'u-table-row-highlight' : '',
+                            rowClassName ? rowClassName(item.row, item.rowIndex) : '',
+                            stripe && flatIndex % 2 === 1 ? 'u-table-row-zebra' : ''
+                        ]" :style="{ height: rowHeight }" @click="handleRowClick(item.row)">
+                            <view v-for="(col, colIndex) in columns" :key="col.key" class="u-table-cell"
+                                :class="[col.align ? 'u-text-' + col.align : '',
+                                    cellClassName ? cellClassName(item.row, col) : '',
+                                    getFixedClass(col),
+                                    getCellSpanClass(item.row, col, item.rowIndex, colIndex)
+                                ]"
+                                :style="[cellStyleInner({ row: item.row, column: col, rowIndex: item.rowIndex, columnIndex: colIndex, level: item.level }), getCellSpanStyle(item.row, col, item.rowIndex, colIndex)]">
+                                <view v-if="col.type === 'selection'">
+                                    <checkbox :checked="isSelected(item.row)" @click.stop="toggleSelect(item.row)" />
+                                </view>
+                                <template v-else>
+                                    <view v-if="col.key === computedMainCol && hasTree" @click.stop="toggleExpand(item.row)"
+                                        :style="{ width: expandWidth }">
+                                        <view v-if="item.row[treeProps.children] && item.row[treeProps.children].length > 0">
+                                            {{ isExpanded(item.row) ? '▼' : '▶' }}
+                                        </view>
+                                    </view>
+                                    <slot name="cell" :row="item.row" :column="col" :prow="item.parentRow"
+                                        :rowIndex="item.rowIndex" :columnIndex="colIndex" :level="item.level">
+                                        <view class="u-table-cell_content">
+                                            {{ item.row[col.key] }}
+                                        </view>
+                                    </slot>
+                                </template>
+                            </view>
+                        </view>
+                    </template>
+                    <!-- #endif -->
+                    <!-- #ifndef MP-WEIXIN -->
+                    <table-row 
+                        v-for="(row, rowIndex) in sortedData"
+                        :key="row[rowKey] || rowIndex"
+                        :row="row" 
+                        :rowIndex="rowIndex"
+                        :parent-row="null"
+                        :columns="columns"
+                        :tree-props="treeProps"
+                        :row-key="rowKey"
+                        :expanded-keys="expandedKeys"
+                        :cell-style-inner="cellStyleInner"
+                        :is-expanded="isExpanded"
+                        :row-class-name="rowClassName"
+                        :stripe="stripe"
+                        :cell-class-name="cellClassName"
+                        :get-fixed-class="getFixedClass"
+                        :highlight-current-row="highlightCurrentRow"
+                        :current-row="currentRow"
+                        :handle-row-click="handleRowClick"
+                        :toggle-expand="toggleExpand"
+                        :level="1"
+                        :rowHeight="rowHeight"
+                        :hasTree="hasTree"
+                        :selectedRows="selectedRows"
+                        :expandWidth="expandWidth"
+                        :computedMainCol="computedMainCol"
+                        :span-method="spanMethod"
+                        @toggle-select="toggleSelect"
+                        @row-click="handleRowClick"
+                        @toggle-expand="toggleExpand"
+                    >
+                        <template v-slot:cellChild="scope">
+                            <slot name="cell" :row="scope.row" :column="scope.column" :prow="scope.prow"
+                                :rowIndex="scope.rowIndex" :columnIndex="scope.columnIndex" :level="scope.level">
+                            </slot>                      
+                        </template>
+                    </table-row>
+                    <!-- #endif -->
+                </template>
                 <template v-else>
                     <slot name="empty">
                     </slot>
@@ -103,49 +139,85 @@
                 </view>
             </view>
 
-            <!-- 表体 -->
-            <view class="u-table-body" :style="{ minWidth: scrollWidth, maxHeight: maxHeight ? maxHeight + 'px' : 'none' }">
-                <template v-if="data && data.length > 0">
-                    <template v-for="(row, rowIndex) in sortedData" :key="row[rowKey] || rowIndex">
-                        <!-- 子级渲染 (递归组件) -->
-                        <table-row 
-                            :row="row" 
-                            :rowIndex="rowIndex"
-                            :parent-row="null"
-                            :columns="visibleFixedLeftColumns"
-                            :tree-props="treeProps"
-                            :row-key="rowKey"
-                            :expanded-keys="expandedKeys"
-                            :cell-style-inner="cellStyleInner"
-                            :is-expanded="isExpanded"
-                            :row-class-name="rowClassName"
-                            :stripe="stripe"
-                            :cell-class-name="cellClassName"
-                            :get-fixed-class="getFixedClass"
-                            :highlight-current-row="highlightCurrentRow"
-                            :current-row="currentRow"
-                            :handle-row-click="handleRowClick"
-                            :toggle-expand="toggleExpand"
-                            :level="1"
-                            :rowHeight="rowHeight"
-                            :hasTree="hasTree"
-                            :selectedRows="selectedRows"
-                            :expandWidth="expandWidth"
-                            :computedMainCol="computedMainCol"
-                            :span-method="spanMethod"
-                            @toggle-select="toggleSelect"
-                            @row-click="handleRowClick"
-                            @toggle-expand="toggleExpand"
-                        >
-                            <template v-slot:cellChild="scope">
-                                <slot name="cell" :row="scope.row" :column="scope.column" :prow="scope.prow"
-                                    :rowIndex="scope.rowIndex" :columnIndex="scope.columnIndex" :level="scope.level">
-                                </slot>                      
-                            </template>
-                        </table-row>
-                    </template>
-                </template>
-            </view>
+            <!-- 表体 -->
+            <view class="u-table-body" :style="{ minWidth: scrollWidth, maxHeight: maxHeight ? maxHeight + 'px' : 'none' }">
+                <template v-if="data && data.length > 0">
+                    <!-- #ifdef MP-WEIXIN -->
+                    <template v-for="(item, flatIndex) in flattenedSortedData" :key="item.row[rowKey] || flatIndex">
+                        <view class="u-table-row u-table-row-child" :class="[highlightCurrentRow && currentRow === item.row ? 'u-table-row-highlight' : '',
+                            rowClassName ? rowClassName(item.row, item.rowIndex) : '',
+                            stripe && flatIndex % 2 === 1 ? 'u-table-row-zebra' : ''
+                        ]" :style="{ height: rowHeight }" @click="handleRowClick(item.row)">
+                            <view v-for="(col, colIndex) in visibleFixedLeftColumns" :key="col.key" class="u-table-cell"
+                                :class="[col.align ? 'u-text-' + col.align : '',
+                                    cellClassName ? cellClassName(item.row, col) : '',
+                                    getFixedClass(col),
+                                    getCellSpanClass(item.row, col, item.rowIndex, colIndex)
+                                ]"
+                                :style="[cellStyleInner({ row: item.row, column: col, rowIndex: item.rowIndex, columnIndex: colIndex, level: item.level }), getCellSpanStyle(item.row, col, item.rowIndex, colIndex)]">
+                                <view v-if="col.type === 'selection'">
+                                    <checkbox :checked="isSelected(item.row)" @click.stop="toggleSelect(item.row)" />
+                                </view>
+                                <template v-else>
+                                    <view v-if="col.key === computedMainCol && hasTree" @click.stop="toggleExpand(item.row)"
+                                        :style="{ width: expandWidth }">
+                                        <view v-if="item.row[treeProps.children] && item.row[treeProps.children].length > 0">
+                                            {{ isExpanded(item.row) ? '▼' : '▶' }}
+                                        </view>
+                                    </view>
+                                    <slot name="cell" :row="item.row" :column="col" :prow="item.parentRow"
+                                        :rowIndex="item.rowIndex" :columnIndex="colIndex" :level="item.level">
+                                        <view class="u-table-cell_content">
+                                            {{ item.row[col.key] }}
+                                        </view>
+                                    </slot>
+                                </template>
+                            </view>
+                        </view>
+                    </template>
+                    <!-- #endif -->
+                    <!-- #ifndef MP-WEIXIN -->
+                    <template v-for="(row, rowIndex) in sortedData" :key="row[rowKey] || rowIndex">
+                        <!-- 子级渲染 (递归组件) -->
+                        <table-row 
+                            :row="row" 
+                            :rowIndex="rowIndex"
+                            :parent-row="null"
+                            :columns="visibleFixedLeftColumns"
+                            :tree-props="treeProps"
+                            :row-key="rowKey"
+                            :expanded-keys="expandedKeys"
+                            :cell-style-inner="cellStyleInner"
+                            :is-expanded="isExpanded"
+                            :row-class-name="rowClassName"
+                            :stripe="stripe"
+                            :cell-class-name="cellClassName"
+                            :get-fixed-class="getFixedClass"
+                            :highlight-current-row="highlightCurrentRow"
+                            :current-row="currentRow"
+                            :handle-row-click="handleRowClick"
+                            :toggle-expand="toggleExpand"
+                            :level="1"
+                            :rowHeight="rowHeight"
+                            :hasTree="hasTree"
+                            :selectedRows="selectedRows"
+                            :expandWidth="expandWidth"
+                            :computedMainCol="computedMainCol"
+                            :span-method="spanMethod"
+                            @toggle-select="toggleSelect"
+                            @row-click="handleRowClick"
+                            @toggle-expand="toggleExpand"
+                        >
+                            <template v-slot:cellChild="scope">
+                                <slot name="cell" :row="scope.row" :column="scope.column" :prow="scope.prow"
+                                    :rowIndex="scope.rowIndex" :columnIndex="scope.columnIndex" :level="scope.level">
+                                </slot>                      
+                            </template>
+                        </table-row>
+                    </template>
+                    <!-- #endif -->
+                </template>
+            </view>
         </view>
     </view>
 </template>
@@ -357,10 +429,10 @@ export default {
                 });
             });
         },
-        sortedData() {
-            if (!this.sortConditions.length) return this.filteredData;
-
-            const data = [...this.filteredData];
+        sortedData() {
+            if (!this.sortConditions.length) return this.filteredData;
+
+            const data = [...this.filteredData];
 
             return data.sort((a, b) => {
                 for (const condition of this.sortConditions) {
@@ -376,14 +448,32 @@ export default {
                     if (valA < valB) return order === 'ascending' ? -1 : 1;
                     if (valA > valB) return order === 'ascending' ? 1 : -1;
                 }
-                return 0;
-            });
-        },
-        // 计算当前应该显示的固定左侧列
-        visibleFixedLeftColumns() {
-            if (this.scrollLeft <= 0) {
-                return [];
-            }
+                return 0;
+            });
+        },
+        flattenedSortedData() {
+            const result = [];
+            const childrenKey = this.treeProps.children;
+
+            const walk = (rows, parentRow = null, level = 1) => {
+                if (!Array.isArray(rows) || rows.length === 0) return;
+                rows.forEach((row, rowIndex) => {
+                    result.push({ row, parentRow, level, rowIndex });
+                    const children = row && row[childrenKey];
+                    if (children && children.length > 0 && this.isExpanded(row)) {
+                        walk(children, row, level + 1);
+                    }
+                });
+            };
+
+            walk(this.sortedData);
+            return result;
+        },
+        // 计算当前应该显示的固定左侧列
+        visibleFixedLeftColumns() {
+            if (this.scrollLeft <= 0) {
+                return [];
+            }
             
             let totalWidth = 0;
             let fixedWidth = 0;
@@ -441,13 +531,71 @@ export default {
             deep: true,
             immediate: false
         }
-    },
-    methods: {
-        addUnit,
-        onScroll(e) {
-            this.scrollLeft = e.detail.scrollLeft;
-            // 获取所有左侧固定列
-            this.fixedLeftColumns = this.columns.filter(col => col.fixed === 'left');
+    },
+    methods: {
+        addUnit,
+        isSelected(row) {
+            return this.selectedRows.some(r => r[this.rowKey] === row[this.rowKey]);
+        },
+        getCellSpan(row, column, rowIndex, columnIndex) {
+            if (typeof this.spanMethod !== 'function') {
+                return { rowspan: 1, colspan: 1 };
+            }
+
+            const result = this.spanMethod({
+                row,
+                column,
+                rowIndex,
+                columnIndex
+            });
+
+            if (Array.isArray(result)) {
+                const [rowspan, colspan] = result;
+                return { rowspan: rowspan != null ? rowspan : 1, colspan: colspan != null ? colspan : 1 };
+            }
+
+            if (result && typeof result === 'object') {
+                const { rowspan, colspan } = result;
+                return { rowspan: rowspan != null ? rowspan : 1, colspan: colspan != null ? colspan : 1 };
+            }
+
+            return { rowspan: 1, colspan: 1 };
+        },
+        getCellSpanClass(row, column, rowIndex, columnIndex) {
+            const span = this.getCellSpan(row, column, rowIndex, columnIndex);
+            if (span.rowspan === 0 || span.colspan === 0) {
+                return 'u-table-cell-hidden';
+            }
+            if (span.rowspan > 1 || span.colspan > 1) {
+                return 'u-table-cell-merged';
+            }
+            return '';
+        },
+        getCellSpanStyle(row, column, rowIndex, columnIndex) {
+            const span = this.getCellSpan(row, column, rowIndex, columnIndex);
+            const style = {};
+
+            if (span.rowspan > 1) {
+                const currentHeight = parseInt(this.rowHeight);
+                if (!isNaN(currentHeight)) {
+                    style.height = `${span.rowspan * currentHeight}px`;
+                }
+            }
+
+            if (span.colspan > 1) {
+                style.flex = span.colspan;
+            }
+
+            if (span.rowspan === 0 || span.colspan === 0) {
+                style.display = 'none';
+            }
+
+            return style;
+        },
+        onScroll(e) {
+            this.scrollLeft = e.detail.scrollLeft;
+            // 获取所有左侧固定列
+            this.fixedLeftColumns = this.columns.filter(col => col.fixed === 'left');
             // 计算是否需要显示固定列阴影
             if (this.fixedLeftColumns.length > 0) {
                 this.showFixedColumnShadow = this.scrollLeft > 0;
@@ -716,12 +864,20 @@ export default {
         background-color: #f5f7fa;
     }
 
-    .u-table-empty {
-        text-align: center;
-        padding: 20px;
-        color: #999;
-    }
-}
+    .u-table-empty {
+        text-align: center;
+        padding: 20px;
+        color: #999;
+    }
+
+    .u-table-cell-hidden {
+        opacity: 0;
+    }
+
+    .u-table-cell-merged {
+        z-index: 1;
+    }
+}
 
 // 固定列浮动视图
 .u-table-fixed-shadow {
@@ -753,4 +909,4 @@ export default {
         border-right: none;
     }
 }
-</style>
+</style>

package/package.json

@@ -2,7 +2,7 @@
   "id": "uview-plus",
   "name": "uview-plus",
   "displayName": "零云®uview-plus3.0重磅发布，全面的Vue3鸿蒙跨端移动组件库，组件丰富维护更新稳定。",
-  "version": "3.7.13",
+  "version": "3.7.28",
   "description": "零云®uview-plus已兼容vue3支持多语言，120+全面的组件和便捷的工具会让您信手拈来。近期新增拖动排序、条码、图片裁剪、下拉刷新、虚拟列表、签名、Markdown等。",
   "keywords": [
     "uview",