From ee6f8c315926a871f11a96a69702efcef4d0b49f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 26 五月 2025 13:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/components/Breadcrumb/index.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 1567961..eb5df96 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -28,7 +28,7 @@
if (index !== 0) item = item.slice(1)
return item
})
- getMatched(pathList, permissionStore.sidebarRouters, matched)
+ getMatched(pathList, permissionStore.defaultRoutes, matched)
} else {
matched = route.matched.filter((item) => item.meta && item.meta.title)
}
@@ -48,11 +48,13 @@
return num
}
function getMatched(pathList, routeList, matched) {
- let data = routeList.find((item) => item.path == pathList[0])
- matched.push(data)
- if (data.children && pathList.length) {
- pathList.shift()
- getMatched(pathList, data.children, matched)
+ let data = routeList.find(item => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0])
+ if (data) {
+ matched.push(data)
+ if (data.children && pathList.length) {
+ pathList.shift()
+ getMatched(pathList, data.children, matched)
+ }
}
}
function isDashboard(route) {
--
Gitblit v1.9.3