From 1a3090b7c6304760d1302a629f930ffa4b11c882 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw 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 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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 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 @@ + +