From fdd689daf5cf4c2083e6160d932d70e91bad46e1 Mon Sep 17 00:00:00 2001
From: BirtYu <714851131@qq.com>
Date: 星期日, 13 四月 2025 22:51:38 +0800
Subject: [PATCH] Merge pull request #59 from zhitan-cloud/jiayu1.0
---
zhitan-vue/src/layout/index.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/zhitan-vue/src/layout/index.vue b/zhitan-vue/src/layout/index.vue
index 7cb8e3e..90aaa04 100644
--- a/zhitan-vue/src/layout/index.vue
+++ b/zhitan-vue/src/layout/index.vue
@@ -119,21 +119,26 @@
// 鐩戝惉璺敱鍙樺寲锛屽鐞嗛椤电殑渚ц竟鏍忔樉绀�
watchEffect(() => {
- // 妫�鏌ユ槸鍚︽槸棣栭〉璺敱
- if (route.path === '/index' || route.path === '/') {
+ // 妫�鏌ユ槸鍚︽槸棣栭〉璺敱锛屼絾鎺掗櫎/index/index瀛愯矾鐢�
+ if ((route.path === '/index' || route.path === '/') && route.path !== '/index/index') {
// 棣栭〉璺敱锛岀‘淇濅晶杈规爮涓嶉殣钘忥紝浣嗙姸鎬佹槸鎶樺彔鐨�
- appStore.showCollapsedSidebar()
+ appStore.toggleSideBarHide(false) // 鏀逛负涓嶉殣钘忎晶杈规爮
} else if (route.meta && route.meta.showSidebar === false) {
// 濡傛灉璺敱鏄庣‘鎸囧畾闅愯棌渚ц竟鏍�
appStore.toggleSideBarHide(true)
+ } else {
+ // 鍏朵粬璺敱锛岀‘淇濅晶杈规爮鍙
+ appStore.toggleSideBarHide(false)
}
})
// 缁勪欢鎸傝浇鏃讹紝纭繚棣栭〉渚ц竟鏍忕姸鎬佹纭�
onMounted(() => {
- // 濡傛灉褰撳墠鏄椤碉紝纭繚渚ц竟鏍忔槸鎶樺彔鐨勮�屼笉鏄殣钘忕殑
- if (route.path === '/index' || route.path === '/') {
- appStore.showCollapsedSidebar()
+ // 濡傛灉褰撳墠鏄椤靛瓙椤甸潰锛屽彧纭繚渚ц竟鏍忎笉琚殣钘忥紝浣嗕繚鎸佹姌鍙�/灞曞紑鐘舵�佷笉鍙�
+ if (route.path === '/index/index') {
+ // 鍙缃笉闅愯棌渚ц竟鏍忥紝浣嗕笉鏀瑰彉鍏跺睍寮�/鎶樺彔鐘舵��
+ appStore.toggleSideBarHide(false)
+ // 涓嶅啀寮哄埗璁剧疆opened涓簍rue锛屼繚鎸佺敤鎴蜂箣鍓嶇殑璁剧疆
}
})
@@ -306,13 +311,19 @@
top: 60px;
right: 0;
z-index: 9;
- width: 100%;
+ width: calc(100% - #{$base-sidebar-width});
transition: width 0.28s;
display: flex;
flex-direction: column;
+ box-sizing: border-box;
+ padding: 0;
}
.hideSidebar .fixed-header {
+ width: calc(100% - 54px);
+}
+
+.sidebarHide .fixed-header {
width: 100%;
}
--
Gitblit v1.9.3