From d5b4ba69b23442d6b37082421150c87cc50e034a Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Thu, 6 Feb 2025 09:59:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A1=A5=E4=B8=AD=E6=96=87=20=20=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]#[1295644172451840]=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A1=A5=E4=B8=AD=E6=96=87=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1295644172451840?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/extramenu/extramenu-manage.vue  | 42 +++++++++++++++++--
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/views/pages/framework/extramenu/extramenu-manage.vue b/src/views/pages/framework/extramenu/extramenu-manage.vue
index 4b263da2e..2950c8fa2 100644
--- a/src/views/pages/framework/extramenu/extramenu-manage.vue
+++ b/src/views/pages/framework/extramenu/extramenu-manage.vue
@@ -43,6 +43,15 @@
               v-bind="tableConfig"
               :theadList="theadList"
             >
+              <template slot="authority" slot-scope="{ row }">
+                <div v-for="(item, index) in row.authorityList" :key="index" :class="index != row.authorityList.length - 1 ? 'mb-xs' : ''">
+                  <template v-if="item.displayName">
+                    <span>{{ item.displayName }}</span>
+                    <span class="text-grey">·</span>
+                  </template>
+                  <span v-if="item.name" class="text-grey">{{ item.name }}</span>
+                </div>
+              </template>
             </TsTable>
           </div>
           <template v-else>
@@ -162,7 +171,8 @@ export default {
       isMenu: 0, //0(目录)/1(菜单)
       catalogName: this.$t('dialog.title.edittarget', { target: this.$t('page.catalogue') }),
       parentId: null,
-      selectSaveId: null //是否存在，判断是否是新建
+      selectSaveId: null, //是否存在，判断是否是新建
+      authList: [] // 权限列表，用于根据权限名称去获取英文名
     };
   },
   beforeCreate() {},
@@ -182,6 +192,7 @@ export default {
   methods: {
     async init(isFirst) {
       try {
+        await this.getAuthList();
         await this.getTreeList(isFirst);
       } catch (error) {
         console.error(error);
@@ -192,6 +203,13 @@ export default {
       }
       this.getMenuTreeNode();
     },
+    getAuthList() {
+      return this.$api.framework.auth
+        .getAuthList()
+        .then(res => {
+          this.authList = res.Return || [];
+        });
+    },
     getTreeList(isFirst) {
       return this.$api.framework.extramenu.getMenuTreeList().then(res => {
         if (res.Status == 'OK') {
@@ -284,10 +302,12 @@ export default {
         childrenList.forEach((item) => {
           let findItem = moduleAuthList.find((v) => item.id.indexOf(v.name) > 0);
           if (findItem) {
+            let {authority = ''} = findItem || {};
             this.tableConfig.tbodyList.push({
               menuName: item.name,
               moduleName: node.moduleName,
-              authority: findItem.authority
+              authority: authority,
+              authorityList: this.getAuthorityName(authority)
             });
           }
         });
@@ -442,7 +462,7 @@ export default {
             title: item.meta.title,
             name: item.name,
             path: item.path,
-            authority: item.meta.authority ? (typeof item.meta.authority == 'string' ? item.meta.authority : (typeof item.meta.authority == 'object' ? item.meta.authority.join(',') : '')) : ''
+            authority: item.meta.authority
           }));
         if (menuList.length) {
           routerConfig[moduleId] = menuList;
@@ -475,7 +495,8 @@ export default {
                     moduleId: item.moduleId,
                     moduleName: item.moduleName,
                     menuName: n.name,
-                    authority: this.getMenuAuthority(item.moduleId, n.path)
+                    authority: this.getMenuAuthority(item.moduleId, n.path),
+                    authorityList: this.getAuthorityName(this.getMenuAuthority(item.moduleId, n.path))
                   });
                 }
               });
@@ -505,6 +526,19 @@ export default {
           ]
         }
       ];
+    },
+    getAuthorityName() {
+      return (authority) => {
+        if (typeof authority !== 'string' && !Array.isArray(authority)) {
+          return [];
+        }
+        const authItems = Array.isArray(authority) ? authority : [authority];
+        return authItems.map(item => {
+          const authItem = this.authList.find(v => v.name === item);
+          const { displayName = '', name = '' } = authItem || {};
+          return { displayName, name: name || item };
+        });
+      };
     }
   },
   watch: {}
-- 
Gitee


From 5859f98fcea0c70dfd5d7b27acb8dc27e548ce21 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Wed, 26 Mar 2025 17:42:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A1=A5=E4=B8=AD=E6=96=87=20=20=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]#[1295644172451840]=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A1=A5=E4=B8=AD=E6=96=87=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947?=
 =?UTF-8?q?543042/1295644172451840?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extramenu/authority-view-dialog.vue       | 62 +++++++++++++++++--
 .../framework/extramenu/extramenu-manage.vue  | 48 ++++++++++----
 2 files changed, 93 insertions(+), 17 deletions(-)

diff --git a/src/views/pages/framework/extramenu/authority-view-dialog.vue b/src/views/pages/framework/extramenu/authority-view-dialog.vue
index 07e97d3bc..9b607f019 100644
--- a/src/views/pages/framework/extramenu/authority-view-dialog.vue
+++ b/src/views/pages/framework/extramenu/authority-view-dialog.vue
@@ -36,6 +36,15 @@
                 :theadList="theadList"
                 :tbodyList="menuAuthList"
               >
+                <template slot="authority" slot-scope="{ row }">
+                  <div v-for="(item, index) in row.authorityList" :key="index" :class="index != row.authorityList.length - 1 ? 'mb-xs' : ''">
+                    <template v-if="item.displayName">
+                      <span>{{ item.displayName }}</span>
+                      <span class="text-grey">·</span>
+                    </template>
+                    <span v-if="item.name" class="text-grey">{{ item.name }}</span>
+                  </div>
+                </template>
               </TsTable>
             </div>
           </TsContain>
@@ -61,6 +70,7 @@ export default {
       routerConfig: {},
       moduleList: [],
       groupList: [],
+      authList: [],
       tableConfig: {
         currentPage: 1,
         pageSize: 20
@@ -86,6 +96,7 @@ export default {
   beforeMount() {},
   async mounted() {
     await this.searchModule();
+    await this.getAuthList();
     this.updateMenu();
     this.getRouterConfig();
   },
@@ -96,6 +107,22 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    getAuthList() {
+      return this.$api.common
+        .getAuthGrouplist()
+        .then(res => {
+          this.authList = [];
+          let { Status, Return } = res || {};
+          let {authGroupList = []} = Return || {};
+          if (Status == 'OK') {
+            authGroupList.forEach((item) => {
+              if (item && item.authVoList && item.authVoList.length > 0) {
+                this.authList.push(...(item.authVoList || []));
+              }
+            });
+          }
+        });
+    },
     updateMenu() {
       // 获取自定义菜单
       this.$store.dispatch('updateMenu');
@@ -135,8 +162,9 @@ export default {
             menuName: item.meta.title,
             menu: item.name,
             moduleName: '',
+            path: item.path,
             module: moduleId,
-            authority: item.meta.authority ? (typeof item.meta.authority == 'string' ? item.meta.authority : (typeof item.meta.authority == 'object' ? item.meta.authority.join(',') : '')) : ''
+            authority: item.meta.authority
           }));
         if (menuList.length) {
           routerConfig[moduleId] = menuList;
@@ -145,8 +173,20 @@ export default {
       this.routerConfig = routerConfig;
     },
     getMenuAuthority(moduleId, menu) {
-      let authorityItem = moduleId && this.routerConfig[moduleId] && this.routerConfig[moduleId].find((v) => menu.indexOf(v.menu) != -1);
-      return authorityItem && authorityItem.authority;
+      if (!moduleId || !this.routerConfig[moduleId] || menu === '/') {
+        return '';
+      }
+      let authList = this.routerConfig[moduleId] || [];
+      let findItem = authList.find((v) => {
+        if (menu && v.authority) {
+          if (v.path && menu.indexOf(v.path) != -1) {
+            return v;
+          } else if (v.menu && menu.indexOf(v.menu) != -1) {
+            return v;
+          }
+        }
+      });
+      return findItem ? findItem.authority : '';
     }
   },
   filter: {},
@@ -163,7 +203,8 @@ export default {
                     moduleId: item.moduleId,
                     moduleName: item.moduleName,
                     menuName: n.name,
-                    authority: this.getMenuAuthority(item.moduleId, n.path)
+                    authority: this.getMenuAuthority(item.moduleId, n.path),
+                    authorityList: this.getAuthorityName(this.getMenuAuthority(item.moduleId, n.path))
                   });
                 }
               });
@@ -188,6 +229,19 @@ export default {
         );
       }
       return menuAuthList;
+    },
+    getAuthorityName() {
+      return (authority) => {
+        if (typeof authority !== 'string' && !Array.isArray(authority)) {
+          return [];
+        }
+        const authItems = Array.isArray(authority) ? authority : [authority];
+        return authItems.map(authorityEnName => {
+          const authItem = this.authList.find(v => v.name && authorityEnName && v.name === authorityEnName);
+          let {displayName, name} = authItem || {};
+          return { displayName, name: name || authorityEnName };
+        });
+      };
     }
   },
   watch: {}
diff --git a/src/views/pages/framework/extramenu/extramenu-manage.vue b/src/views/pages/framework/extramenu/extramenu-manage.vue
index 68d7020bd..549199b13 100644
--- a/src/views/pages/framework/extramenu/extramenu-manage.vue
+++ b/src/views/pages/framework/extramenu/extramenu-manage.vue
@@ -177,12 +177,13 @@ export default {
   },
   beforeCreate() {},
   created() {
-    this.init(true);
-    this.updateMenu();
     this.routerAuth = this.handleRouterAuth();
   },
   beforeMount() {},
-  mounted() {},
+  mounted() {
+    this.init(true);
+    this.updateMenu();
+  },
   beforeUpdate() {},
   updated() {},
   activated() {},
@@ -204,10 +205,19 @@ export default {
       this.getMenuTreeNode();
     },
     getAuthList() {
-      return this.$api.framework.auth
-        .getAuthList()
+      return this.$api.common
+        .getAuthGrouplist()
         .then(res => {
-          this.authList = res.Return || [];
+          this.authList = [];
+          let { Status, Return } = res || {};
+          let {authGroupList = []} = Return || {};
+          if (Status == 'OK') {
+            authGroupList.forEach((item) => {
+              if (item && item.authVoList && item.authVoList.length > 0) {
+                this.authList.push(...(item.authVoList || []));
+              }
+            });
+          }
         });
     },
     getTreeList(isFirst) {
@@ -285,8 +295,20 @@ export default {
       }
     },
     getMenuAuthority(moduleId, menu) {
-      let authorityItem = moduleId && this.routerAuth[moduleId] && this.routerAuth[moduleId].find((v) => menu.indexOf(v.name) != -1);
-      return authorityItem && authorityItem.authority;
+      if (!moduleId || !this.routerAuth[moduleId] || menu === '/') {
+        return '';
+      }
+      let authList = this.routerAuth[moduleId] || [];
+      let findItem = authList.find((v) => {
+        if (menu && v.authority) {
+          if (v.path && menu.indexOf(v.path) != -1) {
+            return v;
+          } else if (v.name && menu.indexOf(v.name) != -1) {
+            return v;
+          }
+        }
+      });
+      return findItem ? findItem.authority : '';
     },
     handleMenuAuth(node) {
       this.menuType = 'innerMenu';
@@ -301,7 +323,7 @@ export default {
         let childrenList = this.flattenArrayWithChildren(this.$utils.deepClone(Array.isArray(node.children) && !this.$utils.isEmpty(node.children) ? node.children : [node]));
         let moduleAuthList = this.routerAuth[node.moduleId] && this.routerAuth[node.moduleId] || []; // 获取点击的模块菜单权限
         childrenList.forEach((item) => {
-          let findItem = moduleAuthList.find((v) => item.id.indexOf(v.name) > 0);
+          let findItem = moduleAuthList.find((v) => (item.id.indexOf(v.path) != -1) || item.id.indexOf(v.name) > 0);
           if (findItem) {
             let {authority = ''} = findItem || {};
             this.tableConfig.tbodyList.push({
@@ -534,10 +556,10 @@ export default {
           return [];
         }
         const authItems = Array.isArray(authority) ? authority : [authority];
-        return authItems.map(item => {
-          const authItem = this.authList.find(v => v.name === item);
-          const { displayName = '', name = '' } = authItem || {};
-          return { displayName, name: name || item };
+        return authItems.map(authorityEnName => {
+          const authItem = this.authList.find(v => v.name && authorityEnName && v.name === authorityEnName);
+          let {displayName, name} = authItem || {};
+          return { displayName, name: name || authorityEnName };
         });
       };
     }
-- 
Gitee