From e85e43f601e0770ea3a5eb4a347069ebdf85b709 Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Thu, 22 Feb 2024 18:50:20 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3-=E5=9C=A8=E4=B8=8B?=
 =?UTF-8?q?=E6=8E=A2=E7=9A=84=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E6=96=87=E6=A1=A3=EF=BC=8C=E7=9B=AE=E5=89=8D=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E5=8F=AA=E8=83=BD=E5=85=B3=E8=81=94=E5=88=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=A1=B5=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1094874?=
 =?UTF-8?q?835681280]=E5=9C=A8=E7=BA=BF=E5=B8=AE=E5=8A=A9=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3-=E5=9C=A8=E4=B8=8B=E6=8E=A2=E7=9A=84=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E6=96=87=E6=A1=A3=E5=8F=AA=E8=83=BD?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E5=88=B0=E7=AE=A1=E7=90=86=E9=A1=B5=20http:/?=
 =?UTF-8?q?/192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93?=
 =?UTF-8?q?9050947543057/1094874835681280?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/term/en.json   |  4 +-
 src/resources/assets/languages/term/zh.json   |  4 +-
 src/resources/plugins/TsForm/TsFormTree.vue   |  5 +-
 .../directory/directory-manage.vue            | 10 +++
 .../directory/directory-tree.vue              | 62 +++++++++++--------
 5 files changed, 54 insertions(+), 31 deletions(-)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index 2d46ff5f..d5844e6e 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -2570,7 +2570,9 @@
     "selectoneresource": "Please select at least one resource",
     "noaddauthresource": "There are currently no resources to add permissions to",
     "relcurrclass": "Associate with current classification",
-    "unlassifieddoc": "Unclassified documents"
+    "unlassifieddoc": "Unclassified documents",
+    "representmenupage": "Represent menu page",
+    "representsubpages": "Represent Subpages"
   },
   "dr": {
     "assetconfig": "Asset allocation",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index e858c49f..6493f579 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -2568,7 +2568,9 @@
     "whathelp": "请问有什么能帮到您？",
     "problemdes": "问题描述",
     "relcurrclass": "关联当前分类",
-    "unlassifieddoc": "未分类文档"
+    "unlassifieddoc": "未分类文档",
+    "representmenupage": "表示菜单页面",
+    "representsubpages": "表示子页面"
   },
   "dr": {
     "assetconfig": "资产配置",
diff --git a/src/resources/plugins/TsForm/TsFormTree.vue b/src/resources/plugins/TsForm/TsFormTree.vue
index fe3b7ad2..7dc68313 100755
--- a/src/resources/plugins/TsForm/TsFormTree.vue
+++ b/src/resources/plugins/TsForm/TsFormTree.vue
@@ -366,10 +366,7 @@ export default {
     renderContent: function(h, { root, node, data }) {
       let _this = this;
       return h('span', {
-        class: {
-          // 'select-li': true,
-          // 'selected': data.selected
-        },
+        class: data.className,
         props: {
           data: data
         },
diff --git a/src/views/pages/documentonline/directory/directory-manage.vue b/src/views/pages/documentonline/directory/directory-manage.vue
index fb2e0733..8a266d96 100644
--- a/src/views/pages/documentonline/directory/directory-manage.vue
+++ b/src/views/pages/documentonline/directory/directory-manage.vue
@@ -17,6 +17,16 @@
         </div>
       </template>
       <template v-slot:sider>
+        <Alert show-icon style="width: 204px;">
+          <div>
+            <span class="tsfont-bar icon-right"></span>
+            <span>{{ $t('term.documentonline.representmenupage') }} </span>
+          </div>
+          <div>
+            <span class="tsfont-ITfuwu icon-right"></span>
+            <span>{{ $t('term.documentonline.representsubpages') }}</span>
+          </div>
+        </Alert>
         <DirectoryTree
           ref="directoryTree"
           :isFile="isFile"
diff --git a/src/views/pages/documentonline/directory/directory-tree.vue b/src/views/pages/documentonline/directory/directory-tree.vue
index af180445..6cb89bd9 100644
--- a/src/views/pages/documentonline/directory/directory-tree.vue
+++ b/src/views/pages/documentonline/directory/directory-tree.vue
@@ -30,7 +30,8 @@ export default {
       routerConfig: {},
       classifiedList: [],
       currentValue: {},
-      fileIndex: null
+      fileIndex: null,
+      whiteList: ['welcome', 'no-authority', 'refresh']
     };
   },
   beforeCreate() {},
@@ -81,29 +82,40 @@ export default {
       this.$emit('selectTreeNode', this.moduleMenuList[0]);
       this.getClassifiedList(moduleList);
     },
+    getIsMenu(m, name) {
+      let findItem = this.routerConfig[m.group] && this.routerConfig[m.group].find((v) => v.name == name);
+      return findItem && findItem.ismenu ? 'tsfont-bar icon-right' : 'tsfont-ITfuwu icon-right';
+    },
     getRouterConfig() {
-      const requireRouter = require.context('@/views/pages', true, /router.js$/);
-      return requireRouter.keys().reduce((routerConfig, routerPath) => {
-        const moduleId = routerPath.split('/')[1];
-        const routeList = requireRouter(routerPath).default || [];
-        let menuList = [];
-        if (routeList && routeList.length) {
-          routeList.forEach(item => {
-            if (item.meta && item.meta.ismenu) {
-              menuList.push({
-                name: item.meta.title,
-                moduleGroup: moduleId,
-                menu: item.name,
-                configFathList: [moduleId, item.name],
-                children: [],
-                loading: false
-              });
-            }
-          });
-        }
-        routerConfig[moduleId] = menuList;
-        return routerConfig;
-      }, {});
+      const configPathList = [  
+        require.context('@/views/pages', true, /router.js$/),  
+        require.context('@/commercial-module', true, /router.js$/)  
+      ];  
+      const routerConfigs = {};  
+      configPathList.forEach(requireRouter => {  
+        const routerKeys = requireRouter.keys();
+        routerKeys.forEach(routerPath => {  
+          const moduleId = routerPath.split('/')[1];  
+          const routeList = requireRouter(routerPath).default || [];  
+  
+          const menuList = routeList  
+            .filter(item => item.name && item.meta && item.meta.title && !this.whiteList.includes(item.name))  
+            .map(item => ({  
+              name: item.meta && item.meta.title ? (item.name ? `${item.meta.title}(${item.name})` : item.meta.title) : '',  
+              moduleGroup: moduleId,  
+              menu: item.name,  
+              configFathList: [moduleId, item.name],  
+              children: [],  
+              loading: false,
+              ismenu: item.meta?.ismenu || false
+            }));  
+  
+          if (menuList.length) {  
+            routerConfigs[moduleId] = menuList;  
+          }  
+        });  
+      });  
+      return routerConfigs;
     },
     getClassifiedList(moduleList) {
       this.classifiedList = [];
@@ -118,7 +130,7 @@ export default {
           if (m.group && this.routerConfig[m.group]) {
             module.children = this.routerConfig[m.group].map(item => {
               const { name, moduleGroup, menu, configFathList } = item;
-              const config = { name, moduleGroup, menu, configFath: configFathList.join('/') };
+              const config = { name, moduleGroup, menu, configFath: configFathList.join('/'), className: this.getIsMenu(m, name) };
               return config;
             });
           }
@@ -130,7 +142,7 @@ export default {
     renderContent(h, { root, node, data }) {
       //渲染树的lable名称
       return h('span', {
-        class: data.isFile ? 'tsfont-file-single' : data.nodata ? 'text-tip' : '',
+        class: data.isFile ? 'tsfont-file-single icon-right' : (data.ismenu ? 'tsfont-bar icon-right' : (data.ismenu == false ? 'tsfont-ITfuwu icon-right' : (data.nodata ? 'text-tip' : ''))),
         domProps: {
           innerHTML: this.$t(data.name)
         }
-- 
Gitee