From afdbaa81ccccfd684007839db0f78e34e7e802ff Mon Sep 17 00:00:00 2001
From: wanchun <445436867@qq.com>
Date: Wed, 28 Jun 2023 10:49:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dplugin-layout=E4=B8=AD?=
 =?UTF-8?q?body=E7=9A=84top=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/runtime/views/BaseLayout.vue          | 24 +++++++++++++------
 packages/fes-template/.fes.js                 |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
index cb9b6fac..513fc52e 100644
--- a/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
+++ b/packages/fes-plugin-layout/src/runtime/views/BaseLayout.vue
@@ -165,8 +165,8 @@
 </template>
 
 <script>
-import { ref, computed, onMounted } from 'vue';
-import { useRoute } from '@@/core/coreExports';
+import { ref, computed, watch, nextTick } from 'vue';
+import { useRoute, useRouter } from '@@/core/coreExports';
 import { FLayout, FAside, FMain, FFooter, FHeader } from '@fesjs/fes-design';
 import defaultLogo from '../assets/logo.png';
 import Menu from './Menu.vue';
@@ -235,6 +235,7 @@ export default {
         const headerHeightRef = ref(0);
         const collapsedRef = ref(false);
         const route = useRoute();
+        const router = useRouter();
 
         const currentNavigation = computed(() => {
             if (route.meta.layout && route.meta.layout.navigation !== undefined) {
@@ -250,11 +251,20 @@ export default {
             return props.isFixedSidebar ? { left } : null;
         });
 
-        onMounted(() => {
-            if (headerRef.value) {
-                headerHeightRef.value = headerRef.value.$el.offsetHeight;
-            }
-        });
+        watch(
+            router.currentRoute,
+            () => {
+                nextTick(() => {
+                    if (headerRef.value) {
+                        headerHeightRef.value = headerRef.value.$el.offsetHeight;
+                    }
+                });
+            },
+            {
+                immediate: true,
+            },
+        );
+
         return {
             headerRef,
             headerHeightRef,
diff --git a/packages/fes-template/.fes.js b/packages/fes-template/.fes.js
index 3c37a21f..9998b796 100644
--- a/packages/fes-template/.fes.js
+++ b/packages/fes-template/.fes.js
@@ -35,7 +35,7 @@ export default defineBuildConfig({
         title: 'Fes.js',
         footer: 'Created by MumbleFE',
         multiTabs: true,
-        navigation: 'side',
+        navigation: 'mixin',
         theme: 'dark',
         menus: [
             {