From 761f38e975bc4f4d6973eb92996504928e1b30b0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 16 五月 2025 16:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/components/PIMTable/PIMTable.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/components/PIMTable/PIMTable.vue b/src/components/PIMTable/PIMTable.vue
index 7435f7b..96f1f52 100644
--- a/src/components/PIMTable/PIMTable.vue
+++ b/src/components/PIMTable/PIMTable.vue
@@ -2,9 +2,9 @@
<el-table ref="multipleTable" v-loading="tableLoading" :border="border" :data="tableData"
:header-cell-style="{ background: '#F0F1F5', color: '#333333' }" height="calc(100vh - 18.5em)"
:highlight-current-row="highlightCurrentRow" :row-class-name="rowClassName" :row-style="rowStyle" :row-key="rowKey"
- style="width: 100%" tooltip-effect="dark" @row-click="rowClick" @current-change="currentChange"
+ style="width: 100%" tooltip-effect="dark" @row-click="rowClick" @current-change="currentChange" :show-summary="isShowSummary"
@selection-change="handleSelectionChange" class="lims-table">
- <el-table-column align="center" type="selection" width="55" />
+ <el-table-column align="center" type="selection" width="55" v-if="isSelection"/>
<el-table-column align="center" label="搴忓彿" type="index" width="60" />
<el-table-column v-for="(item, index) in column" :key="index" :column-key="item.columnKey"
@@ -135,6 +135,14 @@
type: Boolean,
default: true
},
+ isSelection: {
+ type: Boolean,
+ default: false,
+ },
+ isShowSummary: {
+ type: Boolean,
+ default: false,
+ },
highlightCurrentRow: {
type: Boolean,
default: false
@@ -179,7 +187,6 @@
})
// Data
-const btnWidth = ref('120px')
const uploadRefs = ref([])
const currentFiles = ref({})
const uploadKeys = ref({})
--
Gitblit v1.9.3