From 3cc53518c1d826bfe7f4fa754ae1f8585f50e330 Mon Sep 17 00:00:00 2001
From: Shikong <919411476@qq.com>
Date: Sun, 16 Jul 2023 01:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/wails/frontend/src/App.vue                         |  2 +-
 .../frontend/src/components/scaffold/TabScaffold.vue   | 10 +++++++---
 .../frontend/src/views/tabs/environment/index.vue      |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/wails/frontend/src/App.vue b/app/wails/frontend/src/App.vue
index fc8bab6..8cb5308 100644
--- a/app/wails/frontend/src/App.vue
+++ b/app/wails/frontend/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="mx-2">
+    <div class="mx-1">
         <el-config-provider v-bind="globalConfig">
             <router-view v-slot="{ Component, route  }">
                 <transition name="fade" mode="out-in">
diff --git a/app/wails/frontend/src/components/scaffold/TabScaffold.vue b/app/wails/frontend/src/components/scaffold/TabScaffold.vue
index 9f3d2fe..a902218 100644
--- a/app/wails/frontend/src/components/scaffold/TabScaffold.vue
+++ b/app/wails/frontend/src/components/scaffold/TabScaffold.vue
@@ -91,7 +91,6 @@ function tabRemove(name){
 
 <template>
     <el-tabs v-model="tab" @tab-change="tabChange" @tab-remove="tabRemove" style="height:100%" class="tab-scaffold">
-
             <el-tab-pane
                 v-for="item in tabs"
                 :key="item.name"
@@ -100,8 +99,13 @@ function tabRemove(name){
                 :name="item.name">
                 <router-view v-slot="{ Component, route  }">
                     <transition name="fade" mode="out-in">
-                        <el-scrollbar height="100%" class="scroll-bar">
-                            <div class="h-full">
+                        <el-scrollbar class="scroll-bar">
+                            <div class="h-full mx-1.5">
+                                <component v-if="route.meta.keepAlive != null && route.meta.keepAlive === false" :is="Component" :key="route.path"/>
+                                <keep-alive v-else>
+                                    <component :is="Component" :key="route.path"/>
+                                </keep-alive>
+
                                 <component v-if="route.meta.keepAlive != null && route.meta.keepAlive === false" :is="Component" :key="route.path"/>
                                 <keep-alive v-else>
                                     <component :is="Component" :key="route.path"/>
diff --git a/app/wails/frontend/src/views/tabs/environment/index.vue b/app/wails/frontend/src/views/tabs/environment/index.vue
index ff95e9d..792466e 100644
--- a/app/wails/frontend/src/views/tabs/environment/index.vue
+++ b/app/wails/frontend/src/views/tabs/environment/index.vue
@@ -40,7 +40,7 @@ GetAllEnv().then((data)=>{
 </script>
 
 <template>
-    <div style="height: 100%">
+
         <el-auto-resizer>
             <template #default="{ height, width}">
                 <el-table-v2 mb-1 :height="height" :width="width" :data="table.data" :columns="table.columns" ref="tableRef">
@@ -62,7 +62,7 @@ GetAllEnv().then((data)=>{
                 </el-table-v2>
             </template>
         </el-auto-resizer>
-    </div>
+
 </template>
 
 <style scoped>