dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10478 from dataease/pr@v2.7@fix_sync_menu

Browse Source 
fix(X-Pack): 同步管理菜单无法展示
This commit is contained in:
fit2cloud-chenyw 2024-06-24 18:10:38 +08:00 committed by GitHub
commit 8f0b910c1d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
View File

@ -87,12 +87,12 @@ public class MenuManage {
}
private boolean isXpackMenu(CoreMenu coreMenu) {
if (coreMenu.getId().equals(21L)) return false;
return coreMenu.getId().equals(7L)
|| coreMenu.getPid().equals(7L)
|| coreMenu.getId().equals(14L)
|| coreMenu.getId().equals(17L)
|| coreMenu.getId().equals(18L)
|| coreMenu.getId().equals(21L)
|| coreMenu.getPid().equals(21L)
|| coreMenu.getId().equals(25L)
|| coreMenu.getId().equals(26L)

7
core/core-frontend/src/layout/components/LayoutTransition.vue Normal file
View File

@ -0,0 +1,7 @@
<script lang="ts" setup>
import { useRoute } from 'vue-router'
const route = useRoute()
</script>
<template>
<router-view :key="route.path" />
</template>

5
core/core-frontend/src/router/establish.ts
View File

@ -3,6 +3,7 @@ import { cloneDeep } from 'lodash'
import { XpackComponent } from '@/components/plugin'
const modules = import.meta.glob('../views/**/*.vue')
export const Layout = () => import('@/layout/index.vue')
export const LayoutTransition = () => import('@/layout/components/LayoutTransition.vue')
const pluginComponent = 'components/plugin'
// 后端控制路由生成
export const generateRoutesFn2 = (routes: AppCustomRouteRecordRaw[]): AppRouteRecordRaw[] => {
@ -37,12 +38,14 @@ export const generateRoutesFn2 = (routes: AppCustomRouteRecordRaw[]): AppRouteRe
let comModule = null
if (route.component === pluginComponent) {
comModule = XpackComponent
} else {
} else if (!route.component.startsWith('Layout')) {
comModule = modules[`../views/${route.component}/index.vue`]
}
if (route.component === 'Layout') {
data.component = Layout
} else if (route.component === 'LayoutTransition') {
data.component = LayoutTransition
} else if (!comModule) {
} else {
data.component = comModule

2
de-xpack

@ -1 +1 @@
Subproject commit a12eea394d8d5edf2941988819b08676e512a11e
Subproject commit 220e68e53d135ba8bd7bb55baa6a6071f301b20f