diff --git a/core/core-backend/pom.xml b/core/core-backend/pom.xml
index f648cd5038..1b5596c1d3 100644
--- a/core/core-backend/pom.xml
+++ b/core/core-backend/pom.xml
@@ -148,6 +148,23 @@
flexmark-all
${flexmark.version}
+
+
+ io.dataease
+ xpack-permissions
+ ${project.version}
+
+
+ io.dataease
+ xpack-sync
+ ${project.version}
+
+
+ io.dataease
+ xpack-base
+ ${project.version}
+
+
diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
index 5245e80cec..3319213d2f 100644
--- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
+++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
@@ -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)
diff --git a/core/core-frontend/src/layout/components/LayoutTransition.vue b/core/core-frontend/src/layout/components/LayoutTransition.vue
new file mode 100644
index 0000000000..594a48b0ad
--- /dev/null
+++ b/core/core-frontend/src/layout/components/LayoutTransition.vue
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/core/core-frontend/src/router/establish.ts b/core/core-frontend/src/router/establish.ts
index 271dc4f375..c7e5023466 100644
--- a/core/core-frontend/src/router/establish.ts
+++ b/core/core-frontend/src/router/establish.ts
@@ -4,6 +4,7 @@ import { XpackComponent } from '@/components/plugin'
const modules = import.meta.glob('../views/**/*.vue')
export const Layout = () => import('@/layout/index.vue')
const xpackComName = 'components/plugin'
+export const LayoutTransition = () => import('@/layout/components/LayoutTransition.vue')
// 后端控制路由生成
export const generateRoutesFn2 = (routes: AppCustomRouteRecordRaw[]): AppRouteRecordRaw[] => {
const res: AppRouteRecordRaw[] = []
@@ -37,12 +38,14 @@ export const generateRoutesFn2 = (routes: AppCustomRouteRecordRaw[]): AppRouteRe
let comModule = null
if (route.component === xpackComName) {
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
diff --git a/de-xpack b/de-xpack
index 178f8f5220..05e2378fc7 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 178f8f52209c1ffb81b58c8055733d411aef054a
+Subproject commit 05e2378fc74d5029527436d5965cf1d706223cd7