Browse Source

datax

pull/3/MERGE
break60 5 years ago committed by gaojun2048
parent
commit
280a240ff5
  1. 3
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  2. 109
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
  3. 1
      dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
  4. 1
      dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js

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

@ -430,7 +430,8 @@
* return params
*/
_onParams (o) {
this.params = Object.assign(this.params, {}, o)
console.log(o)
this.params = Object.assign({}, o)
},
_onCacheParams (o) {

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

@ -16,6 +16,17 @@
*/
<template>
<div class="datax-model">
<m-list-box>
<div slot="text">{{$t('Custom template')}}</div>
<div slot="content">
<label class="label-box">
<div style="padding-top: 5px;">
<x-switch v-model="enable" @on-click="_onSwitch" :disabled="isDetails"></x-switch>
</div>
</label>
</div>
</m-list-box>
<div v-if="!enable">
<m-list-box>
<div slot="text">{{$t('Datasource')}}</div>
<div slot="content">
@ -102,6 +113,32 @@
</div>
</m-list-box>
</div>
<div v-else>
<m-list-box>
<div slot="text">json</div>
<div slot="content">
<div class="from-mirror">
<textarea
id="code-json-mirror"
name="code-json-mirror"
style="opacity: 0;">
</textarea>
</div>
</div>
</m-list-box>
<m-list-box>
<div slot="text">{{$t('Custom Parameters')}}</div>
<div slot="content">
<m-local-params
ref="refLocalParams"
@on-local-params="_onLocalParams"
:udp-list="localParams"
:hide="false">
</m-local-params>
</div>
</m-list-box>
</div>
</div>
</template>
<script>
import _ from 'lodash'
@ -115,12 +152,16 @@
import codemirror from '@/conf/home/pages/resource/pages/file/pages/_source/codemirror'
let editor
let jsonEditor
export default {
name: 'datax',
data () {
return {
// Data Custom template
enable: false,
enables: false,
// Data source type
dsType: '',
// data source
@ -135,6 +176,7 @@
rtDatatarget: '',
// Sql statement
sql: '',
json: '',
// target table
targetTable: '',
// Pre statements
@ -145,6 +187,9 @@
jobSpeedByte: 0,
// speed record
jobSpeedRecord: 1000,
// Custom parameter
localParams: [],
customConfig: 0,
}
},
mixins: [disabledState],
@ -153,6 +198,14 @@
createNodeId: Number
},
methods: {
_onSwitch (is) {
console.log(is)
this.enables = true
this.customConfig = 1
setTimeout(() => {
this._handlerJsonEditor()
}, 200)
},
/**
* return data source
*/
@ -183,6 +236,16 @@
* verification
*/
_verification () {
if(this.customConfig) {
// storage
this.$emit('on-params', {
customConfig: this.customConfig,
json: jsonEditor.getValue(),
localParams: this.localParams
})
return true
} else {
console.log(123)
if (!editor.getValue()) {
this.$message.warning(`${i18n.$t('Please enter a SQL Statement(required)')}`)
return false
@ -215,6 +278,7 @@
// storage
this.$emit('on-params', {
customConfig: this.customConfig,
dsType: this.dsType,
dataSource: this.rtDatasource,
dtType: this.dtType,
@ -227,6 +291,7 @@
postStatements: this.postStatements
})
return true
}
},
/**
* Processing code highlighting
@ -259,6 +324,34 @@
return editor
},
_handlerJsonEditor () {
this._destroyJsonEditor()
// jsonEditor
jsonEditor = codemirror('code-json-mirror', {
mode: 'json',
readOnly: this.isDetails
})
this.keypress = () => {
if (!jsonEditor.getOption('readOnly')) {
jsonEditor.showHint({
completeSingle: false
})
}
}
// Monitor keyboard
jsonEditor.on('keypress', this.keypress)
jsonEditor.on('changes', () => {
// this._cacheParams()
})
jsonEditor.setValue(this.json)
return jsonEditor
},
_cacheParams () {
this.$emit('on-cache-params', {
dsType: this.dsType,
@ -279,6 +372,13 @@
editor.off($('.code-sql-mirror'), 'keypress', this.keypress)
editor.off($('.code-sql-mirror'), 'changes', this.changes)
}
},
_destroyJsonEditor () {
if (jsonEditor) {
jsonEditor.toTextArea() // Uninstall
jsonEditor.off($('.code-json-mirror'), 'keypress', this.keypress)
jsonEditor.off($('.code-json-mirror'), 'changes', this.changes)
}
}
},
created () {
@ -303,6 +403,11 @@
setTimeout(() => {
this._handlerEditor()
}, 200)
// this._handlerJsonEditor()
// setTimeout(() => {
// this._handlerJsonEditor()
// }, 200)
},
destroyed () {
/**
@ -312,6 +417,10 @@
editor.toTextArea() // Uninstall
editor.off($('.code-sql-mirror'), 'keypress', this.keypress)
}
if (jsonEditor) {
jsonEditor.toTextArea() // Uninstall
jsonEditor.off($('.code-json-mirror'), 'keypress', this.keypress)
}
},
watch: {
//Watch the cacheParams

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

@ -90,6 +90,7 @@ export default {
'Please enter other parameters': 'Please enter other parameters',
'Resources': 'Resources',
'Custom Parameters': 'Custom Parameters',
'Custom template': 'Custom template',
'Datasource': 'Datasource',
'methods': 'methods',
'Please enter method(optional)': 'Please enter method(optional)',

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

@ -90,6 +90,7 @@ export default {
'Please enter other parameters': '请输入其他参数',
'Resources': '资源',
'Custom Parameters': '自定义参数',
'Custom template': '自定义模版',
'Please enter main class': '请填写主函数的class',
'Datasource': '数据源',
'methods': '方法',

Loading…
Cancel
Save