uview-plus 3.5.41 → 3.5.47

package/changelog.md

@@ -1,3 +1,21 @@
+## 3.5.47（2025-09-16）
+fix: 修复modelValue类型
+
+## 3.5.46（2025-09-15）
+feat: table2新增支持span-method合并单元格
+
+## 3.5.45（2025-09-13）
+fix: 修复数据分配时未等待获取元素后再执行下一次循环导致数据插入错误，addTime属性未使用修改。
+
+## 3.5.44（2025-09-12）
+fix: 单选快捷组件作为受控组件，当modelValue清除选择时，组件状态未被清除。
+
+## 3.5.43（2025-09-10）
+fix: 增加subsection兼容性索引转为数字
+
+## 3.5.42（2025-09-09）
+feat: index-list增加下边距高度
+
 ## 3.5.41（2025-09-08）
 fix: 修复cascader方法引用位置
 

package/components/u-alert/props.js

@@ -68,7 +68,7 @@ export const props = defineMixin({
         },
         // 是否显示
         modelValue: {
-            type: [String],
+            type: [Boolean],
             default: () => defProps.alert.value
         }
     }

package/components/u-index-list/indexList.js

@@ -15,6 +15,7 @@ export default {
         indexList: [],
         sticky: true,
         customNavHeight: 0,
-        safeBottomFix: false
+        safeBottomFix: false,
+        itemMargin: '0rpx'
     }
 }

package/components/u-index-list/props.js

@@ -32,5 +32,10 @@ export const props = defineMixin({
             type: Boolean,
             default: () => defProps.indexList.safeBottomFix
         },
+        //自定义下边距
+        itemMargin: {
+            type: String,
+            default: () => defProps.indexList.itemMargin
+        },
     }
 })

package/components/u-index-list/u-index-list.vue

@@ -411,12 +411,13 @@
 				const anchors = this.anchors
 				// 由于list组件无法获取cell的top值，这里通过header slot和各个item之间的height，模拟出类似非nvue下的位置信息
 				let children = this.children.map((item, index) => {
+					const childHeight = item.height + getPx(this.itemMargin)
 					const child = {
-						height: item.height,
+						height: childHeight,
 						top: top
 					}
 					// 进行累加，给下一个item提供计算依据
-					top = top + item.height
+					top = top + childHeight
 					// #ifdef APP-NVUE
 					// 只有nvue下，需要将锚点的高度也累加，非nvue下锚点高度是包含在index-item中的。
 					top = top + anchors[index].height
@@ -494,12 +495,13 @@
 				const anchors = this.anchors
 				// 由于list组件无法获取cell的top值，这里通过header slot和各个item之间的height，模拟出类似非nvue下的位置信息
 				children = this.children.map((item, index) => {
+					const childHeight = item.height + getPx(this.itemMargin)
 					const child = {
-						height: item.height,
+						height: childHeight,
 						top: top
 					}
 					// 进行累加，给下一个item提供计算依据
-					top = top + item.height
+					top = top + childHeight
 					// #ifdef APP-NVUE
 					// 只有nvue下，需要将锚点的高度也累加，非nvue下锚点高度是包含在index-item中的。
 					top = top + anchors[index].height

package/components/u-picker-data/u-picker-data.vue

@@ -71,6 +71,8 @@ export default {
 					this.defaultIndex = [index]
 				}
 			})
+		} else {
+			this.clear();
 		}
     },
 	watch: {
@@ -82,6 +84,8 @@ export default {
 						this.defaultIndex = [index]
 					}
 				})
+			} else {
+				this.clear();
 			}
 		}
 	},
@@ -102,6 +106,10 @@ export default {
 		close() {
 			this.$emit('close')
 		},
+		clear() {
+			this.current = '';
+			this.defaultIndex = [];
+		},
         confirm(e) {
 			const {
 			    columnIndex,

package/components/u-subsection/u-subsection.vue

@@ -101,7 +101,7 @@ export default {
             immediate: true,
             handler(n) {
                 if (n !== this.innerCurrent) {
-                    this.innerCurrent = n
+                    this.innerCurrent = Number(n)
                 }
                 // #ifdef APP-NVUE
                 // 在安卓nvue上，如果通过translateX进行位移，到最后一个时，会导致右侧无法绘制圆角

package/components/u-table2/tableRow.vue

@@ -2,9 +2,6 @@
 .u-table-row {
     display: flex;
     flex-direction: row;
-    align-items: center;
-    border-bottom: 1px solid #ebeef5;
-    overflow: hidden;
     position: relative;
 }
 
@@ -26,12 +23,26 @@
     flex: 1;
     display: flex;
     flex-direction: row;
-    padding: 10px 10px;
+    align-items: center;
+    padding: 10px 1px;
     font-size: 14px;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     line-height: 1.1;
+    border-bottom: 1px solid #ebeef5;
+    &.u-text-left {
+        justify-content: flex-start;
+        text-align: left;
+    }
+    &.u-text-center {
+        justify-content: center;
+        text-align: center;
+    }
+    &.u-text-right {
+        justify-content: flex-end;
+        text-align: right;
+    }
 }
 
 .u-table-row-zebra {
@@ -48,16 +59,14 @@
     color: #999;
 }
 
-.u-text-left {
-    text-align: left;
+// 隐藏被合并的单元格
+.u-table-cell-hidden {
+    opacity: 0;
 }
 
-.u-text-center {
-    text-align: center;
-}
-
-.u-text-right {
-    text-align: right;
+// 合并单元格样式
+.u-table-cell-merged {
+    z-index: 1;
 }
 </style>
 <template>
@@ -70,9 +79,10 @@
             class="u-table-cell"
             :class="[col.align ? 'u-text-' + col.align : '',
                 cellClassName ? cellClassName(row, col) : '',
-                getFixedClass(col)
+                getFixedClass(col),
+                getCellSpanClass(rowIndex, colIndex)
             ]"
-            :style="cellStyleInner({row: row, column: col, rowIndex: rowIndex, columnIndex: colIndex, level: level})">
+            :style="[cellStyleInner({row: row, column: col, rowIndex: rowIndex, columnIndex: colIndex, level: level}), getCellSpanStyle(rowIndex, colIndex)]">
                 <!-- 复选框列 -->
                 <view v-if="col.type === 'selection'">
                     <checkbox :checked="isSelected(row)"
@@ -122,6 +132,7 @@
                     :selectedRows="selectedRows"
                     :expandWidth="expandWidth"
                     :computed-main-col="computedMainCol"
+                    :span-method="spanMethod"
                     @toggle-select="$emit('toggleSelect', $event)"
                     @row-click="$emit('rowClick', $event)"
                     @toggle-expand="$emit('toggleExpand', $event)"
@@ -232,12 +243,85 @@ export default {
         rowHeight: {
             type: String,
             required: true
+        },
+        // 添加spanMethod属性
+        spanMethod: {
+            type: Function,
+            default: null
         }
     },
     emits: ['rowClick', 'toggleExpand', 'toggleSelect'],
     methods: {
         isSelected(row) {
             return this.selectedRows.some(r => r[this.rowKey] === row[this.rowKey]);
+        },
+        // 获取单元格的合并信息
+        getCellSpan(rowIndex, columnIndex) {
+            if (typeof this.spanMethod !== 'function') {
+                return { rowspan: 1, colspan: 1 };
+            }
+            
+            const row = this.row;
+            const column = this.columns[columnIndex];
+            
+            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 };
+            } else if (typeof result === 'object') {
+                return {
+                    rowspan: rowspan != null ? rowspan : 1,
+                    colspan: colspan != null ? colspan : 1
+                };
+            }
+            
+            return { rowspan: 1, colspan: 1 };
+        },
+        // 获取单元格的样式类
+        getCellSpanClass(rowIndex, columnIndex) {
+            const span = this.getCellSpan(rowIndex, columnIndex);
+            
+            // 如果rowspan为0或colspan为0，表示该单元格被合并，需要隐藏
+            if (span.rowspan === 0 || span.colspan === 0) {
+                return 'u-table-cell-hidden';
+            } else if (span.rowspan > 1 || span.colspan > 1) {
+                // 如果有合并，添加合并样式类
+                return 'u-table-cell-merged';
+            }
+            
+            return '';
+        },
+        // 获取单元格的样式
+        getCellSpanStyle(rowIndex, columnIndex) {
+            const span = this.getCellSpan(rowIndex, columnIndex);
+            const style = {};
+            
+            // 设置rowspan
+            if (span.rowspan > 1) {
+                // 正确计算合并后的高度
+                const currentHeight = parseInt(this.rowHeight);
+                if (!isNaN(currentHeight)) {
+                    style.height = `${span.rowspan * currentHeight}px`;
+                }
+            }
+            
+            // 设置colspan
+            if (span.colspan > 1) {
+                style.flex = span.colspan;
+            }
+            
+            // 如果rowspan为0或colspan为0，表示该单元格被合并，需要隐藏
+            if (span.rowspan === 0 || span.colspan === 0) {
+                style.display = 'none';
+            }
+            
+            return style;
         }
     }
 }

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

@@ -5,11 +5,10 @@
             <view v-if="showHeader" class="u-table-header" :class="{ 'u-table-sticky': fixedHeader }" :style="{minWidth: scrollWidth}">
                 <view class="u-table-row">
                     <view v-for="(col, colIndex) in columns" :key="col.key" class="u-table-cell"
-                        :style="headerColStyle(col)"
-                        :class="[col.align ? 'u-text-' + col.align : '',
+                        :class="[col.headerAlign ? 'u-text-' + col.headerAlign : (col.align ? 'u-text-' + col.align : '') ,
                             headerCellClassName ? headerCellClassName(col) : '',
                             getFixedClass(col)
-                        ]" @click="handleHeaderClick(col)">
+                        ]" :style="headerColStyle(col)" @click="handleHeaderClick(col)">
                         <slot name="header" :column="col" :columnIndex="colIndex" :level="1">
                         </slot>
                         <text v-if="!$slots['header']">{{ col.title }}</text>
@@ -54,6 +53,7 @@
                         :selectedRows="selectedRows"
                         :expandWidth="expandWidth"
                         :computedMainCol="computedMainCol"
+                        :span-method="spanMethod"
                         @toggle-select="toggleSelect"
                         @row-click="handleRowClick"
                         @toggle-expand="toggleExpand"
@@ -128,6 +128,7 @@
                             :selectedRows="selectedRows"
                             :expandWidth="expandWidth"
                             :computedMainCol="computedMainCol"
+                            :span-method="spanMethod"
                             @toggle-select="toggleSelect"
                             @row-click="handleRowClick"
                             @toggle-expand="toggleExpand"
@@ -298,8 +299,13 @@ export default {
             default: '25px'
         },
         rowHeight: {
-            String,
-            default: '40px'
+            type: String,
+            default: '36px'
+        },
+        // 添加spanMethod属性，用于合并单元格
+        spanMethod: {
+            type: Function,
+            default: null
         }
     },
     emits: [
@@ -653,8 +659,6 @@ export default {
     .u-table-row {
         display: flex;
         flex-direction: row;
-        align-items: center;
-        border-bottom: 1px solid #ebeef5;
         overflow: hidden;
         position: relative;
         // min-height: 40px;
@@ -678,12 +682,26 @@ export default {
         flex: 1;
         display: flex;
         flex-direction: row;
-        padding: 10px 10px;
+        align-items: center;
+        padding: 10px 1px;
         font-size: 14px;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
         line-height: 1.1;
+        border-bottom: 1px solid #ebeef5;
+        &.u-text-left {
+            justify-content: flex-start;
+            text-align: left;
+        }
+        &.u-text-center {
+            justify-content: center;
+            text-align: center;
+        }
+        &.u-text-right {
+            justify-content: flex-end;
+            text-align: right;
+        }
     }
 
     .u-table-row-zebra {
@@ -699,18 +717,6 @@ export default {
         padding: 20px;
         color: #999;
     }
-
-    .u-text-left {
-        text-align: left;
-    }
-
-    .u-text-center {
-        text-align: center;
-    }
-
-    .u-text-right {
-        text-align: right;
-    }
 }
 
 // 固定列浮动视图

package/components/u-waterfall/u-waterfall.vue

@@ -155,7 +155,7 @@
                 window.removeEventListener('resize', this.handleWindowResize);
             }
             // #endif
-        }
+        },
         // #endif
         computed: {
             // 破坏flowList变量的引用，否则watch的结果新旧值是一样的
@@ -252,8 +252,8 @@
                     this.columnList[minHeightIndex].push(item);
                     
                     // 获取实际渲染后的元素高度而不是估算
-                    await sleep(30)
-                    this.$nextTick(async () => {
+                    await sleep(this.addTime)
+                    await this.$nextTick(async () => {
                     try {
                         const rect = await this.$uGetRect(`#u-column-${minHeightIndex}`);
                         // console.log(`#u-column-${minHeightIndex}`, rect.height)

package/package.json

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