From 296110f9693ebbddca445d6f5645618cf44510b9 Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Tue, 9 Feb 2021 19:25:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AD=90?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=A8=A1=E5=BC=8F=E4=B8=8B=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?keepalive=E7=9B=B8=E4=BA=92=E5=88=87=E6=8D=A2=20keepalive?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/systemTools/index.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/web/src/view/systemTools/index.vue b/web/src/view/systemTools/index.vue
index b0c84753e..7cd5e9071 100644
--- a/web/src/view/systemTools/index.vue
+++ b/web/src/view/systemTools/index.vue
@@ -1,12 +1,15 @@
 <template>
-    <router-view></router-view>
+  <div>
+    <keep-alive>
+      <router-view v-if="$route.meta.keepAlive"></router-view>
+    </keep-alive>
+    <router-view v-if="!$route.meta.keepAlive"></router-view>
+  </div>
 </template>
 
 <script>
 export default {
-    name:"System",
-}
+  name: "System",
+};
 </script>
-<style lang="scss">
-    
-</style>
\ No newline at end of file
+<style lang="scss"></style>

From bedbd3c87282a12c7a773b6308472e0eacd3cd6e Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Tue, 9 Feb 2021 19:25:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AD=90?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=A8=A1=E5=BC=8F=E4=B8=8B=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?keepalive=E7=9B=B8=E4=BA=92=E5=88=87=E6=8D=A2=20keepalive?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/view/example/index.vue              | 15 +++++++++------
 web/src/view/layout/index.vue               |  4 ++--
 web/src/view/superAdmin/index.vue           | 15 +++++++++------
 web/src/view/systemTools/autoCode/index.vue |  2 +-
 web/src/view/workflow/index.vue             | 15 +++++++++------
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/web/src/view/example/index.vue b/web/src/view/example/index.vue
index 5b1352915..87b57206e 100644
--- a/web/src/view/example/index.vue
+++ b/web/src/view/example/index.vue
@@ -1,12 +1,15 @@
 <template>
-    <router-view></router-view>
+  <div>
+    <keep-alive>
+      <router-view v-if="$route.meta.keepAlive"></router-view>
+    </keep-alive>
+    <router-view v-if="!$route.meta.keepAlive"></router-view>
+  </div>
 </template>
 
 <script>
 export default {
-    name:"Example",
-}
+  name: "Example",
+};
 </script>
-<style lang="scss">
-    
-</style>
\ No newline at end of file
+<style lang="scss"></style>
diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue
index 80ee671f5..99c71c17e 100644
--- a/web/src/view/layout/index.vue
+++ b/web/src/view/layout/index.vue
@@ -67,11 +67,11 @@
         </transition>
         <transition mode="out-in" name="el-fade-in-linear">
           <keep-alive>
-            <router-view :key="$route.fullPath" v-loading="loadingFlag"  element-loading-text="正在加载中" class="admin-box" v-if="$route.meta.keepAlive && reloadFlag"></router-view>
+            <router-view v-loading="loadingFlag"  element-loading-text="正在加载中" class="admin-box" v-if="$route.meta.keepAlive && reloadFlag"></router-view>
           </keep-alive>
         </transition>
         <transition mode="out-in" name="el-fade-in-linear">
-          <router-view :key="$route.fullPath" v-loading="loadingFlag"  element-loading-text="正在加载中" class="admin-box" v-if="!$route.meta.keepAlive && reloadFlag"></router-view>
+          <router-view v-loading="loadingFlag"  element-loading-text="正在加载中" class="admin-box" v-if="!$route.meta.keepAlive && reloadFlag"></router-view>
         </transition>
        <BottomInfo />
       </el-main>
diff --git a/web/src/view/superAdmin/index.vue b/web/src/view/superAdmin/index.vue
index fd90ecdf2..cbaa63694 100644
--- a/web/src/view/superAdmin/index.vue
+++ b/web/src/view/superAdmin/index.vue
@@ -1,12 +1,15 @@
 <template>
-    <router-view></router-view>
+  <div>
+    <keep-alive>
+      <router-view v-if="$route.meta.keepAlive"></router-view>
+    </keep-alive>
+    <router-view v-if="!$route.meta.keepAlive"></router-view>
+  </div>
 </template>
 
 <script>
 export default {
-    name:"SuperAdmin",
-}
+  name: "SuperAdmin",
+};
 </script>
-<style lang="scss">
-    
-</style>
\ No newline at end of file
+<style lang="scss"></style>
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index 38baafa22..ffac6ecef 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -357,7 +357,7 @@ export default {
       const fdTypes = ["string", "int", "bool", "float64", "time.Time"];
       fdTypes.map(async fdtype => {
         const res = await getDict(fdtype);
-        res.map(item => {
+        res&&res.map(item => {
           this.fdMap[item.label] = fdtype;
         });
       });
diff --git a/web/src/view/workflow/index.vue b/web/src/view/workflow/index.vue
index a6ddb5592..eed056232 100644
--- a/web/src/view/workflow/index.vue
+++ b/web/src/view/workflow/index.vue
@@ -1,12 +1,15 @@
 <template>
-    <router-view></router-view>
+  <div>
+    <keep-alive>
+      <router-view v-if="$route.meta.keepAlive"></router-view>
+    </keep-alive>
+    <router-view v-if="!$route.meta.keepAlive"></router-view>
+  </div>
 </template>
 
 <script>
 export default {
-    name:"Workflow",
-}
+  name: "Workflow",
+};
 </script>
-<style lang="scss">
-    
-</style>
\ No newline at end of file
+<style lang="scss"></style>