From 3610f8f7db4484e5af01288d386307b5a572639f Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Mon, 4 Aug 2025 20:13:45 +0800
Subject: [PATCH] =?UTF-8?q?refactor(table):=20=E9=87=8D=E6=9E=84=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=BB=84=E4=BB=B6=E4=BD=BF=E7=94=A8=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 CuteDragTable 和 CuteSimpleTable 组件中的 columns 和 operateColumn 属性- 使用 slot 方式插入表格列和操作列
- 更新表格组件的文档注释
- 调整示例代码以适应新的表格组件用法
---
 .../views/components/dev/CuteDragTable.vue    | 50 ++++---------------
 .../views/components/dev/CuteSimpleTable.vue  | 31 +-----------
 .../componentsDemo/CuteDragTableDemo.vue      | 48 ++++++++----------
 .../componentsDemo/CuteSimpleTableDemo.vue    | 26 ++++++++--
 4 files changed, 53 insertions(+), 102 deletions(-)

diff --git a/cutejava-front/src/views/components/dev/CuteDragTable.vue b/cutejava-front/src/views/components/dev/CuteDragTable.vue
index 72131e73..b9efd8a2 100644
--- a/cutejava-front/src/views/components/dev/CuteDragTable.vue
+++ b/cutejava-front/src/views/components/dev/CuteDragTable.vue
@@ -14,35 +14,17 @@
       @selection-change="onTableSelectionChange"
     >
       <el-table-column v-if="mode === 'multi'" type="selection" width="55" />
-      <el-table-column
-        v-for="(column, index) in crud.columns"
-        :key="index"
-        :label="column.label"
-        :prop="column.prop"
-        :fixed="column.fixed ? column.fixed:false"
-        :formatter="column.formatter ? column.formatter : null"
-        :width="column.width ? column.width:null"
-        :min-width="column.width ? column.width:null"
-        :show-overflow-tooltip="true"
+      <slot />
+      <el-pagination
+        :current-page="pageProps.current"
+        :page-sizes="[10, 20, 50]"
+        :page-size="pageProps.pageSize"
+        layout="total, sizes, prev, pager, next"
+        :total="pageProps.total"
+        @size-change="(size) => crud.onPageChange(pageProps.current, size, pageProps.total)"
+        @current-change="(current) => crud.onPageChange(current, pageProps.pageSize, pageProps.total)"
       />
-      <el-table-column
-        v-if="crud.operateColumn"
-        :width="crud.operateColumn.width"
-        label="操作"
-        :formatter="crud.operateColumn.formatter"
-        :fixed="crud.operateColumn.fixed"
-      />
-    </el-table>
-    <el-pagination
-      :current-page="pageProps.current"
-      :page-sizes="[10, 20, 50]"
-      :page-size="pageProps.pageSize"
-      layout="total, sizes, prev, pager, next"
-      :total="pageProps.total"
-      @size-change="(size) => crud.onPageChange(pageProps.current, size, pageProps.total)"
-      @current-change="(current) => crud.onPageChange(current, pageProps.pageSize, pageProps.total)"
-    />
-  </div>
+    </el-table></div>
 </template>
 
 <script>
@@ -56,16 +38,6 @@ export default {
       required: true,
       default: null
     },
-    columns: {
-      type: Array,
-      required: true,
-      default: null
-    },
-    operateColumn: {
-      type: [Object, Boolean],
-      required: true,
-      default: null
-    },
     fetch: {
       type: Function,
       required: false,
@@ -103,8 +75,6 @@ export default {
       crud: {
         loading: false,
         primaryKey: this.primaryKey ? this.primaryKey : 'id',
-        columns: this.columns && this.columns.length > 0 ? this.columns : [],
-        operateColumn: this.operateColumn,
         fetchUrl: null,
         dataSource: [],
         onPageChange: (currentPage, pageSize) => {
diff --git a/cutejava-front/src/views/components/dev/CuteSimpleTable.vue b/cutejava-front/src/views/components/dev/CuteSimpleTable.vue
index f5b27be0..35d21a89 100644
--- a/cutejava-front/src/views/components/dev/CuteSimpleTable.vue
+++ b/cutejava-front/src/views/components/dev/CuteSimpleTable.vue
@@ -14,24 +14,7 @@
       @selection-change="onTableSelectionChange"
     >
       <el-table-column v-if="mode === 'multi'" type="selection" width="55" />
-      <el-table-column
-        v-for="(column, index) in crud.columns"
-        :key="index"
-        :label="column.label"
-        :prop="column.prop"
-        :fixed="column.fixed ? column.fixed:false"
-        :formatter="column.formatter ? column.formatter : null"
-        :width="column.width ? column.width:null"
-        :min-width="column.width ? column.width:null"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        v-if="crud.operateColumn"
-        :width="crud.operateColumn.width"
-        label="操作"
-        :formatter="crud.operateColumn.formatter"
-        :fixed="crud.operateColumn.fixed"
-      />
+      <slot />
     </el-table>
     <el-pagination
       :current-page="pageProps.current"
@@ -55,16 +38,6 @@ export default {
       required: true,
       default: null
     },
-    columns: {
-      type: Array,
-      required: true,
-      default: null
-    },
-    operateColumn: {
-      type: [Object, Boolean],
-      required: true,
-      default: null
-    },
     fetch: {
       type: Function,
       required: false,
@@ -102,8 +75,6 @@ export default {
       crud: {
         loading: false,
         primaryKey: this.primaryKey ? this.primaryKey : 'id',
-        columns: this.columns && this.columns.length > 0 ? this.columns : [],
-        operateColumn: this.operateColumn,
         fetchUrl: null,
         dataSource: [],
         onPageChange: (currentPage, pageSize) => {
diff --git a/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue b/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue
index 77c49a26..3786a8e8 100644
--- a/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue
+++ b/cutejava-front/src/views/componentsDemo/CuteDragTableDemo.vue
@@ -24,8 +24,6 @@
     <!-- params-transform: 组装查询参数 -->
     <!-- responseTransform: 组装表格对象。对响应结果做处理 -->
     <!-- primary-key: 主键 -->
-    <!-- columns: 表格列 -->
-    <!-- operate-column: 表格操作列 -->
     <!-- data-source: 数据源。当data-source不为空时，以data-source的数据为主 -->
     <!-- mode: 模式。不传默认，传multi为多选 -->
     <!-- @selection-change: 当且仅当mode为multi时启用 -->
@@ -34,10 +32,21 @@
       :fetch="curd.fetch"
       :params-transform="curd.paramsTransform"
       primary-key="id"
-      :columns="curd.columns"
-      :operate-column="curd.operateColumn"
       :page-props="curd.pageProps"
-    />
+    >
+      <el-table-column prop="name" label="名称" />
+      <el-table-column prop="description" label="描述" />
+      <el-table-column prop="createTime" label="创建时间" :formatter="FormatRowDateTimeStr" />
+      <el-table-column prop="createBy" label="创建人" />
+      <el-table-column label="操作" width="150" min-width="150" fixed="right">
+        <template slot-scope="scope">
+          <div>
+            <el-button type="text" @click="onTableEditClick(scope.row)">编辑</el-button>
+            <el-button type="text" @click="onTableDeleteClick(scope.row)">删除</el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </cute-drag-table>
   </div>
 </template>
 
@@ -71,28 +80,6 @@ export default {
         fetch: async(queryParams) => {
           return DictService.queryPageDict(queryParams)
         },
-        columns: [
-          { prop: 'name', label: '名称' },
-          { prop: 'description', label: '描述' },
-          { prop: 'createTime', label: '创建时间', formatter: FormatRowDateTimeStr },
-          { prop: 'createBy', label: '创建人' }
-        ],
-        operateColumn: {
-          width: '150',
-          fixed: 'right',
-          formatter: (row, column, cellValue, index) => {
-            return (<div>
-              <el-button type='text' onClick={() => {
-                console.log('编辑')
-              }}>编辑
-              </el-button>
-              <el-button type='text' onClick={() => {
-                console.log('删除')
-              }}>删除
-              </el-button>
-            </div>)
-          }
-        },
         pageProps: {
           current: 1,
           pageSize: 10,
@@ -105,6 +92,7 @@ export default {
     this.initData()
   },
   methods: {
+    FormatRowDateTimeStr,
     initData() {
       this.$refs.instance.refresh()
     },
@@ -124,6 +112,12 @@ export default {
       } catch (e) {
         console.error(e)
       }
+    },
+    onTableEditClick(row) {
+      console.log('编辑', row)
+    },
+    onTableDeleteClick(row) {
+      console.log('删除', row)
     }
   }
 }
diff --git a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue
index 462ef548..61fef303 100644
--- a/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue
+++ b/cutejava-front/src/views/componentsDemo/CuteSimpleTableDemo.vue
@@ -28,8 +28,6 @@
     <!-- params-transform: 组装查询参数 -->
     <!-- responseTransform: 组装表格对象。对响应结果做处理 -->
     <!-- primary-key: 主键 -->
-    <!-- columns: 表格列 -->
-    <!-- operate-column: 表格操作列 -->
     <!-- mode: 模式。不传默认，传multi为多选 -->
     <!-- @selection-change: 当且仅当mode为multi时启用 -->
     <cute-simple-table
@@ -37,10 +35,21 @@
       :fetch="curd.fetch"
       :params-transform="curd.paramsTransform"
       primary-key="id"
-      :columns="curd.columns"
-      :operate-column="curd.operateColumn"
       :page-props="curd.pageProps"
-    />
+    >
+      <el-table-column prop="name" label="名称" />
+      <el-table-column prop="description" label="描述" />
+      <el-table-column prop="createTime" label="创建时间" :formatter="FormatRowDateTimeStr" />
+      <el-table-column prop="createBy" label="创建人" />
+      <el-table-column label="操作" width="150" min-width="150" fixed="right">
+        <template slot-scope="scope">
+          <div>
+            <el-button type="text" @click="onTableEditClick(scope.row)">编辑</el-button>
+            <el-button type="text" @click="onTableDeleteClick(scope.row)">删除</el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </cute-simple-table>
     <cute-form-dialog ref="dialogForm" :model="createFormModel" :rules="createFormRules" title="演示:表单对话框" @submit="onDialogFormSubmit">
       <el-form-item label="活动名称" prop="name" label-width="100px">
         <el-input v-model="createFormModel.name" placeholder="请输入" style="width: 100%" />
@@ -145,6 +154,7 @@ export default {
     this.initData()
   },
   methods: {
+    FormatRowDateTimeStr,
     initData() {
       this.$refs.instance.refresh()
     },
@@ -176,6 +186,12 @@ export default {
     },
     onDrawerFormSubmit(values) {
       console.log('onDrawerFormSubmit', values)
+    },
+    onTableEditClick(row) {
+      console.log('编辑', row)
+    },
+    onTableDeleteClick(row) {
+      console.log('删除', row)
     }
   }
 }