From 5a7035be4821e73c04ad835a861539f9808650db Mon Sep 17 00:00:00 2001
From: Halo Dev Bot <87291978+halo-dev-bot@users.noreply.github.com>
Date: Wed, 7 Dec 2022 14:44:53 +0800
Subject: [PATCH] [release-2.0] perf: optimize the issue of animation when
 switching setting tabs (#754)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is an automated cherry-pick of #748

/assign JohnNiang

```release-note
优化 Console 端的主题和插件详情页面切换选项卡时的页面闪动问题。
```
---
 src/modules/interface/themes/ThemeDetail.vue  |  2 +-
 src/modules/interface/themes/ThemeSetting.vue |  2 +-
 src/modules/system/plugins/PluginDetail.vue   |  2 +-
 src/modules/system/plugins/PluginSetting.vue  |  2 +-
 src/modules/system/settings/SystemSetting.vue | 53 +++++++++----------
 .../settings/layouts/SystemSettingsLayout.vue | 14 ++---
 6 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/src/modules/interface/themes/ThemeDetail.vue b/src/modules/interface/themes/ThemeDetail.vue
index be5fffd9..bcfcbe0a 100644
--- a/src/modules/interface/themes/ThemeDetail.vue
+++ b/src/modules/interface/themes/ThemeDetail.vue
@@ -55,7 +55,7 @@ const onUpgradeModalClose = () => {
 </script>
 
 <template>
-  <Transition appear mode="out-in" name="fade">
+  <Transition mode="out-in" name="fade">
     <div>
       <div class="bg-white px-4 py-4 sm:px-6">
         <div class="group flex items-center justify-between">
diff --git a/src/modules/interface/themes/ThemeSetting.vue b/src/modules/interface/themes/ThemeSetting.vue
index e94293e6..f1fd12b5 100644
--- a/src/modules/interface/themes/ThemeSetting.vue
+++ b/src/modules/interface/themes/ThemeSetting.vue
@@ -53,7 +53,7 @@ watch(
 );
 </script>
 <template>
-  <Transition appear mode="out-in" name="fade">
+  <Transition mode="out-in" name="fade">
     <div class="bg-white p-4">
       <div>
         <FormKit
diff --git a/src/modules/system/plugins/PluginDetail.vue b/src/modules/system/plugins/PluginDetail.vue
index 25153113..581471db 100644
--- a/src/modules/system/plugins/PluginDetail.vue
+++ b/src/modules/system/plugins/PluginDetail.vue
@@ -59,7 +59,7 @@ watchEffect(() => {
 </script>
 
 <template>
-  <Transition appear mode="out-in" name="fade">
+  <Transition mode="out-in" name="fade">
     <div>
       <div class="flex items-center justify-between bg-white px-4 py-4 sm:px-6">
         <div>
diff --git a/src/modules/system/plugins/PluginSetting.vue b/src/modules/system/plugins/PluginSetting.vue
index 62805277..a4a4287e 100644
--- a/src/modules/system/plugins/PluginSetting.vue
+++ b/src/modules/system/plugins/PluginSetting.vue
@@ -62,7 +62,7 @@ const handleFetchPlugin = async () => {
 await handleFetchPlugin();
 </script>
 <template>
-  <Transition appear mode="out-in" name="fade">
+  <Transition mode="out-in" name="fade">
     <div class="bg-white p-4">
       <div>
         <FormKit
diff --git a/src/modules/system/settings/SystemSetting.vue b/src/modules/system/settings/SystemSetting.vue
index 5220c3ac..29ef7a68 100644
--- a/src/modules/system/settings/SystemSetting.vue
+++ b/src/modules/system/settings/SystemSetting.vue
@@ -33,36 +33,31 @@ await handleFetchSettings();
 await handleFetchConfigMap();
 </script>
 <template>
-  <Transition appear mode="out-in" name="fade">
-    <div class="bg-white p-4">
-      <div>
-        <FormKit
-          v-if="group && formSchema && configMapFormData"
-          :id="group"
-          v-model="configMapFormData[group]"
-          :name="group"
-          :actions="false"
-          :preserve="true"
-          type="form"
-          @submit="handleSaveConfigMap"
+  <div class="bg-white p-4">
+    <div>
+      <FormKit
+        v-if="group && formSchema && configMapFormData"
+        :id="group"
+        v-model="configMapFormData[group]"
+        :name="group"
+        :actions="false"
+        :preserve="true"
+        type="form"
+        @submit="handleSaveConfigMap"
+      >
+        <FormKitSchema :schema="formSchema" :data="configMapFormData[group]" />
+      </FormKit>
+    </div>
+    <div v-permission="['system:configmaps:manage']" class="pt-5">
+      <div class="flex justify-start">
+        <VButton
+          :loading="saving"
+          type="secondary"
+          @click="$formkit.submit(group || '')"
         >
-          <FormKitSchema
-            :schema="formSchema"
-            :data="configMapFormData[group]"
-          />
-        </FormKit>
-      </div>
-      <div v-permission="['system:configmaps:manage']" class="pt-5">
-        <div class="flex justify-start">
-          <VButton
-            :loading="saving"
-            type="secondary"
-            @click="$formkit.submit(group || '')"
-          >
-            保存
-          </VButton>
-        </div>
+          保存
+        </VButton>
       </div>
     </div>
-  </Transition>
+  </div>
 </template>
diff --git a/src/modules/system/settings/layouts/SystemSettingsLayout.vue b/src/modules/system/settings/layouts/SystemSettingsLayout.vue
index 479cc410..9ed0f8b3 100644
--- a/src/modules/system/settings/layouts/SystemSettingsLayout.vue
+++ b/src/modules/system/settings/layouts/SystemSettingsLayout.vue
@@ -113,12 +113,14 @@ watch([() => route.name, () => route.params], async () => {
       <div class="bg-white">
         <RouterView :key="activeTab" v-slot="{ Component }">
           <template v-if="Component">
-            <Suspense>
-              <component :is="Component"></component>
-              <template #fallback>
-                <VLoading />
-              </template>
-            </Suspense>
+            <Transition appear mode="out-in" name="fade">
+              <Suspense>
+                <component :is="Component"></component>
+                <template #fallback>
+                  <VLoading />
+                </template>
+              </Suspense>
+            </Transition>
           </template>
         </RouterView>
       </div>