Commit 9f804307 authored by 向偲彪's avatar 向偲彪
Browse files

datax add custom

parent ca83fd73

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue

+0 −1
Original line number Diff line number Diff line
@@ -430,7 +430,6 @@ 
       * return params

       */

      _onParams (o) {

        console.log(o)

        this.params = Object.assign({}, o)

      },

dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue

+44 −26
Original line number Diff line number Diff line
@@ -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

        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,6 +395,9 @@ 
      // Non-null objects represent backfill

      if (!_.isEmpty(o)) {

        // backfill

        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 || ''
@@ -397,17 +408,24 @@ 
          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 () {

      if(this.customConfig) {

        setTimeout(() => {

          this._handlerJsonEditor()

        }, 200)

      } else {

        setTimeout(() => {

          this._handlerEditor()

        }, 200)

      // this._handlerJsonEditor()

      // setTimeout(() => {

      //   this._handlerJsonEditor()

      // }, 200)

      

      }

    },

    destroyed () {

      /**

dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js

+1 −0
Original line number Diff line number Diff line
@@ -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',

dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

+1 −0
Original line number Diff line number Diff line
@@ -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': '邮件主题必填',