From dd3fbaaeafa135e55ffaa9c7a9a1c08c2530d8d3 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 30 五月 2025 09:58:08 +0800
Subject: [PATCH] 提交表格部分更改
---
src/components/Table/ETable.vue | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/components/Table/ETable.vue b/src/components/Table/ETable.vue
index 91f767a..88c6f57 100644
--- a/src/components/Table/ETable.vue
+++ b/src/components/Table/ETable.vue
@@ -7,11 +7,14 @@
:show-selection="showSelection"
:max-height="maxHeight"
@selection-change="handleSelectionChange"
+<<<<<<< HEAD
+=======
@row-click="handleRowClick"
@row-dblclick="handleRowDblClick"
@cell-click="handleCellClick"
:max-width="maxWidth"
@export="handleExport"
+>>>>>>> master
>
<el-table-column v-if="showSelection" type="selection" width="55" align="center" />
<el-table-column v-if="showIndex" label="搴忓彿" type="index" width="60" align="center" />
@@ -54,6 +57,8 @@
import { ElMessage, ElMessageBox } from 'element-plus'
const props = defineProps({
+<<<<<<< HEAD
+=======
// 鏈�澶у搴�
maxWidth: {
type: [String, Number],
@@ -75,6 +80,7 @@
type: Function,
default: () => {}
},
+>>>>>>> master
// 楂樺害
maxHeight: {
type: [String, Number],
--
Gitblit v1.9.3