From e0fe6119482631a9341f9ec56d455dbdc1b1c69e Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 23 Sep 2022 16:27:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B7=AF=E7=94=B1=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue                       | 15 +++-----
 frontend/src/layout/components/AppMain.vue | 35 +++++++++---------
 frontend/src/views/dataset/group/Group.vue | 42 ++++++++++------------
 3 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 78effadf68..4c83f5c23f 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,10 +1,7 @@
 <template>
   <div id="app">
-    <keep-alive>
-      <router-view v-show="['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
-    </keep-alive>
-    <router-view v-show="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
-    <plugin-com v-show="false" ref="de-theme" component-name="ThemeSetting" />
+    <router-view/>
+    <plugin-com v-show="false" ref="de-theme" component-name="ThemeSetting"/>
   </div>
 </template>
 
@@ -13,11 +10,9 @@ import PluginCom from '@/views/system/plugin/PluginCom'
 
 export default {
   name: 'App',
-  components: { PluginCom },
-  computed: {
-    key() {
-      return this.$route.path
-    }
+  components: {PluginCom},
+  beforeCreate() {
+
   }
 }
 </script>
diff --git a/frontend/src/layout/components/AppMain.vue b/frontend/src/layout/components/AppMain.vue
index 732bbab7c8..1fe3409c83 100644
--- a/frontend/src/layout/components/AppMain.vue
+++ b/frontend/src/layout/components/AppMain.vue
@@ -2,10 +2,7 @@
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
       <el-main class="ms-main-container">
-        <keep-alive>
-          <router-view v-if="['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
-        </keep-alive>
-        <router-view v-if="!['/dataset/index', '/system/system-settings/appearance'].includes(key)"></router-view>
+        <router-view :key="key" />
       </el-main>
     </transition>
   </section>
@@ -23,24 +20,24 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.app-main {
-  height: 100%;
-}
+    .app-main {
+        height: 100%;
+    }
 
-.fixed-header + .app-main {
-  padding-top: 50px;
-}
+    .fixed-header + .app-main {
+        padding-top: 50px;
+    }
 
-.ms-main-container {
-  height: 100%;
-  padding: 0 !important;
-}
+    .ms-main-container {
+        height: 100%;
+        padding: 0 !important;
+    }
 </style>
 
 <style lang="scss">
-.el-popup-parent--hidden {
-  .fixed-header {
-    padding-right: 15px;
-  }
-}
+    .el-popup-parent--hidden {
+        .fixed-header {
+            padding-right: 15px;
+        }
+    }
 </style>
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index bbac9249ca..2629544d46 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -221,9 +221,7 @@
                     class="ds-icon-api"
                   />
                 </span>
-                <span
-                  v-if="['db', 'sql'].includes(data.modelInnerType)"
-                >
+                <span v-if="['db', 'sql'].includes(data.modelInnerType)">
                   <span v-if="data.mode === 0" style="margin-left: 6px"
                     ><i class="el-icon-s-operation"
                   /></span>
@@ -238,7 +236,13 @@
                     overflow: hidden;
                     text-overflow: ellipsis;
                   "
-                  :class="[{ 'de-fill-block': !['db', 'sql'].includes(data.modelInnerType)}]"
+                  :class="[
+                    {
+                      'de-fill-block': !['db', 'sql'].includes(
+                        data.modelInnerType
+                      )
+                    }
+                  ]"
                   :title="data.name"
                   >{{ data.name }}</span
                 >
@@ -496,7 +500,6 @@ export default {
       },
       isTreeSearch: false,
       kettleRunning: false,
-      pageCreated: false,
       engineMode: 'local',
       searchPids: [], // 查询命中的pid
       filterText: '',
@@ -526,9 +529,13 @@ export default {
       this.$refs.datasetTreeRef.filter(this.filterText)
     }
   },
-  activated() {
-    if (!this.pageCreated) return;
-    const dataset = this.$refs.datasetTreeRef?.getCurrentNode()
+  created() {
+    this.kettleState()
+    engineMode().then((res) => {
+      this.engineMode = res.data
+    })
+  },
+  mounted() {
     const { id, name } = this.$route.params
     queryAuthModel({ modelType: 'dataset' }, true).then((res) => {
       localStorage.setItem('dataset-tree', JSON.stringify(res.data))
@@ -537,28 +544,15 @@ export default {
         this.$refs.datasetTreeRef?.filter(this.filterText)
         if (id && name.includes(this.filterText)) {
           this.dfsTableData(this.tData, id)
-        } else if (dataset) {
-          this.$refs.datasetTreeRef?.setCurrentNode(dataset)
-          this.nodeClick(dataset)
         }
       })
     })
-  },
-  created() {
-    this.pageCreated = true;
-    this.kettleState()
-    engineMode().then((res) => {
-      this.engineMode = res.data
-    })
-  },
-  mounted() {
-    this.treeNode(true)
     this.refresh()
   },
   methods: {
     dfsTableData(arr, id) {
-      arr.some(ele => {
-        if(ele.id === id) {
+      arr.some((ele) => {
+        if (ele.id === id) {
           this.$refs.datasetTreeRef?.setCurrentNode(ele)
           this.nodeClick(ele)
           this.expandedArray.push(id)
@@ -567,7 +561,7 @@ export default {
           this.dfsTableData(ele.children, id)
         }
         return false
-      });
+      })
     },
     nameRepeat(value) {
       if (!this.fileList || this.fileList.length === 0) {