From 34cd1990f58d7635c97167563eb3352f3d95ae6e Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 24 Jun 2024 18:09:06 +0800
Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E5=90=8C=E6=AD=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=8F=9C=E5=8D=95=E6=97=A0=E6=B3=95=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/menu/manage/MenuManage.java  | 2 +-
 .../src/layout/components/LayoutTransition.vue             | 7 +++++++
 core/core-frontend/src/router/establish.ts                 | 5 ++++-
 de-xpack                                                   | 2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 core/core-frontend/src/layout/components/LayoutTransition.vue

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 c0c11a81f2..bef90729f3 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 @@
+<script lang="ts" setup>
+import { useRoute } from 'vue-router'
+const route = useRoute()
+</script>
+<template>
+  <router-view :key="route.path" />
+</template>
diff --git a/core/core-frontend/src/router/establish.ts b/core/core-frontend/src/router/establish.ts
index 8d1916aedf..e2bb00e581 100644
--- a/core/core-frontend/src/router/establish.ts
+++ b/core/core-frontend/src/router/establish.ts
@@ -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
diff --git a/de-xpack b/de-xpack
index a12eea394d..220e68e53d 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit a12eea394d8d5edf2941988819b08676e512a11e
+Subproject commit 220e68e53d135ba8bd7bb55baa6a6071f301b20f