From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/components/Table/lims-table.vue | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/components/Table/lims-table.vue b/src/components/Table/lims-table.vue
index 4915359..2df0ddc 100644
--- a/src/components/Table/lims-table.vue
+++ b/src/components/Table/lims-table.vue
@@ -13,7 +13,7 @@
: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="item.dataType === 'action' || item.dataType === 'slot' ? false : true"
- :min-width="item.dataType == 'action' ? btnWidth : getTitleWidth(item)"
+ :min-width="item.dataType == 'action' ? btnWidth : item.width"
:sortable="item.sortable ? true : false" :type="item.type" :width="item.dataType == 'action' ? btnWidth : item.width" align="center">
<!-- <div class="123" v-if="item.type == ''"> -->
<template v-if="item.hasOwnProperty('colunmTemplate')" :slot="item.colunmTemplate" slot-scope="scope">
@@ -64,7 +64,7 @@
<!-- 鎸夐挳 -->
<div v-else-if="item.dataType == 'action'"
- :style="`width:${getWidth(item.operation, scope.row)}`">
+ :style="`min-width:${getWidth(item.operation, scope.row)}`">
<template v-for="(o, key) in item.operation">
<el-button v-show="o.type != 'upload'" size="mini" v-if="o.showHide ? o.showHide(scope.row) : true"
:disabled="o.disabled ? o.disabled(scope.row) : false" :icon="iconFn(o)" :plain="o.plain"
@@ -302,8 +302,8 @@
count += a.name.length;
}
});
- this.btnWidth = count * 15 + 50 + "px";
- return count * 15 + 50 + "px";
+ this.btnWidth = count * 15 + 60 + "px";
+ return count * 15 + 60 + "px";
},
getTitleWidth(row) {
if (row.label.includes('鏃堕棿') || row.label.includes('缂栧彿') || row.label.includes('鏍峰搧鍚嶇О') || row.label.includes('闆朵欢')) {
@@ -323,8 +323,6 @@
iconFn(row) {
if (row.name === "缂栬緫" || row.name === "淇敼") {
return "el-icon-edit";
- } else if (row.name === "鍒犻櫎") {
- return "el-icon-delete";
} else if (row.name === "鏌ョ湅") {
return "el-icon-view";
} else {
--
Gitblit v1.9.3