From 6cd9266b09f6ade63b3ee8785595331372701d65 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Tue, 16 May 2023 18:22:57 +0800
Subject: [PATCH] Added a new column in CommonTable

---
 ui/src/components/power/CommonTable.vue | 21 +++++++++++++++++----
 ui/src/pages/power/GroupManagement.vue  |  6 +++---
 ui/src/pages/power/RoleManagement.vue   |  6 +++---
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ui/src/components/power/CommonTable.vue b/ui/src/components/power/CommonTable.vue
index 5f9ccfa..cb527b7 100644
--- a/ui/src/components/power/CommonTable.vue
+++ b/ui/src/components/power/CommonTable.vue
@@ -8,14 +8,26 @@
         <el-table-column type="selection" />
         <el-table-column type="index" label="序号" />
         <el-table-column prop="name" label="名称" />
-        <el-table-column prop="menus" :label="customColumnLabel">
+        <el-table-column v-if="customColumnLabel_1" :label="customColumnLabel_1">
             <template #default="scope">
                 <el-tag
-                    v-if="!scope.row.customColumn || scope.row.customColumn.length === 0"
+                    v-if="!scope.row.customColumn_1 || scope.row.customColumn_1.length === 0"
                     type="info"
                     >无</el-tag
                 >
-                <el-tag v-for="(column, index) in scope.row.customColumn" :key="index">{{
+                <el-tag v-for="(column, index) in scope.row.customColumn_1" :key="index">{{
+                    column
+                }}</el-tag>
+            </template>
+        </el-table-column>
+        <el-table-column v-if="customColumnLabel_2" :label="customColumnLabel_2">
+            <template #default="scope">
+                <el-tag
+                    v-if="!scope.row.customColumn_2 || scope.row.customColumn_2.length === 0"
+                    type="info"
+                    >无</el-tag
+                >
+                <el-tag v-for="(column, index) in scope.row.customColumn_2" :key="index">{{
                     column
                 }}</el-tag>
             </template>
@@ -42,7 +54,8 @@ export default {
     props: {
         tableDate: Array,
         tableLoading: Boolean,
-        customColumnLabel: String
+        customColumnLabel_1: String,
+        customColumnLabel_2: String
     }
 }
 </script>
diff --git a/ui/src/pages/power/GroupManagement.vue b/ui/src/pages/power/GroupManagement.vue
index ca43691..a5318d2 100644
--- a/ui/src/pages/power/GroupManagement.vue
+++ b/ui/src/pages/power/GroupManagement.vue
@@ -19,7 +19,7 @@
         :table-loading="tableLoading"
         @onEdit="handleEdit"
         @onDelete="handleDelete"
-        customColumnLabel="角色"
+        custom-column-label_1="角色"
     />
     <el-dialog
         :title="dialogTitle"
@@ -104,10 +104,10 @@ export default {
                 if (response.code === DATABASE_SELECT_OK) {
                     const groups = response.data
                     for (const group of groups) {
-                        group.customColumn = []
+                        group.customColumn_1 = []
                         const roles = group.roles
                         for (const role of roles) {
-                            group.customColumn.push(role.name)
+                            group.customColumn_1.push(role.name)
                         }
                     }
                     this.groupTable = groups
diff --git a/ui/src/pages/power/RoleManagement.vue b/ui/src/pages/power/RoleManagement.vue
index b833f2b..95d4ac1 100644
--- a/ui/src/pages/power/RoleManagement.vue
+++ b/ui/src/pages/power/RoleManagement.vue
@@ -19,7 +19,7 @@
         :table-loading="tableLoading"
         @onEdit="handleEdit"
         @onDelete="handleDelete"
-        customColumnLabel="权限"
+        custom-column-label_1="权限"
     />
     <el-dialog
         :title="dialogTitle"
@@ -111,7 +111,7 @@ export default {
                 if (response.code === DATABASE_SELECT_OK) {
                     const roles = response.data
                     for (const role of roles) {
-                        role.customColumn = []
+                        role.customColumn_1 = []
                         const menus = role.menus
                         const elements = role.elements
                         const operations = role.operations
@@ -133,7 +133,7 @@ export default {
                             _.forEach(element.operations, (value) => {
                                 operas.push(value.name)
                             })
-                            role.customColumn.push(
+                            role.customColumn_1.push(
                                 `${menu.name}/${element.name}/${_.join(operas, ';')}`
                             )
                         }