From 1e7ba0656076b180466d2f0d1963f9ae3b35d160 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Thu, 20 Jun 2024 17:36:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=9A=90=E8=97=8F=E5=91=BD=E4=B8=AD?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/layout/components/breadcrumb/index.vue    |  6 ++++--
 ui/src/layout/components/sidebar/SidebarItem.vue | 15 +++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ui/src/layout/components/breadcrumb/index.vue b/ui/src/layout/components/breadcrumb/index.vue
index 1f529ee39..aaf6924b7 100644
--- a/ui/src/layout/components/breadcrumb/index.vue
+++ b/ui/src/layout/components/breadcrumb/index.vue
@@ -161,8 +161,10 @@ function changeMenu(id: string) {
       router.push({ name: lastMatched.name, params: { id: id } })
     } else if (isApplication.value) {
       const type = list.value?.filter((v) => v.id === id)?.[0]?.type
-      if (lastMatched.name === 'AppSetting' && type === 'WORK_FLOW') {
-        router.push({ path: `/application/${id}/${type}/overview` })
+      if (type === 'WORK_FLOW') {
+        if (lastMatched.name === 'AppSetting' || lastMatched.name === 'AppHitTest') {
+          router.push({ path: `/application/${id}/${type}/overview` })
+        }
       } else {
         router.push({
           name: lastMatched.name,
diff --git a/ui/src/layout/components/sidebar/SidebarItem.vue b/ui/src/layout/components/sidebar/SidebarItem.vue
index 4e2a7e1ab..443bcb2aa 100644
--- a/ui/src/layout/components/sidebar/SidebarItem.vue
+++ b/ui/src/layout/components/sidebar/SidebarItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="!menu.meta || !menu.meta.hidden" class="sidebar-item">
+  <div v-if="(!menu.meta || !menu.meta.hidden) && showMenu()" class="sidebar-item">
     <el-menu-item
       ref="subMenu"
       :index="menu.path"
@@ -23,15 +23,22 @@ const props = defineProps<{
   activeMenu: any
 }>()
 
-const route = useRoute()
-
 const router = useRouter()
+const route = useRoute()
 const {
   params: { id, type }
 } = route as any
 
+function showMenu() {
+  if (type === 'WORK_FLOW') {
+    return props.menu.name !== 'AppHitTest'
+  } else {
+    return true
+  }
+}
+
 function clickHandle(item: any) {
-  if (item.name === 'AppSetting' && type === 'WORK_FLOW') {
+  if (type === 'WORK_FLOW' && item.name === 'AppSetting') {
     router.push({ path: `/application/${id}/workflow` })
   }
 }