uview-plus 3.4.32 → 3.4.34

package/changelog.md

@@ -1,3 +1,13 @@
+## 3.4.34（2025-05-28）
+feat: table2支持自定义标题和单元格样式
+
+## 3.4.33（2025-05-27）
+fix: 修复小程序cate-tab第一次切换时没反应 感谢@jiaruiyan
+
+fix: 修复datetimepicker传入空字符串时导致组件崩溃 感谢@jiaruiyan
+
+fix: 修复album带单位的字符串参与计算导致的计算数据错误 感谢@jiaruiyan
+
 ## 3.4.32（2025-05-26）
 feat: 增加状态栏独立颜色配置支持支付宝小程序状态栏对背景色识别的不友好的情况
 

package/components/u-album/u-album.vue

@@ -213,14 +213,29 @@ export default {
             uni.getImageInfo({
                 src,
                 success: (res) => {
+                    let singleSize = this.singleSize;
+                    // 单位
+                    let unit = '';
+                    if (Number.isNaN(Number(this.singleSize))) {
+                        // 大小中有字符 则记录字符
+                        unit = this.singleSize.replace(/\d+/g, ''); // 单位
+                        singleSize = Number(this.singleSize.replace(/\D+/g, ''), 10); // 具体值
+                    }
+
                     // 判断图片横向还是竖向展示方式
                     const isHorizotal = res.width >= res.height
                     this.singleWidth = isHorizotal
-                        ? this.singleSize
-                        : (res.width / res.height) * this.singleSize
+                        ? singleSize
+                        : (res.width / res.height) * singleSize
                     this.singleHeight = !isHorizotal
-                        ? this.singleSize
+                        ? singleSize
                         : (res.height / res.width) * this.singleWidth
+
+                    // 如果有单位统一设置单位
+                    if(unit != null && unit !== ''){
+                        this.singleWidth = this.singleWidth + unit
+                        this.singleHeight = this.singleHeight + unit
+                    }
                 },
                 fail: () => {
                     this.getComponentWidth()

package/components/u-cate-tab/u-cate-tab.vue

@@ -17,7 +17,7 @@
 				<slot name="rightTop" :tabList="tabList">
                 </slot>
 				<view class="u-cate-tab__page-view">
-					<view class="u-cate-tab__page-item" :id="'item' + index" 
+					<view class="u-cate-tab__page-item" :id="'item' + index"
 						v-for="(item , index) in tabList" :key="index">
                         <slot name="itemList" :item="item">
                         </slot>
@@ -167,7 +167,7 @@
 			},
 			// 获取右边菜单每个item到顶部的距离
 			getMenuItemTop() {
-				new Promise(resolve => {
+				return new Promise(resolve => {
 					let selectorQuery = uni.createSelectorQuery().in(this);
 					selectorQuery.selectAll('.u-cate-tab__page-item').boundingClientRect((rects) => {
 						// 如果节点尚未生成，rects值为[](因为用selectAll，所以返回的是数组)，循环调用执行
@@ -181,8 +181,8 @@
 						rects.forEach((rect) => {
 							// 这里减去rects[0].top，是因为第一项顶部可能不是贴到导航栏(比如有个搜索框的情况)
 							this.arr.push(rect.top - rects[0].top);
-							resolve();
 						})
+                        resolve();
 					}).exec()
 				})
 			},

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

@@ -1,7 +1,7 @@
 <template>
     <view class="u-datetime-picker">
         <view v-if="hasInput" class="u-datetime-picker__has-input"
-            @click="onShowByClickInput" 
+            @click="onShowByClickInput"
         >
             <slot name="trigger" :value="inputValue">
 				<up-input
@@ -436,7 +436,10 @@
 			},
 			// 根据minDate、maxDate、minHour、maxHour等边界值，判断各列的开始和结束边界值
 			getBoundary(type, innerValue) {
-			    const value = new Date(innerValue)
+			    let value = new Date(innerValue)
+                if(isNaN(value.getTime())){
+                    value = new Date()
+                }
 			    const boundary = new Date(this[`${type}Date`])
 			    const year = dayjs(boundary).year()
 			    let month = 1
@@ -475,7 +478,7 @@
 				if(!this.disabled){
 					this.showByClickInput = !this.showByClickInput
 				}
-				
+
 			}
 		}
 	}

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

@@ -4,7 +4,8 @@
         <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="{ width: col.width ? addUnit(col.width) : 'auto', flex: col.width ? 'none' : 1 }" :class="[
+                    :style="headerColStyle(col)"
+					:class="[
                         col.align ? 'u-text-' + col.align : '',
                         headerCellClassName ? headerCellClassName(col) : '',
                         col.fixed === 'left' ? 'u-table-fixed-left' : '',
@@ -27,24 +28,29 @@
                         rowClassName ? rowClassName(row, index) : '',
                         stripe && index % 2 === 1 ? 'u-table-row-zebra' : ''
                     ]" @click="handleRowClick(row)">
-                        <view v-for="(col, colIndex) in columns" :key="col.key" class="u-table-cell" :class="[
+                        <view v-for="(col, colIndex) in columns" :key="col.key"
+							class="u-table-cell" :class="[
                             col.align ? 'u-text-' + col.align : '',
                             cellClassName ? cellClassName(row, col) : '',
                             col.fixed === 'left' ? 'u-table-fixed-left' : '',
                             col.fixed === 'right' ? 'u-table-fixed-right' : ''
-                        ]" :style="{ width: col.width ? addUnit(col.width) : 'auto', flex: col.width ? 'none' : 1 }">
+                        ]" :style="cellStyleInner({row: row, column: col,
+							rowIndex: index, columnIndex: colIndex, level: 0})">
                             <!-- 复选框列 -->
                             <view v-if="col.type === 'selection'">
-                                <checkbox :checked="isSelected(row)" @click.stop="toggleSelect(row)" />
+                                <checkbox :checked="isSelected(row)"
+									@click.stop="toggleSelect(row)" />
                             </view>
 
                             <!-- 树形结构展开图标 -->
-                            <view v-else-if="col.type === 'expand'" @click.stop="toggleExpand(row)">
+                            <view v-else-if="col.type === 'expand'"
+								@click.stop="toggleExpand(row)">
                                 {{ isExpanded(row) ? '▼' : '▶' }}
                             </view>
 
                             <!-- 默认插槽或文本 -->
-                            <slot name="cell" :row="row" :col="col">
+                            <slot name="cell" :row="row" :column="col"
+								:rowIndex="index" :columnIndex="colIndex">
                                 <view class="u-table-cell_content">
                                     {{ row[col.key] }}
                                 </view>
@@ -54,13 +60,15 @@
 
                     <!-- 子级渲染 -->
                     <template v-if="isExpanded(row) && row[treeProps.children] && row[treeProps.children].length">
-                        <view v-for="child in row[treeProps.children]" :key="child[rowKey]"
+                        <view v-for="childRow in row[treeProps.children]" :key="childRow[rowKey]"
                             class="u-table-row u-table-row-child">
-                            <view v-for="col in columns" :key="col.key" class="u-table-cell"
-                                :style="{ width: col.width ? addUnit(col.width) : 'auto', paddingLeft: '24px', flex: col.width ? 'none' : 1 }">
-                                <slot name="cell" :row="child" :col="col">
+                            <view v-for="(col2, col2Index) in columns" :key="col2.key" class="u-table-cell"
+                                :style="cellStyleInner({row: childRow, column: col2,
+									rowIndex: index, columnIndex: col2Index, level: 1})">
+                                <slot name="cell" :row="childRow" :column="col2" :prow="row"
+									:rowIndex="index" :columnIndex="col2Index" :level="1">
                                     <view class="u-table-cell_content">
-                                        {{ child[col.key] }}
+                                        {{ childRow[col2.key] }}
                                     </view>
                                 </slot>
                             </view>
@@ -141,7 +149,11 @@ export default {
         cellClassName: {
             type: Function,
             default: null
-        },
+        },
+		cellStyle: {
+		    type: Function,
+		    default: null
+		},
         headerCellClassName: {
             type: Function,
             default: null
@@ -227,9 +239,38 @@ export default {
     },
     mounted() {
         this.getComponentWidth()
-    },
+    },
+	computed: {
+	},
     methods: {
-        addUnit,
+        addUnit,
+		headerColStyle(col) {
+			let style = {
+				width: col.width ? addUnit(col.width) : 'auto',
+				flex: col.width ? 'none' : 1
+			};
+			if (col?.style) {
+				style = {...style, ...col?.style};
+			}
+			return style;
+		},
+		setCellStyle(e) {
+			this.cellStyle = e
+		},
+		cellStyleInner(scope) {
+			let style = {
+				width: scope.column?.width ? addUnit(scope.column.width) : 'auto',
+				flex: scope.column?.width ? 'none' : 1,
+				paddingLeft: (24 * scope.level) + 'px'
+			};
+			if (this.cellStyle != null) {
+				let styleCalc = this.cellStyle(scope)
+				if (styleCalc != null) {
+					style = {...style, ...styleCalc}
+				}
+			}
+			return style;
+		},
         // 获取组件的宽度
 		async getComponentWidth() {
 			// 延时一定时间，以获取dom尺寸

package/package.json

@@ -2,7 +2,7 @@
 	"id": "uview-plus",
 	"name": "uview-plus",
 	"displayName": "零云®uview-plus3.0重磅发布，全面的Vue3鸿蒙移动组件库。",
-	"version": "3.4.32",
+	"version": "3.4.34",
 	"description": "零云®uview-plus已兼容vue3，全面的组件和便捷的工具会让您信手拈来，如鱼得水。",
 	"keywords": [
         "uview",