From e969b3911f84af3a639dae97bbf29f8c58057772 Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Sat, 25 Mar 2023 10:04:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=9D=A2=E5=8C=85?=
 =?UTF-8?q?=E5=B1=91=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Layout/BasicLayoutPage.vue | 21 +++++++++++++++++++--
 yarn.lock                                 |  4 ++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue
index 598fa6e5..1b8af35d 100644
--- a/src/components/Layout/BasicLayoutPage.vue
+++ b/src/components/Layout/BasicLayoutPage.vue
@@ -11,7 +11,7 @@
         <template #breadcrumbRender="slotProps">
             <a
               v-if="slotProps.route.index !== 0 && !slotProps.route.isLast"
-              @click='() => jumpPage(slotProps.route.path)'
+              @click='jump(slotProps.route)'
             >
               {{ slotProps.route.breadcrumbName }}
             </a>
@@ -89,14 +89,31 @@ const findRouteMeta = (code: string) => {
   return meta
 }
 
-const jumpPage = (path: string) => {
+const jump = (item: any) => {
+  let path = history.state.back
+  if (path) {
+    // 包含query参数,清除？参数
+    if (path.includes('?')) {
+      const _path = path.split('?')[0]
+      path = _path === item.path ? path : item.path
+    } else if (path !== item.path) {
+      path = item.path
+    }
+  } else {
+    path = item.path
+  }
+
+  console.log(item, history.state)
   console.log(path)
+  // jumpPage(slotProps.route.path)
   router.push(path)
 }
 
 const breadcrumb = computed(() =>
   {
     const paths = router.currentRoute.value.name as string
+    console.log(router.currentRoute)
+    console.log(route)
     const metas = findRouteMeta(paths)
     return metas.map((item, index) => {
       return {
diff --git a/yarn.lock b/yarn.lock
index 4b1ffa39..71f83f16 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3700,8 +3700,8 @@ jetlinks-store@^0.0.3:
 
 jetlinks-ui-components@^1.0.5:
   version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#6dc396bc8a1b6f5a08accf5f46aec2099c15f481"
-  integrity sha512-mnVN6MfHfyZf82miEoZV8+ud6RBH29x0A8PfpcraFQUl9Wat6XcjGppr8FOkmFbGw8laCGK5jlbiX3cYJUwaxw==
+  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#5e233e915f41ec48c63c5633ef5768253cbe8ee0"
+  integrity sha512-7GzacUi+9c28SBWs9UyKL8IoVaT2nTdVQbmsmfdyhjaf6QpQpdLZpT1F5UQsmPtC4C3Hg88pb9R5wQkTJ+pcCw==
   dependencies:
     "@vueuse/core" "^9.12.0"
     ant-design-vue "^3.2.15"