From 0404536a20cf7bfa3f7162969952e1db93ba3fcc Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 11 May 2021 19:09:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20Kettle=20=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.properties |  9 ++-------
 frontend/src/views/chart/index.vue            |  1 -
 frontend/src/views/dataset/add/AddDB.vue      | 20 +++++++++++--------
 frontend/src/views/dataset/add/AddSQL.vue     | 19 +++++++++++-------
 .../dataset/common/DatasetGroupSelector.vue   | 10 +++++-----
 frontend/src/views/dataset/group/Group.vue    | 10 +---------
 6 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 0f07e87ea1..aef5fc0980 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -61,13 +61,8 @@ logging.level.org.springframework.boot.web=trace
 spring.mvc.log-request-details=true
 pagehelper.PageRowBounds=true
 #excel等用户上传文件路径
-upload.file.path=/opt/dataease/data/upload/
-
-#初始密码和登录超时时间移到/opt/dataease/conf/dataease.properties
-#用户初始密码,如果不设置默认是DataEase123..
-#dataease.init_password=DataEase123456
-#登录超时时间单位min
-#dataease.login_timeout=480
+upload.file.path=/opt/dataease/data/kettle/
+
 
 
 
diff --git a/frontend/src/views/chart/index.vue b/frontend/src/views/chart/index.vue
index ce8c38ea21..1a437991fa 100644
--- a/frontend/src/views/chart/index.vue
+++ b/frontend/src/views/chart/index.vue
@@ -32,7 +32,6 @@ export default {
   },
   methods: {
     switchComponent(c) {
-      console.log(c)
       this.param = c.param
       switch (c.name) {
         case 'ChartEdit':
diff --git a/frontend/src/views/dataset/add/AddDB.vue b/frontend/src/views/dataset/add/AddDB.vue
index 6a2b950c48..eab8148e51 100644
--- a/frontend/src/views/dataset/add/AddDB.vue
+++ b/frontend/src/views/dataset/add/AddDB.vue
@@ -29,7 +29,7 @@
         <el-form-item class="form-item">
           <el-select v-model="mode" filterable :placeholder="$t('dataset.connect_mode')" size="mini">
             <el-option :label="$t('dataset.direct_connect')" value="0"  />
-            <el-option :label="$t('dataset.sync_data')" value="1" :disabled="!isKettleRunning"/>
+            <el-option :label="$t('dataset.sync_data')" value="1" :disabled="!kettleRunning"/>
           </el-select>
         </el-form-item>
         <el-form-item class="form-item" style="float: right;">
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import { listDatasource, post } from '@/api/dataset/dataset'
+import {listDatasource, post, isKettleRunning} from '@/api/dataset/dataset'
 
 export default {
   name: 'AddDB',
@@ -66,10 +66,6 @@ export default {
     param: {
       type: Object,
       default: null
-    },
-    isKettleRunning: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
@@ -80,7 +76,8 @@ export default {
       tables: [],
       checkTableList: [],
       mode: '0',
-      tableData: []
+      tableData: [],
+      kettleRunning: false
     }
   },
   watch: {
@@ -106,13 +103,20 @@ export default {
   activated() {
     this.initDataSource()
   },
+  created(){
+    this.kettleState()
+  },
   methods: {
     initDataSource() {
       listDatasource().then(response => {
         this.options = response.data
       })
     },
-
+    kettleState(){
+      isKettleRunning().then(res => {
+        this.kettleRunning = res.data
+      })
+    },
     save() {
       // console.log(this.checkTableList);
       // console.log(this.scene);
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index 79d3c85f94..76bcc4f15d 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -33,7 +33,7 @@
           <el-form-item class="form-item">
             <el-select v-model="mode" filterable :placeholder="$t('dataset.connect_mode')" size="mini">
               <el-option :label="$t('dataset.direct_connect')" value="0" />
-              <el-option :label="$t('dataset.sync_data')" value="1" :disabled="!isKettleRunning" />
+              <el-option :label="$t('dataset.sync_data')" value="1" :disabled="!kettleRunning" />
             </el-select>
           </el-form-item>
         </el-form>
@@ -88,7 +88,7 @@
 </template>
 
 <script>
-import { post, listDatasource } from '@/api/dataset/dataset'
+import {post, listDatasource, isKettleRunning} from '@/api/dataset/dataset'
 import { codemirror } from 'vue-codemirror'
 import { getTable } from '@/api/dataset/dataset'
 // 核心样式
@@ -121,10 +121,6 @@ export default {
     param: {
       type: Object,
       required: true
-    },
-    isKettleRunning: {
-      type: Boolean,
-      default: false
     }
   },
   data() {
@@ -147,7 +143,8 @@ export default {
       data: [],
       fields: [],
       mode: '0',
-      height: 500
+      height: 500,
+      kettleRunning: false
     }
   },
   computed: {
@@ -174,7 +171,15 @@ export default {
 
     this.initTableInfo()
   },
+  created(){
+    this.kettleState()
+  },
   methods: {
+    kettleState(){
+      isKettleRunning().then(res => {
+        this.kettleRunning = res.data
+      })
+    },
     calHeight() {
       const that = this
       setTimeout(function() {
diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
index bda67a8360..539e4d8b7b 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
@@ -126,7 +126,7 @@ export default {
   },
   data() {
     return {
-      isKettleRunning: false,
+      kettleRunning: false,
       sceneMode: false,
       search: '',
       data: [],
@@ -170,12 +170,12 @@ export default {
     this.tableTree()
   },
   created(){
-    this.kettleRunning()
+    this.kettleState()
   },
   methods: {
-    kettleRunning(){
+    kettleState(){
       isKettleRunning().then(res => {
-        this.isKettleRunning = res.data
+        this.kettleRunning = res.data
       })
     },
     close() {
@@ -213,7 +213,7 @@ export default {
         }).then(response => {
           this.tables = response.data
           for (let i = 0; i < this.tables.length; i++) {
-            if(this.tables[i].mode===1 && this.isKettleRunning === false){
+            if(this.tables[i].mode===1 && this.kettleRunning === false){
               this.$set(this.tables[i],"disabled",true)
             }
           }
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 4183c8d0e3..8a2acc58b6 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -306,15 +306,7 @@ export default {
     this.refresh()
     this.tableTree()
   },
-  created(){
-    this.kettleRunning()
-  },
   methods: {
-    kettleRunning(){
-      isKettleRunning().then(res => {
-        this.isKettleRunning = res.data
-      })
-    },
     clickAdd(param) {
       // console.log(param);
       this.add(param.type)
@@ -554,7 +546,7 @@ export default {
     },
 
     addData(name) {
-      this.$emit('switchComponent', { name: name, param: this.currGroup, isKettleRunning: this.isKettleRunning})
+      this.$emit('switchComponent', { name: name, param: this.currGroup})
     },
 
     sceneClick(data, node) {