From 14ea36481c536bc89e8cd434bd3fd8729cb71a87 Mon Sep 17 00:00:00 2001
From: maxbad <26058031@qq.com>
Date: Tue, 15 Aug 2023 11:14:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtransition=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E8=87=B4=E7=9A=84=E7=99=BD=E5=B1=8F(?=
 =?UTF-8?q?=E9=87=8D=E7=8E=B0:=20=E7=83=AD=E6=9B=B4=E6=96=B0transition?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E7=BB=84=E4=BB=B6script=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2tab=E5=8D=B3=E5=8F=AF)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/layout/components/Main/index.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/web/src/layout/components/Main/index.vue b/web/src/layout/components/Main/index.vue
index 996868b..4122a46 100644
--- a/web/src/layout/components/Main/index.vue
+++ b/web/src/layout/components/Main/index.vue
@@ -1,13 +1,20 @@
 <template>
   <RouterView>
     <template #default="{ Component, route }">
-      {{ retryKeepAlive(route) }}
-      <transition :name="getTransitionName" mode="out-in" appear>
-        <keep-alive v-if="keepAliveComponents" :include="keepAliveComponents">
+      <template v-if="mode === 'production'">
+        <transition :name="getTransitionName" mode="out-in" appear>
+          <keep-alive v-if="keepAliveComponents.length" :include="keepAliveComponents">
+            <component :is="Component" :key="route.fullPath" />
+          </keep-alive>
+          <component v-else :is="Component" :key="route.fullPath" />
+        </transition>
+      </template>
+      <template v-else>
+        <keep-alive v-if="keepAliveComponents.length" :include="keepAliveComponents">
           <component :is="Component" :key="route.fullPath" />
         </keep-alive>
         <component v-else :is="Component" :key="route.fullPath" />
-      </transition>
+      </template>
     </template>
   </RouterView>
 </template>
@@ -72,11 +79,12 @@
           }
         }
       }
-
+      const mode = import.meta.env.MODE;
       return {
         keepAliveComponents,
         getTransitionName,
         retryKeepAlive,
+        mode,
       };
     },
   });

From 71578ab6f5c53252b4bbf2a1042a75417f829483 Mon Sep 17 00:00:00 2001
From: maxbad <26058031@qq.com>
Date: Tue, 15 Aug 2023 16:12:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtransition=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E8=87=B4=E7=9A=84=E7=99=BD=E5=B1=8F(?=
 =?UTF-8?q?=E9=87=8D=E7=8E=B0:=20=E7=83=AD=E6=9B=B4=E6=96=B0transition?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E7=BB=84=E4=BB=B6script=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2tab=E5=8D=B3=E5=8F=AF)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/Form/src/BasicForm.vue | 2 +-
 web/src/layout/components/Main/index.vue  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/web/src/components/Form/src/BasicForm.vue b/web/src/components/Form/src/BasicForm.vue
index 5533228..1b2aada 100644
--- a/web/src/components/Form/src/BasicForm.vue
+++ b/web/src/components/Form/src/BasicForm.vue
@@ -136,7 +136,7 @@
   import { deepMerge } from '@/utils';
 
   export default defineComponent({
-    name: 'BasicUpload',
+    name: 'BasicForm',
     components: { DownOutlined, UpOutlined, QuestionCircleOutlined },
     props: {
       ...basicProps,
diff --git a/web/src/layout/components/Main/index.vue b/web/src/layout/components/Main/index.vue
index 4122a46..bee0b38 100644
--- a/web/src/layout/components/Main/index.vue
+++ b/web/src/layout/components/Main/index.vue
@@ -1,26 +1,27 @@
 <template>
   <RouterView>
     <template #default="{ Component, route }">
+      {{ retryKeepAlive(route) }}
       <template v-if="mode === 'production'">
-        <transition :name="getTransitionName" mode="out-in" appear>
+        <transition :name="getTransitionName" appear mode="out-in">
           <keep-alive v-if="keepAliveComponents.length" :include="keepAliveComponents">
             <component :is="Component" :key="route.fullPath" />
           </keep-alive>
-          <component v-else :is="Component" :key="route.fullPath" />
+          <component :is="Component" v-else :key="route.fullPath" />
         </transition>
       </template>
       <template v-else>
         <keep-alive v-if="keepAliveComponents.length" :include="keepAliveComponents">
           <component :is="Component" :key="route.fullPath" />
         </keep-alive>
-        <component v-else :is="Component" :key="route.fullPath" />
+        <component :is="Component" v-else :key="route.fullPath" />
       </template>
     </template>
   </RouterView>
 </template>
 
 <script>
-  import { defineComponent, computed, unref } from 'vue';
+  import { computed, defineComponent, unref } from 'vue';
   import { useAsyncRouteStore } from '@/store/modules/asyncRoute';
   import { useProjectSetting } from '@/hooks/setting/useProjectSetting';
   import { useRouter } from 'vue-router';