From cf4d0c947dbe409871910b92d26ba7513e2b4f4e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 19 三月 2025 13:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/components/Table/lims-table.vue | 31 ++++++-------------------------
1 files changed, 6 insertions(+), 25 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index e61c19d..3accd8a 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -12,7 +12,8 @@
<el-table-column v-for="(item, index) in column" :key="index" :column-key="item.columnKey"
:filter-method="item.filterHandler" :filter-multiple="item.filterMultiple" :filtered-value="item.filteredValue"
:filters="item.filters" :fixed="item.fixed" :label="item.label" :prop="item.prop"
- :show-overflow-tooltip="true"
+ :show-overflow-tooltip="item.dataType === 'action' || item.dataType === 'slot' ? false : true"
+ :min-width="item.dataType == 'action' ? btnWidth : getTitleWidth(item)"
:sortable="item.sortable ? true : false" :type="item.type" :width="item.dataType == 'action' ? btnWidth : getTitleWidth(item)" align="center">
<!-- <div class="123" v-if="item.type == ''"> -->
<template v-if="item.hasOwnProperty('colunmTemplate')" :slot="item.colunmTemplate" slot-scope="scope">
@@ -307,11 +308,13 @@
getTitleWidth(row) {
if (row.label.includes('鏃堕棿') || row.label.includes('缂栧彿') || row.label.includes('鏍峰搧鍚嶇О') || row.label.includes('闆朵欢')) {
return 160
+ } else if (row.label.includes('鎿嶄綔')) {
+ return row.width
} else {
const span = document.createElement('span');
span.innerText = row.label;
document.body.appendChild(span);
- const width = `${span.offsetWidth + 30}px`;
+ const width = `${span.offsetWidth + 50}px`;
document.body.removeChild(span);
return width;
@@ -464,28 +467,6 @@
};
}
}
- // // 鐗规畩鐨勫悎骞惰
- // if (
- // this.data.spanConfig != undefined &&
- // this.data.spanConfig.special &&
- // this.data.spanConfig.special.main &&
- // this.data.spanConfig.special.rows &&
- // this.data.spanConfig.special.rows.length > 0
- // ) {
- // let i = null;
- // let obj = this.data.spanConfig.special.rows.find((item, index) => {
- // i = index;
- // return item.index == columnIndex;
- // });
- // if (obj) {
- // const _row = this.specialSpanList[i].arr[rowIndex];
- // const _col = _row > 0 ? 1 : 0;
- // return {
- // rowspan: _row,
- // colspan: _col,
- // };
- // }
- // }
},
},
};
@@ -501,7 +482,7 @@
cursor: pointer;
}
>>>.cell {
- padding: 0px !important;
+ padding: 0 !important;
}
.cell {
white-space: nowrap;
--
Gitblit v1.9.3