feat(table): 实现动态表格列配置功能

cutejava-front/src/views/components/advanced/CuteDynamicTable.vue

@@ -36,7 +36,26 @@
       @selection-change="onTableSelectionChange"
     >
       <el-table-column v-if="showSelect" type="selection" width="55" />
-      <slot />
+      <el-table-column
+        v-for="column in crud.columns"
+        :key="column.name"
+        :prop="column.name"
+        :label="column.title"
+        :width="column.width ? column.width : null"
+        :sortable="column.sortable === true ? `custom` : false"
+      >
+        <template v-slot="scope">
+          <div v-if="column.cell && column.cell instanceof Function">
+            {{ column.cell(scope.row[column.name], scope.$index, scope.row) }}
+          </div>
+          <div v-else>
+            {{ scope.row[column.name] }}
+          </div>
+        </template>
+      </el-table-column>
+      <!-- 通过  <template v-slot:operation> 插槽后置操作按钮 -->
+      <slot name="operation" />
+    </el-table>
     <el-pagination
       v-if="paging"
       :current-page="pageProps.current"
@@ -47,20 +66,15 @@
       @size-change="(size) => crud.onPageChange(pageProps.current, size, pageProps.total)"
       @current-change="(current) => crud.onPageChange(current, pageProps.pageSize, pageProps.total)"
     />
-    </el-table></div>
+  </div>
 </template>
 
 <script>
 import Sortable from 'sortablejs'
 
 export default {
-  name: 'CuteDragTable',
+  name: 'CuteDynamicTable',
   props: {
-    primaryKey: {
-      type: String,
-      required: true,
-      default: 'id'
-    },
     fetch: {
       type: Function,
       required: false,
@@ -102,8 +116,9 @@ export default {
     return {
       crud: {
         loading: false,
-        primaryKey: this.primaryKey ? this.primaryKey : 'id',
+        primaryKey: 'id',
         fetchUrl: null,
+        columns: [],
         dataSource: [],
         onPageChange: (currentPage, pageSize) => {
           this.pageProps.current = currentPage
@@ -126,7 +141,7 @@ export default {
   },
   methods: {
     refresh() {
-      this.crud.orderBy = ''
+      // this.crud.orderBy = null
       this.crud.selection = []
       this.initData()
       this.initDragTable()
@@ -144,21 +159,22 @@ export default {
       if (this.fetch) {
         try {
           this.crud.loading = true
-          // 请求远程数据
+          // 请求远程数据 { primaryKey: 'id', columns: [], totalElements: 0, content: []}
-          const response = await this.fetch(params)
+          let transformData = await this.fetch(params)
-          // console.error('response', response)
-          // { content: [], totalElements: 0 }
           // 转换为表格所需要的数据
           if (this.responseTransform) {
-            return this.responseTransform(response)
+            transformData = this.responseTransform(transformData)
+            if (!transformData.primaryKey) {
+              transformData.primaryKey = 'id'
             }
-          if (response && response.hasOwnProperty('totalElements') && response.hasOwnProperty('content')) {
-            this.pageProps.total = response.totalElements
-            this.crud.dataSource = response.content
           }
-          return response
+          // if (response && response.hasOwnProperty('totalElements') && response.hasOwnProperty('content')) {
+          this.pageProps.total = transformData.totalElements
+          this.crud.primaryKey = transformData.primaryKey
+          this.crud.columns = transformData.columns
+          this.crud.dataSource = transformData.content
         } catch (e) {
-          console.error('CuteDragTable请求远程数据异常', e)
+          console.error('CuteDynamicable请求远程数据异常', e)
           this.pageProps.total = 0
           this.crud.dataSource = []
         } finally {

cutejava-front/src/views/componentsDemo/advanced/CuteDynamicTableDemo.vue

@@ -3,7 +3,8 @@
     <h4>何时使用</h4>
     <ul class="description">
       <li>展示结构化数据列表，并支持排序、分页、拖拽排序</li>
-      <li>在使用过程中有任何问题，咨询 @Odboy（前端）</li>
+      <li>由后端统一返回前端所需的字段</li>
+      <li>在使用过程中有任何问题，咨询 @Odboy（前端）@Odboy（后端）</li>
     </ul>
     <h4>基础用法</h4>
     <!-- 表格渲染 -->
@@ -13,11 +14,17 @@
     <!-- showSelect: 是否多选。不传默认false，传true为多选 -->
     <!-- @selection-change: 当且仅当mode为multi时启用 -->
     <!-- @order-change: 当排序字段被单击，el-table-column 需添加 sortable="custom" 属性 -->
+    <cute-search-form :model="form" @search="handleSearch">
+      <template v-slot:suffix>
+        <el-form-item label="菜单标题" prop="blurry">
+          <el-input v-model="form.blurry" clearable />
+        </el-form-item>
+      </template>
+    </cute-search-form>
     <cute-dynamic-table
       ref="instance"
       :fetch="curd.fetch"
       :params-transform="curd.paramsTransform"
-      :page-props="curd.pageProps"
       show-select
     >
       <template v-slot:batchArea>
@@ -57,12 +64,12 @@
 <script>
 import FeatureCuteDynamicTableService from '@/api/features/cute-dynamic-table'
 import CuteButton from '@/views/components/dev/CuteButton.vue'
-import { FormatRowDateTimeStr } from '@/utils/KitUtil'
 import CuteDynamicTable from '@/views/components/advanced/CuteDynamicTable.vue'
+import CuteSearchForm from '@/views/components/advanced/CuteSearchForm.vue'
 
 export default {
   name: 'CuteDynamicTableDemo',
-  components: { CuteDynamicTable, CuteButton },
+  components: { CuteSearchForm, CuteDynamicTable, CuteButton },
   data() {
     return {
       form: {
@@ -81,17 +88,6 @@ export default {
         },
         fetch: async(queryParams) => {
           return FeatureCuteDynamicTableService.searchMenu(queryParams)
-        },
-        columns: [
-          { prop: 'name', label: '名称' },
-          { prop: 'description', label: '描述' },
-          { prop: 'createTime', label: '创建时间', formatter: FormatRowDateTimeStr },
-          { prop: 'createBy', label: '创建人' }
-        ],
-        pageProps: {
-          current: 1,
-          pageSize: 10,
-          total: 0
         }
       },
       apiData: [
@@ -117,10 +113,12 @@ export default {
     this.refreshData()
   },
   methods: {
-    FormatRowDateTimeStr,
     refreshData() {
       this.$refs.instance.refresh()
     },
+    handleSearch() {
+      this.$refs.instance.refresh()
+    },
     onTableEditClick(row) {
       console.log('编辑', row)
     },

cutejava/cutejava-module-system/src/main/java/cn/odboy/system/features/model/SystemMenuDynamicTableModel.java

@@ -28,11 +28,11 @@ public class SystemMenuDynamicTableModel extends KitObject {
   private Long id;
   @KitDynamicTableColumn(value = "菜单标题")
   private String title;
-  @KitDynamicTableColumn(value = "菜单组件名称")
+  @KitDynamicTableColumn(value = "菜单组件名称", width = 200)
   private String componentName;
   @KitDynamicTableColumn(value = "排序")
   private Integer menuSort = 999;
-  @KitDynamicTableColumn(value = "组件路径", width = 240)
+  @KitDynamicTableColumn(value = "组件路径", width = 200)
   private String component;
   @KitDynamicTableColumn(value = "路由地址", width = 120)
   private String path;
@@ -48,7 +48,7 @@ public class SystemMenuDynamicTableModel extends KitObject {
   private Boolean hidden;
   @KitDynamicTableColumn(value = "上级菜单")
   private Long pid;
-  @KitDynamicTableColumn(value = "子节点数目", sortable = true)
+  @KitDynamicTableColumn(value = "子节点数目", sortable = true, width = 200)
   private Integer subCount = 0;
   @KitDynamicTableColumn(value = "外链菜单")
   private Boolean iFrame;