From 78a3c898908bbb8827d1c2aa6299f92ff03f5847 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期三, 21 十月 2026 15:06:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/Table/lims-table.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 8b7a584..946cca8 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -35,7 +35,7 @@
:label="item.label"
:prop="item.prop"
:show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true"
- :min-width="columnWidth(item)"
+ :min-width="columnMinWidth(item)"
:sortable="item.sortable ? true : false"
:type="item.type"
:width="columnWidth(item)"
@@ -214,6 +214,14 @@
})
function columnWidth(item) {
+ if (item.minWidth) return undefined
+ return item.dataType === 'action' ? actionColumnWidth.value : item.width
+}
+
+// 閰嶇疆 minWidth 鏃跺彧绾︽潫鏈�灏忓搴︼紝鎶婂墿浣欑┖闂翠氦缁� Element Plus 鑷姩鍒嗛厤銆�
+// 鏈厤缃� minWidth 鐨勬棫椤甸潰缁х画娌跨敤鍘熸湁鍥哄畾 width 琛屼负銆�
+function columnMinWidth(item) {
+ if (item.minWidth) return item.minWidth
return item.dataType === 'action' ? actionColumnWidth.value : item.width
}
@@ -223,7 +231,10 @@
}
function indexMethod(index) {
- return (props.page.current - 1) * props.page.size + index + 1
+ // 鏈紶 page 鏃堕粯璁� current 涓� 0锛屼細绠楀嚭 -9銆�-8 杩欑被璐熷簭鍙凤紱杩欓噷鍏滃簳涓虹涓�椤�
+ const current = props.page && props.page.current > 0 ? props.page.current : 1
+ const size = props.page && props.page.size > 0 ? props.page.size : 10
+ return (current - 1) * size + index + 1
}
function onPagination({ page, limit }) {
--
Gitblit v1.9.3