From 85b2aaaef8cc53d4522398a68ca1a5398a89bf9c Mon Sep 17 00:00:00 2001
From: birt <2499248221@qq.com>
Date: 星期一, 14 四月 2025 14:41:35 +0800
Subject: [PATCH] 123

---
 zhitan-vue/src/components/Breadcrumb/index.vue      |   19 +++++++--
 zhitan-vue/src/layout/components/TagsView/index.vue |   77 +++++++++++++++++++++++++-------------
 2 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/zhitan-vue/src/components/Breadcrumb/index.vue b/zhitan-vue/src/components/Breadcrumb/index.vue
index 6c873a0..4637888 100644
--- a/zhitan-vue/src/components/Breadcrumb/index.vue
+++ b/zhitan-vue/src/components/Breadcrumb/index.vue
@@ -19,20 +19,29 @@
   let matched = route.matched.filter(item => item.meta && item.meta.title);
   const first = matched[0]
   
-  // 涓嶈嚜鍔ㄦ坊鍔犻椤靛埌闈㈠寘灞戜腑
-  // if (!isDashboard(first)) {
-  //   matched = [{ path: '/index', meta: { title: '棣栭〉' } }].concat(matched)
-  // }
+  // 娣诲姞璋冭瘯鏃ュ織
+  console.log('Current route path:', route.path);
+  console.log('Route matched:', route.matched);
+  console.log('Filtered matched routes:', matched);
+  
+  // 濡傛灉鏄椤电湅鏉胯矾鐢憋紝纭繚瀹冭娣诲姞鍒伴潰鍖呭睉涓�
+  if (route.path === '/index' || route.path === '/index/index') {
+    matched = [{ path: '/index', meta: { title: '棣栭〉鐪嬫澘' } }].concat(matched)
+    console.log('Added index route to matched:', matched);
+  }
 
   levelList.value = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+  console.log('Final breadcrumb items:', levelList.value);
 }
+
 function isDashboard(route) {
   const name = route && route.name
   if (!name) {
     return false
   }
-  return name.trim() === 'Index'
+  return name.trim().toLowerCase() === 'index'
 }
+
 function handleLink(item) {
   const { redirect, path } = item
   if (redirect) {
diff --git a/zhitan-vue/src/layout/components/TagsView/index.vue b/zhitan-vue/src/layout/components/TagsView/index.vue
index 7688967..43e22ae 100644
--- a/zhitan-vue/src/layout/components/TagsView/index.vue
+++ b/zhitan-vue/src/layout/components/TagsView/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="tags-view-container" class="tags-view-container">
+  <div id="tags-view-container" class="tags-view-container" :class="{'theme-dark': sideTheme === 'theme-dark', 'theme-light': sideTheme === 'theme-light'}">
     <scroll-pane ref="scrollPaneRef" class="tags-view-wrapper" @scroll="handleScroll">
       <router-link
         v-for="tag in visitedViews"
@@ -52,6 +52,7 @@
 const visitedViews = computed(() => useTagsViewStore().visitedViews)
 const routes = computed(() => usePermissionStore().routes)
 const theme = computed(() => useSettingsStore().theme)
+const sideTheme = computed(() => useSettingsStore().sideTheme)
 
 watch(route, () => {
   addTags()
@@ -238,10 +239,36 @@
   margin-top: 10px;
   margin-left: 14px;
   box-sizing: border-box;
- // 娣诲姞姘村钩鍐呰竟璺濅笌app-main鐨勫唴杈硅窛涓�鑷�
- background: #0A3465;
- 
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  
+  &.theme-dark {
+    background: #0A3465;
+    .tags-view-item {
+      color: #fff;
+      background: #0c3f79;
+      border: 1px solid #0c4685;
+      
+      &.active {
+        background-color: var(--el-color-primary) !important;
+        color: #fff !important;
+      }
+    }
+  }
+  
+  &.theme-light {
+    background: #fff;
+    .tags-view-item {
+      color: #495060;
+      background: #fff;
+      border: 1px solid #d8dce5;
+      
+      &.active {
+        background-color: var(--el-color-primary) !important;
+        color: #fff !important;
+      }
+    }
+  }
+  
   .tags-view-wrapper {
     .tags-view-item {
       display: inline-block;
@@ -249,10 +276,8 @@
       cursor: pointer;
       height: 26px;
       line-height: 26px;
-      border: 1px solid #d8dce5;
-      color: #495060;
-      background: #fff;
-      padding: 0 8px;
+      border-radius: 3px;
+      padding: 0 10px;
       font-size: 12px;
       margin-left: 5px;
       margin-top: 4px;
@@ -278,25 +303,25 @@
         }
       }
     }
-    .contextmenu {
+  }
+  .contextmenu {
+    margin: 0;
+    background: #fff;
+    z-index: 3000;
+    position: absolute;
+    list-style-type: none;
+    padding: 5px 0;
+    border-radius: 4px;
+    font-size: 12px;
+    font-weight: 400;
+    color: #333;
+    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
+    li {
       margin: 0;
-      background: #fff;
-      z-index: 3000;
-      position: absolute;
-      list-style-type: none;
-      padding: 5px 0;
-      border-radius: 4px;
-      font-size: 12px;
-      font-weight: 400;
-      color: #333;
-      box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
-      li {
-        margin: 0;
-        padding: 7px 16px;
-        cursor: pointer;
-        &:hover {
-          background: #eee;
-        }
+      padding: 7px 16px;
+      cursor: pointer;
+      &:hover {
+        background: #eee;
       }
     }
   }

--
Gitblit v1.9.3