Merge pull request #14 from Dragon-Wong/dev

Dev
WeiYe-Jing · Jun 8, 2020 · 7c62564 · 7c62564
2 parents abd42e2 + 229810b
commit 7c62564
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/src/components/PowershellEditor/index.vue b/src/components/PowershellEditor/index.vue
@@ -38,7 +38,7 @@ export default {
       lint: true
     })
 
-    this.powershellEditor.setValue(this.value)
+    this.powershellEditor.setValue(this.value ? this.value : '')
     this.powershellEditor.on('change', cm => {
       this.$emit('changed', cm.getValue())
       this.$emit('input', cm.getValue())

diff --git a/src/components/PythonEditor/index.vue b/src/components/PythonEditor/index.vue
@@ -38,7 +38,7 @@ export default {
       lint: true
     })
 
-    this.pythonEditor.setValue(this.value)
+    this.pythonEditor.setValue(this.value ? this.value : '')
     this.pythonEditor.on('change', cm => {
       this.$emit('changed', cm.getValue())
       this.$emit('input', cm.getValue())

diff --git a/src/components/ShellEditor/index.vue b/src/components/ShellEditor/index.vue
@@ -38,7 +38,7 @@ export default {
       lint: true
     })
 
-    this.shellEditor.setValue(this.value)
+    this.shellEditor.setValue(this.value ? this.value : '')
     this.shellEditor.on('change', cm => {
       this.$emit('changed', cm.getValue())
       this.$emit('input', cm.getValue())

diff --git a/src/views/datax/jobInfo/index.vue b/src/views/datax/jobInfo/index.vue
@@ -324,6 +324,7 @@ import PythonEditor from '@/components/PythonEditor'
 import PowershellEditor from '@/components/PowershellEditor'
 import * as datasourceApi from '@/api/datax-jdbcDatasource'
 import * as jobProjectApi from '@/api/datax-job-project'
+import { isJSON } from '@/utils/validate'
 
 export default {
   name: 'JobInfo',
@@ -554,6 +555,15 @@ export default {
       })
     },
     createData() {
+      if (this.temp.glueType === 'BEAN' && !isJSON(this.jobJson)) {
+        this.$notify({
+          title: 'Fail',
+          message: 'json格式错误',
+          type: 'error',
+          duration: 2000
+        })
+        return
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           if (this.temp.childJobId) {
@@ -620,6 +630,16 @@ export default {
       })
     },
     updateData() {
+      this.jobJson = typeof (this.jobJson) !== 'string' ? JSON.stringify(this.jobJson) : this.jobJson
+      if (this.temp.glueType === 'BEAN' && !isJSON(this.jobJson)) {
+        this.$notify({
+          title: 'Fail',
+          message: 'json格式错误',
+          type: 'error',
+          duration: 2000
+        })
+        return
+      }
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
           if (this.temp.childJobId) {