From fb02dd616025b5fa495e0d993e43003657654b61 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 2 Jun 2021 18:49:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(fix):=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/dataset/dataset.js                        | 4 ++--
 frontend/src/components/cron/cron.vue                      | 2 +-
 frontend/src/styles/index.scss                             | 6 ++++--
 frontend/src/views/chart/index.vue                         | 4 ++++
 frontend/src/views/dataset/common/DatasetGroupSelector.vue | 2 +-
 frontend/src/views/dataset/index.vue                       | 4 ++++
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index 1bf56d0bdd..610b9981f2 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -119,11 +119,11 @@ export function fieldValues(fieldId) {
   })
 }
 
-export function isKettleRunning() {
+export function isKettleRunning(showLoading = true) {
   return request({
     url: '/dataset/group/isKettleRunning',
     method: 'post',
-    loading: true
+    loading: showLoading
   })
 }
 
diff --git a/frontend/src/components/cron/cron.vue b/frontend/src/components/cron/cron.vue
index b90f5aa0f9..d694fc9715 100644
--- a/frontend/src/components/cron/cron.vue
+++ b/frontend/src/components/cron/cron.vue
@@ -158,7 +158,7 @@ export default {
 }
 </script>
 
-<style lang="css">
+<style lang="css" scoped>
 .cron {
   text-align: left;
   padding: 10px;
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 5f4cf7b031..3885e67e20 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -238,7 +238,9 @@ div:focus {
   color: #23beef;
   margin: 0 2px 0 0;
 }
-.el-popper{
-  position: fixed!important;
+.showRightPanel{
+  .el-popper{
+    position: fixed!important;
+  }
 }
 
diff --git a/frontend/src/views/chart/index.vue b/frontend/src/views/chart/index.vue
index 1a437991fa..4047c86112 100644
--- a/frontend/src/views/chart/index.vue
+++ b/frontend/src/views/chart/index.vue
@@ -20,6 +20,7 @@ import Group from './group/Group'
 
 import ChartHome from './data/ChartHome'
 import ChartEdit from './view/ChartEdit'
+import { removeClass } from '@/utils'
 
 export default {
   name: 'Chart',
@@ -30,6 +31,9 @@ export default {
       param: {}
     }
   },
+  mounted() {
+    removeClass(document.body, 'showRightPanel')
+  },
   methods: {
     switchComponent(c) {
       this.param = c.param
diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
index c01814a56d..33d758a6bd 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
@@ -188,7 +188,7 @@ export default {
   },
   methods: {
     kettleState() {
-      isKettleRunning().then(res => {
+      isKettleRunning(false).then(res => {
         this.kettleRunning = res.data
       })
     },
diff --git a/frontend/src/views/dataset/index.vue b/frontend/src/views/dataset/index.vue
index 7c21db7241..eb9e12d16c 100644
--- a/frontend/src/views/dataset/index.vue
+++ b/frontend/src/views/dataset/index.vue
@@ -25,6 +25,7 @@ import AddSQL from './add/AddSQL'
 import AddExcel from './add/AddExcel'
 import AddCustom from './add/AddCustom'
 import FieldEdit from './data/FieldEdit'
+import { removeClass } from '@/utils'
 
 export default {
   name: 'DataSet',
@@ -35,6 +36,9 @@ export default {
       param: {}
     }
   },
+  mounted() {
+    removeClass(document.body, 'showRightPanel')
+  },
   methods: {
     switchComponent(c) {
       this.param = c.param