From 17ba8e005e8f01a0d11c70413a337fe0f1288871 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 30 五月 2025 10:19:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/zd-before into dev
---
src/components/Table/ETable.vue | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/components/Table/ETable.vue b/src/components/Table/ETable.vue
index f835e2d..88c6f57 100644
--- a/src/components/Table/ETable.vue
+++ b/src/components/Table/ETable.vue
@@ -7,6 +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" />
@@ -49,6 +57,30 @@
import { ElMessage, ElMessageBox } from 'element-plus'
const props = defineProps({
+<<<<<<< HEAD
+=======
+ // 鏈�澶у搴�
+ maxWidth: {
+ type: [String, Number],
+ default: 'auto'
+ },
+ handleCellClick: {
+ type: Function,
+ default: () => {}
+ },
+ handleRowClick: {
+ type: Function,
+ default: () => {}
+ },
+ handleExport: {
+ type: Function,
+ default: () => {}
+ },
+ handleRowDblClick: {
+ type: Function,
+ default: () => {}
+ },
+>>>>>>> master
// 楂樺害
maxHeight: {
type: [String, Number],
--
Gitblit v1.9.3