From e8fa56654990740b3f58ae8e5a41880488eb7401 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 28 Apr 2021 12:23:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=80=E7=BA=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=A6=81=E7=94=A8keep-alive=E7=BC=93=E5=AD=98=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layout/components/AppMain.vue     | 6 +++---
 frontend/src/views/system/datasource/index.vue | 4 ++--
 frontend/src/views/system/dept/index.vue       | 2 +-
 frontend/src/views/system/menu/index.vue       | 2 +-
 frontend/src/views/system/role/index.vue       | 2 +-
 frontend/src/views/system/user/index.vue       | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/src/layout/components/AppMain.vue b/frontend/src/layout/components/AppMain.vue
index 475cfda6e5..b31f25780d 100644
--- a/frontend/src/layout/components/AppMain.vue
+++ b/frontend/src/layout/components/AppMain.vue
@@ -2,9 +2,9 @@
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
       <el-main class="ms-main-container">
-        <keep-alive>
-          <router-view :key="key" />
-        </keep-alive>
+        <!-- <keep-alive> -->
+        <router-view :key="key" />
+        <!-- </keep-alive> -->
       </el-main>
     </transition>
   </section>
diff --git a/frontend/src/views/system/datasource/index.vue b/frontend/src/views/system/datasource/index.vue
index cb9a3e59ab..91b78928c5 100644
--- a/frontend/src/views/system/datasource/index.vue
+++ b/frontend/src/views/system/datasource/index.vue
@@ -154,7 +154,7 @@ export default {
       }
     }
   },
-  activated() {
+  mounted() {
     this.search()
   },
   methods: {
@@ -199,7 +199,7 @@ export default {
             this.$success(this.$t('commons.save_success'))
             this.search()
             this.dialogVisible = false
-          });
+          })
         } else {
           return false
         }
diff --git a/frontend/src/views/system/dept/index.vue b/frontend/src/views/system/dept/index.vue
index fd65bcdbdb..e56d5d11dc 100644
--- a/frontend/src/views/system/dept/index.vue
+++ b/frontend/src/views/system/dept/index.vue
@@ -199,7 +199,7 @@ export default {
       isLazy: true
     }
   },
-  activated() {
+  mounted() {
     this.form = Object.assign({}, this.defaultForm)
     this.search()
   },
diff --git a/frontend/src/views/system/menu/index.vue b/frontend/src/views/system/menu/index.vue
index cbd91334e6..a9b976c1a6 100644
--- a/frontend/src/views/system/menu/index.vue
+++ b/frontend/src/views/system/menu/index.vue
@@ -195,7 +195,7 @@ export default {
 
     }
   },
-  activated() {
+  mounted() {
     this.form = Object.assign({}, this.defaultForm)
     this.initTableData()
   },
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
index 95439ba971..45aa23ee4e 100644
--- a/frontend/src/views/system/role/index.vue
+++ b/frontend/src/views/system/role/index.vue
@@ -146,7 +146,7 @@ export default {
   watch: {
     currentRow: 'currentRowChange'
   },
-  activated() {
+  mounted() {
     this.search()
   },
   methods: {
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index c999f3aa1f..e513059e3a 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -285,7 +285,7 @@ export default {
       }
     }
   },
-  activated() {
+  mounted() {
     // this.form = Object.assign({}, this.defaultForm);
     this.allRoles()
     this.search()