From 09c8c85c29e171463c1161e0d04ffad77600e88f Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Wed, 28 Feb 2024 15:37:52 +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-=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=85=B3=E7=B3=BB=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?IT=E6=9C=8D=E5=8A=A1=E7=9A=84=E5=8F=AF=E9=80=89=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9B=AE=E5=BD=95=E7=BC=BA=E5=A4=B1=20=20=20-=20[?=
 =?UTF-8?q?=E5=85=B3=E8=81=94]#[1101243743698944]=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E5=B8=AE=E5=8A=A9=E6=96=87=E6=A1=A3-=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=85=B3=E7=B3=BB=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?IT=E6=9C=8D=E5=8A=A1=E7=9A=84=E5=8F=AF=E9=80=89=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E7=9B=AE=E5=BD=95=E7=BC=BA=E5=A4=B1=20http://192.168.?=
 =?UTF-8?q?0.96:8090/demo/rdm.html#/bug-detail/939050947543040/93905094754?=
 =?UTF-8?q?3057/1101243743698944=20-=20[=E4=BF=AE=E5=A4=8D]=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BEdemo=E6=96=87=E4=BB=B6title=E5=A4=9A=E8=AF=AD?=
 =?UTF-8?q?=E8=A8=80=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E6=88=90=E6=B5=81=E7=A8=8B=E5=9B=BEdemo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../directory/directory-tree.vue              | 51 +++++++++----------
 src/views/pages/process/router.js             |  2 +-
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/views/pages/documentonline/directory/directory-tree.vue b/src/views/pages/documentonline/directory/directory-tree.vue
index 6cb89bd9..f046da67 100644
--- a/src/views/pages/documentonline/directory/directory-tree.vue
+++ b/src/views/pages/documentonline/directory/directory-tree.vue
@@ -87,34 +87,29 @@ export default {
       return findItem && findItem.ismenu ? 'tsfont-bar icon-right' : 'tsfont-ITfuwu icon-right';
     },
     getRouterConfig() {
-      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;  
-          }  
-        });  
-      });  
+      const routerConfig = require.context('@/views/pages', true, /router.js$/);
+      const commercialConfig = require.context('@/commercial-module', true, /router.js$/);
+      const routerConfigs = {}; 
+      const routerConfigKeys = routerConfig.keys();
+      const commercialConfigKeys = commercialConfig.keys() || [];
+      routerConfigKeys.forEach(routerPath => {
+        const moduleId = routerPath.split('/')[1];
+        const routeList = (!this.$utils.isEmpty(commercialConfigKeys) && commercialConfigKeys.indexOf(routerPath) != -1) ? [...routerConfig(routerPath).default, ...commercialConfig[routerPath].default] : (routerConfig(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) {
diff --git a/src/views/pages/process/router.js b/src/views/pages/process/router.js
index 7ab8a7eb..bfd1065f 100644
--- a/src/views/pages/process/router.js
+++ b/src/views/pages/process/router.js
@@ -333,7 +333,7 @@ let routerList = [
     name: 'flow-demo',
     component: flowDemo,
     meta: {
-      title: $t('touter.process.flowdemo'),
+      title: '流程图demo',
       ismenu: false
     }
   },
-- 
Gitee