From 8bfe0238b0a58e5c481d71a7c230ecb475701608 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Thu, 25 Jan 2024 17:29:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=9A=E4=B9=89=E7=9A=84=E6=9D=83=E9=99=90=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=20=20=20-=20[=E5=85=B3=E8=81=94]#[1076639939657728]?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=89=8D=E7=AB=AF=E5=AE=9A=E4=B9=89=E7=9A=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E8=A1=A8=E6=A0=BC=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/10766399396?=
 =?UTF-8?q?57728?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/page/en.json   |   3 +-
 src/resources/assets/languages/page/zh.json   |   3 +-
 .../extramenu/authority-view-dialog.vue       | 220 ++++++++++++++++++
 .../framework/extramenu/extramenu-manage.vue  |   9 +-
 4 files changed, 232 insertions(+), 3 deletions(-)
 create mode 100644 src/views/pages/framework/extramenu/authority-view-dialog.vue

diff --git a/src/resources/assets/languages/page/en.json b/src/resources/assets/languages/page/en.json
index 0cd9386d..28e3af7c 100644
--- a/src/resources/assets/languages/page/en.json
+++ b/src/resources/assets/languages/page/en.json
@@ -971,5 +971,6 @@
   "dragfilehere": "Please drag the attachment here",
   "clickanddragfile": "Click or drag to upload",
   "Initiate": "launch",
-  "opinions": "view"
+  "opinions": "view",
+  "menuname": "Menu Name"
 }
\ No newline at end of file
diff --git a/src/resources/assets/languages/page/zh.json b/src/resources/assets/languages/page/zh.json
index 7a3eb037..b59729ab 100644
--- a/src/resources/assets/languages/page/zh.json
+++ b/src/resources/assets/languages/page/zh.json
@@ -973,5 +973,6 @@
   "dragfilehere": "请拖拽附件到这里",
   "clickanddragfile": "点击或拖拽上传",
   "Initiate": "发起",
-  "opinions": "意见"
+  "opinions": "意见",
+  "menuname": "菜单名称"
 }
\ No newline at end of file
diff --git a/src/views/pages/framework/extramenu/authority-view-dialog.vue b/src/views/pages/framework/extramenu/authority-view-dialog.vue
new file mode 100644
index 00000000..977e938c
--- /dev/null
+++ b/src/views/pages/framework/extramenu/authority-view-dialog.vue
@@ -0,0 +1,220 @@
+<template>
+  <div>
+    <TsDialog
+      :title="$t('page.viewauthority')"
+      type="slider"
+      :isShow.sync="isShow"
+      :hasFooter="false"
+      :isScrollbar="true"
+      width="large"
+      @on-close="closeDialog"
+    >
+      <template v-slot>
+        <div>
+          <Loading :loadingShow="loadingShow" type="fix"></Loading>
+          <TsContain>
+            <template slot="topRight">
+              <TsRow>
+                <Col span="6">
+                  <TsFormSelect
+                    v-model="moduleName"
+                    :dataList="groupList"
+                    :placeholder="$t('form.placeholder.pleaseselect',{'target':$t('page.module')})"
+                    border="border"
+                    @change="changeGroup"
+                  ></TsFormSelect>
+                </Col>
+                <Col span="18">
+                  <InputSearcher
+                    v-model="keyword"
+                    :placeholder="$t('page.keyword')"
+                    @change="searchKeyword"
+                  ></InputSearcher>
+                </Col>
+              </TsRow>
+            </template>
+            <div slot="content">
+              <TsTable
+                v-bind="tableConfig"
+                :theadList="theadList"
+              >
+              </TsTable>
+            </div>
+          </TsContain>
+        </div>
+      </template>
+    </TsDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
+    InputSearcher: resolve => require(['@/resources/components/InputSearcher/InputSearcher.vue'], resolve),
+    TsTable: resolve => require(['@/resources/components/TsTable/TsTable.vue'], resolve)
+  },
+  props: {},
+  data() {
+    return {
+      loadingShow: false,
+      isShow: true,
+      moduleName: '',
+      keyword: '',
+      moduleList: [],
+      menuList: [],
+      groupList: [],
+      tableConfig: {
+        tbodyList: [],
+        currentPage: 1,
+        pageSize: 20
+      },
+      defaultTbodyList: [],
+      theadList: [
+        {
+          title: this.$t('page.menuname'),
+          key: 'menuName'
+        },
+        {
+          title: this.$t('term.framework.belongmodule'),
+          key: 'moduleName'
+        },
+        {
+          title: this.$t('page.authority'),
+          key: 'authority'
+        }
+      ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  async mounted() {
+    await this.searchModule();
+    this.getRouterConfig();
+  },
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    closeDialog() {
+      this.$emit('close');
+    },
+    searchModule() {
+      let data = {};
+      return this.$api.common.getAuthGroup(data).then(res => {
+        if (res.Status == 'OK') {
+          let groupList = res.Return.groupList;
+          this.groupList = groupList.filter((item) => item.value != 'all');
+        }
+      });
+    },
+    getRouterConfig() {
+      this.tableConfig.tbodyList = [];
+      let routerConfig = {};
+      let routerPathList = [require.context('@/views/pages', true, /router.js$/)];
+      routerPathList.forEach(item => {
+        if (item && item.keys()) {
+          item.keys().forEach(routerPath => {
+            const moduleNames = routerPath.split('/')[1];
+            const lastValue = moduleNames.split('-');
+            const moduleName = lastValue?.pop() || moduleNames;
+            const routeList = item(routerPath).default || [];
+            routerConfig[moduleName] = routeList;
+          });
+        }
+      });
+      let commercialRouterConfig = this.getCommercialRouter();
+      Object.keys(commercialRouterConfig).forEach(key => {
+        if (!routerConfig[key]) {
+          //模块引入
+          routerConfig[key] = commercialRouterConfig[key];
+        }
+      });
+      for (let key in routerConfig) {
+        if (key) {
+          routerConfig[key].forEach((item) => {
+            if (item.name && item.meta && item.meta.ismenu) {
+              this.tableConfig.tbodyList.push({
+                module: key,
+                moduleName: this.handleModuleName(key),
+                menuName: item.name ? (item.meta.title ? `${item.meta.title}(${item.name})` : item.name) : '',
+                authority: item.meta.authority
+              });
+            }
+          });
+        }
+      }
+      this.defaultTbodyList = this.tableConfig.tbodyList; 
+    },
+    getCommercialRouter() {
+      //商业版模块
+      let routerConfig = {};
+      let routerPathList = [];
+      try {
+        routerPathList.push(require.context('@/commercial-module', true, /router.js$/));
+      } catch {
+        // 模块找不到
+      }
+      routerPathList.forEach(item => {
+        if (item && item.keys()) {
+          item.keys().forEach(routerPath => {
+            const moduleNames = routerPath.split('/')[1];
+            const lastValue = moduleNames.split('-');
+            const moduleName = lastValue?.pop() || moduleNames;
+            const routeList = item(routerPath).default || [];
+            routerConfig[moduleName] = routeList;
+          });
+        }
+      });
+      return routerConfig;
+    },
+    changeGroup(groupName) {
+      this.tableConfig.tbodyList = this.$utils.deepClone(this.defaultTbodyList);
+      if (!this.$utils.isEmpty(groupName)) {
+        this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
+          item.module === groupName
+        );
+      } else if (!this.$utils.isEmpty(this.keyword)) {
+        this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
+          item.moduleName.indexOf(this.keyword) != -1 || item.menuName.indexOf(this.keyword) != -1 || item.authority.indexOf(this.keyword) != -1
+        );
+      }
+    },
+    handleModuleName(module) {
+      let moduleConfig = this.groupList.find((item) => item.value == module);
+      if (moduleConfig) {
+        return `${moduleConfig.text}(${moduleConfig.value})`;
+      }
+    },
+    searchKeyword(keyword) {
+      this.tableConfig.tbodyList = this.$utils.deepClone(this.defaultTbodyList);
+      if (!this.$utils.isEmpty(keyword)) {
+        if (this.moduleName) {
+          this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
+            item.moduleName.indexOf(this.moduleName) != -1 && (item.menuName.indexOf(keyword) != -1 || item.authority.indexOf(keyword) != -1) 
+          );
+        } else {
+          this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
+            item.moduleName.indexOf(keyword) != -1 || item.menuName.indexOf(keyword) != -1 || item.authority.indexOf(keyword) != -1
+          );
+        }
+      } else {
+        if (this.moduleName) {
+          this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
+            item.moduleName.indexOf(this.moduleName) != -1 
+          );
+        }
+      }
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/framework/extramenu/extramenu-manage.vue b/src/views/pages/framework/extramenu/extramenu-manage.vue
index 8ec63bbe..ffd9c3df 100644
--- a/src/views/pages/framework/extramenu/extramenu-manage.vue
+++ b/src/views/pages/framework/extramenu/extramenu-manage.vue
@@ -6,6 +6,7 @@
       </template>
       <template v-slot:topRight>
         <div class="action-group">
+          <span class="action-item tsfont-circulation-o" @click="openAuthorityViewDialog">{{ $t('page.viewauthority') }}</span>
           <span :class="{ disable: saving }" class="action-item tsfont-save" @click="save()">{{ $t('page.save') }}</span>
         </div>
       </template>
@@ -46,6 +47,7 @@
         </div>
       </template>
     </TsContain>
+    <AuthorityViewDialog v-if="isShowAuthorityViewDialog" @close="isShowAuthorityViewDialog = false"></AuthorityViewDialog>
   </div>
 </template>
 <script>
@@ -53,11 +55,13 @@ export default {
   name: '',
   components: {
     TsZtree: resolve => require(['@/resources/plugins/TsZtree/TsZtree.vue'], resolve),
-    MenuEdit: resolve => require(['./menu-edit'], resolve)
+    MenuEdit: resolve => require(['./menu-edit'], resolve),
+    AuthorityViewDialog: resolve => require(['./authority-view-dialog'], resolve)
   },
   props: {},
   data() {
     return {
+      isShowAuthorityViewDialog: false,
       loadingShow: true,
       saving: false,
       selectedTreeId: null,
@@ -282,6 +286,9 @@ export default {
       }).finally(() => {
         this.getTreeList();
       });
+    },
+    openAuthorityViewDialog() {
+      this.isShowAuthorityViewDialog = true;
     }
   },
   filter: {},
-- 
Gitee


From d51afa4bd9c8374d697755cd7e68642c295fba90 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Thu, 25 Jan 2024 17:50: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?=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=9A=E4=B9=89=E7=9A=84=E6=9D=83=E9=99=90=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1076639939657728?=
 =?UTF-8?q?]=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=89=8D=E7=AB=AF=E5=AE=9A=E4=B9=89=E7=9A=84?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A1=A8=E6=A0=BC=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/10?=
 =?UTF-8?q?76639939657728?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extramenu/authority-view-dialog.vue       | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/pages/framework/extramenu/authority-view-dialog.vue b/src/views/pages/framework/extramenu/authority-view-dialog.vue
index 977e938c..c2c37852 100644
--- a/src/views/pages/framework/extramenu/authority-view-dialog.vue
+++ b/src/views/pages/framework/extramenu/authority-view-dialog.vue
@@ -191,23 +191,23 @@ export default {
       }
     },
     searchKeyword(keyword) {
-      this.tableConfig.tbodyList = this.$utils.deepClone(this.defaultTbodyList);
-      if (!this.$utils.isEmpty(keyword)) {
-        if (this.moduleName) {
-          this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
-            item.moduleName.indexOf(this.moduleName) != -1 && (item.menuName.indexOf(keyword) != -1 || item.authority.indexOf(keyword) != -1) 
-          );
-        } else {
-          this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
-            item.moduleName.indexOf(keyword) != -1 || item.menuName.indexOf(keyword) != -1 || item.authority.indexOf(keyword) != -1
-          );
-        }
-      } else {
+      if (this.$utils.isEmpty(keyword)) {
+        this.tableConfig.tbodyList = this.$utils.deepClone(this.defaultTbodyList);
         if (this.moduleName) {
           this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
             item.moduleName.indexOf(this.moduleName) != -1 
           );
         }
+        return false;
+      }
+      if (this.moduleName) {
+        this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
+          item.moduleName.indexOf(this.moduleName) != -1 && (item.menuName.indexOf(keyword) != -1 || item.authority.indexOf(keyword) != -1) 
+        );
+      } else {
+        this.tableConfig.tbodyList = this.tableConfig.tbodyList.filter((item) => 
+          item.moduleName.indexOf(keyword) != -1 || item.menuName.indexOf(keyword) != -1 || item.authority.indexOf(keyword) != -1
+        );
       }
     }
   },
-- 
Gitee