From 9f804307e5260e0436b1716e5ba8880a41157ef9 Mon Sep 17 00:00:00 2001
From: break60 <790061044@qq.com>
Date: Sat, 21 Mar 2020 22:13:12 +0800
Subject: [PATCH] datax add custom

---
 .../pages/dag/_source/formModel/formModel.vue |  1 -
 .../dag/_source/formModel/tasks/datax.vue     | 70 ++++++++++++-------
 .../src/js/module/i18n/locale/en_US.js        |  1 +
 .../src/js/module/i18n/locale/zh_CN.js        |  1 +
 4 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
index 56cefd5b3..017f154b4 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
@@ -430,7 +430,6 @@
        * return params
        */
       _onParams (o) {
-        console.log(o)
         this.params = Object.assign({}, o)
       },
 
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
index 0f8290384..f1c9b757b 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
@@ -161,7 +161,6 @@
       return {
         // Data Custom template
         enable: false,
-        enables: false,
         // Data source type
         dsType: '',
         // data source
@@ -199,12 +198,17 @@
     },
     methods: {
       _onSwitch (is) {
-        console.log(is)
-        this.enables = true
-        this.customConfig = 1
-        setTimeout(() => {
-        this._handlerJsonEditor()
-      }, 200)
+        if(is) {
+          this.customConfig = 1
+          setTimeout(() => {
+            this._handlerJsonEditor()
+          }, 200)
+        } else {
+          this.customConfig = 0
+          setTimeout(() => {
+            this._handlerEditor()
+          }, 200)
+        }
       },
       /**
        * return data source
@@ -237,6 +241,11 @@
        */
       _verification () {
         if(this.customConfig) {
+          if (!jsonEditor.getValue()) {
+            this.$message.warning(`${i18n.$t('Please enter a JSON Statement(required)')}`)
+            return false
+          }
+
           // storage
           this.$emit('on-params', {
             customConfig: this.customConfig,
@@ -245,7 +254,6 @@
           })
           return true
         } else {
-          console.log(123)
           if (!editor.getValue()) {
             this.$message.warning(`${i18n.$t('Please enter a SQL Statement(required)')}`)
             return false
@@ -387,27 +395,37 @@
       // Non-null objects represent backfill
       if (!_.isEmpty(o)) {
         // backfill
-        this.dsType = o.params.dsType || ''
-        this.datasource = o.params.dataSource || ''
-        this.dtType = o.params.dtType || ''
-        this.datatarget = o.params.dataTarget || ''
-        this.sql = o.params.sql || ''
-        this.targetTable = o.params.targetTable || ''
-        this.jobSpeedByte = o.params.jobSpeedByte / 1024 || 0
-        this.jobSpeedRecord = o.params.jobSpeedRecord || 0
-        this.preStatements = o.params.preStatements || []
-        this.postStatements = o.params.postStatements || []
+        if(o.params.customConfig == 0) {
+          this.customConfig = 0
+          this.enable = false
+          this.dsType = o.params.dsType || ''
+          this.datasource = o.params.dataSource || ''
+          this.dtType = o.params.dtType || ''
+          this.datatarget = o.params.dataTarget || ''
+          this.sql = o.params.sql || ''
+          this.targetTable = o.params.targetTable || ''
+          this.jobSpeedByte = o.params.jobSpeedByte / 1024 || 0
+          this.jobSpeedRecord = o.params.jobSpeedRecord || 0
+          this.preStatements = o.params.preStatements || []
+          this.postStatements = o.params.postStatements || []
+        } else {
+          this.customConfig = 1
+          this.enable = true
+          this.json = o.params.json || []
+          this.localParams = o.params.localParams || ''
+        }
       }
     },
     mounted () {
-      setTimeout(() => {
-        this._handlerEditor()
-      }, 200)
-      // this._handlerJsonEditor()
-      // setTimeout(() => {
-      //   this._handlerJsonEditor()
-      // }, 200)
-      
+      if(this.customConfig) {
+        setTimeout(() => {
+          this._handlerJsonEditor()
+        }, 200)
+      } else {
+        setTimeout(() => {
+          this._handlerEditor()
+        }, 200)
+      }
     },
     destroyed () {
       /**
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 0d7cec4a5..819af7c12 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -120,6 +120,7 @@ export default {
   'SQL Statement': 'SQL Statement',
   'UDF Function': 'UDF Function',
   'Please enter a SQL Statement(required)': 'Please enter a SQL Statement(required)',
+  'Please enter a JSON Statement(required)': 'Please enter a JSON Statement(required)',
   'One form or attachment must be selected': 'One form or attachment must be selected',
   'Recipient required': 'Recipient required',
   'Mail subject required': 'Mail subject required',
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 55dfdf9ee..fe67bae37 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -121,6 +121,7 @@ export default {
   'SQL Statement': 'sql语句',
   'UDF Function': 'UDF函数',
   'Please enter a SQL Statement(required)': '请输入sql语句(必填)',
+  'Please enter a JSON Statement(required)': '请输入json语句(必填)',
   'One form or attachment must be selected': '表格、附件必须勾选一个',
   'Recipient required': '收件人邮箱必填',
   'Mail subject required': '邮件主题必填',
-- 
GitLab