From 68b27795ae929f5300fc6fb301b31aada74a2e2f Mon Sep 17 00:00:00 2001
From: zhangback <zhangback@163.com>
Date: 星期二, 10 三月 2026 15:26:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 ui/admin-ui3/src/layout/components/AppMain.vue |   35 ++++++++++++++++++++++-------------
 1 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/ui/admin-ui3/src/layout/components/AppMain.vue b/ui/admin-ui3/src/layout/components/AppMain.vue
index 5084572..e62169e 100644
--- a/ui/admin-ui3/src/layout/components/AppMain.vue
+++ b/ui/admin-ui3/src/layout/components/AppMain.vue
@@ -1,28 +1,37 @@
 <template>
   <section class="app-main">
     <router-view v-slot="{ Component, route }">
-      <transition >
-        <keep-alive :include="cachedViews">
-          <component :is="Component" :key="route.path" />
+<!--      <transition>-->
+  <!-- :include="cachedViews" -->
+        <keep-alive >
+          <component :is="Component" :key="route.fullPath" />
         </keep-alive>
-      </transition>
+<!--      </transition>-->
     </router-view>
   </section>
 </template>
 
-<script setup lang="ts">
-import {useRoute} from "vue-router";
-import {computed} from "vue";
-import {useTagsViewStore} from "@/store/modules/tagsView";
 
-let store = useTagsViewStore()
+<script setup lang="ts">
+import { computed, watch } from 'vue'
+import { useRoute } from 'vue-router'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+
+const store = useTagsViewStore()
 const route = useRoute()
-store.addCachedView(route)
-const cachedViews = computed(() => {
-    return store.cachedViews
-})
+
+watch(
+    () => route.name,
+    () => {
+      store.addCachedView(route)
+    },
+    { immediate: true }
+)
+
+const cachedViews = computed(() => store.cachedViews)
 </script>
 
+
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */

--
Gitblit v1.8.0