diff --git a/src/views/pages/documentonline/directory/directory-tree.vue b/src/views/pages/documentonline/directory/directory-tree.vue index 6cb89bd9699b9ee77942939bb8e8fecefe20f385..f046da678c78df723fa5640acc774ca7a0a540cb 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 7ab8a7eb933e5b8df79dabee0faace485ce2b5ac..bfd1065faa853cb6309e566ec3c708b791922674 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 } },