Browse Source

fix eslint: fix syntax by npm run lint automatically

pull/3/MERGE
chengshiwen 4 years ago
parent
commit
5334703593
  1. 46
      dolphinscheduler-ui/src/components/Counter.vue
  2. 14
      dolphinscheduler-ui/src/components/Message.vue
  3. 125
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  4. 36
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
  5. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
  6. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
  7. 50
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formLineModel.vue
  8. 78
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  9. 10
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
  10. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue
  11. 12
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
  12. 9
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue
  13. 10
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/jsonBox.vue
  14. 8
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
  15. 10
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/scriptBox.vue
  16. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/udfs.vue
  17. 16
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/conditions.vue
  18. 43
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/datax.vue
  19. 8
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
  20. 218
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
  21. 59
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue
  22. 202
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
  23. 14
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
  24. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
  25. 110
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
  26. 114
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
  27. 210
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
  28. 27
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
  29. 392
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
  30. 4
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
  31. 154
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue
  32. 12
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
  33. 10
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue
  34. 7
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
  35. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue
  36. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
  37. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
  38. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
  39. 63
      dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
  40. 12
      dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
  41. 18
      dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue
  42. 6
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue
  43. 1
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
  44. 70
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
  45. 2
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
  46. 22
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue
  47. 2
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue
  48. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/conditions/instance/processInstance.vue
  49. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/conditions/instance/taskInstance.vue
  50. 18
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue
  51. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue
  52. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue
  53. 55
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
  54. 36
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/relatedItems.vue
  55. 14
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
  56. 74
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
  57. 14
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
  58. 3
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue
  59. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
  60. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
  61. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue
  62. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
  63. 10
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue
  64. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue
  65. 8
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
  66. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue
  67. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
  68. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue
  69. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue
  70. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
  71. 16
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
  72. 10
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue
  73. 44
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/index.vue
  74. 8
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue
  75. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
  76. 5
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue
  77. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
  78. 14
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
  79. 2
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue
  80. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue
  81. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue
  82. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
  83. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createFolder/index.vue
  84. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createUdfFolder/index.vue
  85. 8
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
  86. 6
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
  87. 6
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
  88. 12
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
  89. 10
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
  90. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue
  91. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFileFolder/index.vue
  92. 8
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
  93. 13
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/rename.vue
  94. 24
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
  95. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/createUdfFolder/index.vue
  96. 38
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
  97. 8
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
  98. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
  99. 12
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
  100. 8
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
  101. Some files were not shown because too many files have changed in this diff Show More

46
dolphinscheduler-ui/src/components/Counter.vue

@ -24,30 +24,30 @@
</template>
<script>
export default {
props: {
factor: { type: Number, default: 1 }
},
data() {
return {
count: 0
};
},
methods: {
inc() {
this.count++;
export default {
props: {
factor: { type: Number, default: 1 }
},
dec() {
this.count--;
data () {
return {
count: 0
}
},
reset() {
this.count = 0;
}
},
computed: {
computedCount: function() {
return this.count * this.factor;
methods: {
inc () {
this.count++
},
dec () {
this.count--
},
reset () {
this.count = 0
}
},
computed: {
computedCount: function () {
return this.count * this.factor
}
}
}
};
</script>
</script>

14
dolphinscheduler-ui/src/components/Message.vue

@ -19,10 +19,10 @@
</template>
<script>
export default {
name: 'message',
props: [
'msg'
]
}
</script>
export default {
name: 'message',
props: [
'msg'
]
}
</script>

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

@ -268,54 +268,54 @@
methods: {
...mapActions('dag', ['saveDAGchart', 'updateInstance', 'updateDefinition', 'getTaskState', 'switchProcessDefinitionVersion', 'getProcessDefinitionVersionsPage', 'deleteProcessDefinitionVersion']),
...mapMutations('dag', ['addTasks', 'cacheTasks', 'resetParams', 'setIsEditDag', 'setName', 'addConnects']),
startRunning(item,startNodeList,sourceType) {
startRunning (item, startNodeList, sourceType) {
this.startData = item
this.startNodeList.startNodeList
this.sourceType = sourceType
this.startDialog = true
},
onUpdateStart() {
onUpdateStart () {
this.startDialog = false
},
closeStart() {
closeStart () {
this.startDialog = false
},
// DAG automatic layout
dagAutomaticLayout() {
if(this.store.state.dag.isEditDag) {
dagAutomaticLayout () {
if (this.store.state.dag.isEditDag) {
this.$message.warning(`${i18n.$t('Please save the DAG before formatting')}`)
return false
}
$('#canvas').html('')
// Destroy round robin
// Destroy round robin
Dag.init({
dag: this,
instance: jsPlumb.getInstance({
Endpoint: [
'Dot', { radius: 1, cssClass: 'dot-style' }
],
Connector: 'Bezier',
PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style
ConnectionOverlays: [
[
'Arrow',
{
location: 1,
id: 'arrow',
length: 12,
foldback: 0.8
}
dag: this,
instance: jsPlumb.getInstance({
Endpoint: [
'Dot', { radius: 1, cssClass: 'dot-style' }
],
['Label', {
Connector: 'Bezier',
PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style
ConnectionOverlays: [
[
'Arrow',
{
location: 1,
id: 'arrow',
length: 12,
foldback: 0.8
}
],
['Label', {
location: 0.5,
id: 'label'
}]
],
Container: 'canvas',
ConnectionsDetachable: true
}]
],
Container: 'canvas',
ConnectionsDetachable: true
})
})
})
if (this.tasks.length) {
Dag.backfill(true)
if (this.type === 'instance') {
@ -344,8 +344,8 @@
/**
* copy name
*/
_copyName(){
let clipboard = new Clipboard(`.copy-name`)
_copyName () {
let clipboard = new Clipboard('.copy-name')
clipboard.on('success', e => {
this.$message.success(`${i18n.$t('Copy success')}`)
// Free memory
@ -383,8 +383,8 @@
let dom = $(`#${v2.id}`)
let state = dom.find('.state-p')
let depState = ''
taskList.forEach(item=>{
if(item.name==v1.name) {
taskList.forEach(item => {
if (item.name == v1.name) {
depState = item.state
}
})
@ -460,7 +460,7 @@
this.spinnerLoading = true
// Storage store
Dag.saveStore().then(res => {
if(this._verifConditions(res.tasks)) {
if (this._verifConditions(res.tasks)) {
if (this.urlParam.id) {
/**
* Edit
@ -509,24 +509,24 @@
})
})
},
_closeDAG(){
_closeDAG () {
let $name = this.$route.name
if($name && $name.indexOf("definition") != -1){
this.$router.push({ name: 'projects-definition-list'})
}else{
this.$router.push({ name: 'projects-instance-list'})
if ($name && $name.indexOf('definition') != -1) {
this.$router.push({ name: 'projects-definition-list' })
} else {
this.$router.push({ name: 'projects-instance-list' })
}
},
_verifConditions (value) {
let tasks = value
let bool = true
tasks.map(v=>{
if(v.type == 'CONDITIONS' && (v.conditionResult.successNode[0] =='' || v.conditionResult.successNode[0] == null || v.conditionResult.failedNode[0] =='' || v.conditionResult.failedNode[0] == null)) {
tasks.map(v => {
if (v.type == 'CONDITIONS' && (v.conditionResult.successNode[0] == '' || v.conditionResult.successNode[0] == null || v.conditionResult.failedNode[0] == '' || v.conditionResult.failedNode[0] == null)) {
bool = false
return false
}
})
if(!bool) {
if (!bool) {
this.$message.warning(`${i18n.$t('Successful branch flow and failed branch flow are required')}`)
this.spinnerLoading = false
return false
@ -600,20 +600,20 @@
* View variables
*/
_toggleView () {
findComponentDownward(this.$root, `assist-dag-index`)._toggleView()
findComponentDownward(this.$root, 'assist-dag-index')._toggleView()
},
/**
* Starting parameters
*/
_toggleParam () {
findComponentDownward(this.$root, `starting-params-dag-index`)._toggleParam()
findComponentDownward(this.$root, 'starting-params-dag-index')._toggleParam()
},
addLineInfo ({ item, fromThis }) {
this.addConnects(item)
this.lineDrawer = false
},
cancel ({fromThis}) {
cancel ({ fromThis }) {
this.lineDrawer = false
},
@ -621,7 +621,7 @@
* Create a node popup layer
* @param Object id
*/
_createLineLabel({id, sourceId, targetId}) {
_createLineLabel ({ id, sourceId, targetId }) {
this.lineData.id = id
this.lineData.sourceId = sourceId
this.lineData.targetId = targetId
@ -633,11 +633,11 @@
this.nodeDrawer = false
},
cacheTaskInfo({item, fromThis}) {
cacheTaskInfo ({ item, fromThis }) {
this.cacheTasks(item)
},
close ({ item,flag, fromThis }) {
close ({ item, flag, fromThis }) {
this.addTasks(item)
// Edit status does not allow deletion of nodes
if (flag) {
@ -654,11 +654,11 @@
let preNode = []
let rearNode = []
let rearList = []
$('div[data-targetarr*="' + id + '"]').each(function(){
rearNode.push($(this).attr("id"))
$('div[data-targetarr*="' + id + '"]').each(function () {
rearNode.push($(this).attr('id'))
})
if (rearNode.length>0) {
if (rearNode.length > 0) {
rearNode.forEach(v => {
let rearobj = {}
rearobj.value = $(`#${v}`).find('.name-p').text()
@ -690,12 +690,11 @@
this.nodeData.preNode = preNode
this.nodeData.rearList = rearList
this.nodeData.instanceId = this.$route.params.id
this.nodeDrawer = true
},
removeEventModelById ($id) {
if(eventModel && this.taskId == $id){
if (eventModel && this.taskId == $id) {
eventModel.remove()
}
},
@ -707,12 +706,12 @@
* @param processDefinitionId the process definition id
* @param fromThis fromThis
*/
mVersionSwitchProcessDefinitionVersion({ version, processDefinitionId, fromThis }) {
mVersionSwitchProcessDefinitionVersion ({ version, processDefinitionId, fromThis }) {
this.$store.state.dag.isSwitchVersion = true
this.switchProcessDefinitionVersion({
version: version,
processDefinitionId: processDefinitionId
}).then(res=>{
}).then(res => {
this.$message.success($t('Switch Version Successfully'))
this.$router.push({ path: `/projects/definition/list/${processDefinitionId}?_t=${new Date().getTime()}` })
}).catch(e => {
@ -720,7 +719,7 @@
this.$message.error(e.msg || '')
})
},
/**
* Paging event of process definition versions
*
@ -729,17 +728,17 @@
* @param processDefinitionId the process definition id of page version
* @param fromThis fromThis
*/
mVersionGetProcessDefinitionVersionsPage({ pageNo, pageSize, processDefinitionId, fromThis }) {
mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize, processDefinitionId, fromThis }) {
this.getProcessDefinitionVersionsPage({
pageNo: pageNo,
pageSize: pageSize,
processDefinitionId: processDefinitionId
}).then(res=>{
}).then(res => {
this.versionData.processDefinitionVersions = res.data.lists
this.versionData.total = res.data.totalCount
this.versionData.pageSize = res.data.pageSize
this.versionData.pageNo = res.data.currentPage
}).catch(e=>{
}).catch(e => {
this.$message.error(e.msg || '')
})
},
@ -766,17 +765,15 @@
this.versionData.pageNo = pageNo
this.versionData.pageSize = pageSize
this.drawer = true
}).catch(e => {
this.$message.error(e.msg || '')
})
}
},
watch: {
'tasks': {
tasks: {
deep: true,
handler (o) {
// Edit state does not allow deletion of node a...
this.setIsEditDag(true)
}
@ -809,8 +806,8 @@
}
],
['Label', {
location: 0.5,
id: 'label'
location: 0.5,
id: 'label'
}]
],
Container: 'canvas',

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

@ -143,21 +143,21 @@
if (p === 2 || p === 0) {
this.waitCompleteTimeout.strategy = is ? ['WARN'] : []
this.waitCompleteTimeout.interval = is ? 30 : null
}
}
},
_verification () {
// Verification timeout policy
if (this.enable
&& (this.waitCompleteTimeout.enable && !this.waitCompleteTimeout.strategy.length)
|| (this.waitStartTimeout.enable && !this.waitStartTimeout.strategy.length)) {
if (this.enable &&
(this.waitCompleteTimeout.enable && !this.waitCompleteTimeout.strategy.length) ||
(this.waitStartTimeout.enable && !this.waitStartTimeout.strategy.length)) {
this.$message.warning(`${this.$t('Timeout strategy must be selected')}`)
return false
}
// Verify timeout duration Non 0 positive integer
const reg = /^[1-9]\d*$/
if (this.enable
&& (this.waitCompleteTimeout.enable && !reg.test(this.waitCompleteTimeout.interval))
|| (this.waitStartTimeout.enable && (!reg.test(this.waitStartTimeout.interval || !reg.test(this.waitStartTimeout.checkInterval))))) {
if (this.enable &&
(this.waitCompleteTimeout.enable && !reg.test(this.waitCompleteTimeout.interval)) ||
(this.waitStartTimeout.enable && (!reg.test(this.waitStartTimeout.interval || !reg.test(this.waitStartTimeout.checkInterval))))) {
this.$message.warning(`${this.$t('Timeout must be a positive integer')}`)
return false
}
@ -175,16 +175,16 @@
},
waitCompleteTimeout: {
strategy: (() => {
// Handling checkout sequence
let strategy = this.waitCompleteTimeout.strategy
if (strategy.length === 2 && strategy[0] === 'FAILED') {
return [strategy[1], strategy[0]].join(',')
} else {
return strategy.join(',')
}
})(),
interval: parseInt(this.waitCompleteTimeout.interval),
enable: this.waitCompleteTimeout.enable
// Handling checkout sequence
let strategy = this.waitCompleteTimeout.strategy
if (strategy.length === 2 && strategy[0] === 'FAILED') {
return [strategy[1], strategy[0]].join(',')
} else {
return strategy.join(',')
}
})(),
interval: parseInt(this.waitCompleteTimeout.interval),
enable: this.waitCompleteTimeout.enable
}
})
return true
@ -215,4 +215,4 @@
},
components: {}
}
</script>
</script>

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

@ -88,7 +88,7 @@
}, 1)
},
_onBlur () {
let val = $(this.$refs['input'].$el).find('input')[0].value
let val = $(this.$refs.input.$el).find('input')[0].value
if (this._validation(val)) {
this.$emit('valueEvent', val)
this._setIconState(val)
@ -115,4 +115,4 @@
},
components: {}
}
</script>
</script>

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

@ -127,4 +127,4 @@
},
components: {}
}
</script>
</script>

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

@ -58,10 +58,10 @@
name: 'form-line-model',
data () {
return {
// loading
// loading
spinnerLoading: false,
// node name
labelName: '',
labelName: ''
}
},
mixins: [disabledState],
@ -69,38 +69,38 @@
lineData: Object
},
methods: {
cancel() {
this.$emit('cancel', {
fromThis: this
})
},
ok() {
if($(`#${this.lineData.id}`).prev().attr('class')==='jtk-overlay') {
$(`#${this.lineData.id}`).prev().empty()
}
$(`#${this.lineData.id}`).text(this.labelName)
this.$emit('addLineInfo', {
item: {
labelName: this.labelName,
sourceId: this.lineData.sourceId,
targetId: this.lineData.targetId
},
fromThis: this
})
cancel () {
this.$emit('cancel', {
fromThis: this
})
},
ok () {
if ($(`#${this.lineData.id}`).prev().attr('class') === 'jtk-overlay') {
$(`#${this.lineData.id}`).prev().empty()
}
},
$(`#${this.lineData.id}`).text(this.labelName)
this.$emit('addLineInfo', {
item: {
labelName: this.labelName,
sourceId: this.lineData.sourceId,
targetId: this.lineData.targetId
},
fromThis: this
})
}
},
watch: {
},
created () {
if($(`#${this.lineData.id}`).prev().attr('class').indexOf('jtk-overlay')!==-1) {
if ($(`#${this.lineData.id}`).prev().attr('class').indexOf('jtk-overlay') !== -1) {
this.labelName = $(`#${this.lineData.id}`).prev().text()
} else {
this.labelName = $(`#${this.lineData.id}`).text()
}
},
mounted () {
},
updated () {
},
@ -109,7 +109,7 @@
destroyed () {
},
computed: {
},
components: {}
}

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

@ -342,8 +342,8 @@
successBranch: '',
failedBranch: '',
conditionResult: {
'successNode': [],
'failedNode': []
successNode: [],
failedNode: []
},
// dependence
dependence: {},
@ -369,7 +369,7 @@
taskInstancePriority: 'MEDIUM',
// worker group id
workerGroup: 'default',
stateList:[
stateList: [
{
value: 'success',
label: `${i18n.$t('success')}`
@ -381,8 +381,8 @@
],
// preTasks
preTaskIdsInWorkflow: [],
preTasksToAdd: [], // pre-taskIds to add, used in jsplumb connects
preTasksToDelete: [], // pre-taskIds to delete, used in jsplumb connects
preTasksToAdd: [], // pre-taskIds to add, used in jsplumb connects
preTasksToDelete: [] // pre-taskIds to delete, used in jsplumb connects
}
},
/**
@ -463,12 +463,12 @@
}
this.store.dispatch('dag/getSubProcessId', { taskId: stateId }).then(res => {
this.$emit('onSubProcess', {
subProcessId: res.data.subProcessInstanceId,
fromThis: this
})
}).catch(e => {
subProcessId: res.data.subProcessInstanceId,
fromThis: this
})
}).catch(e => {
this.$message.error(e.msg || '')
})
})
} else {
this.$emit('onSubProcess', {
subProcessId: this.backfillItem.params.processDefinitionId,
@ -522,7 +522,7 @@
this.$message.warning(`${i18n.$t('Please enter name (required)')}`)
return false
}
if (this.successBranch !='' && this.successBranch !=null && this.successBranch == this.failedBranch) {
if (this.successBranch != '' && this.successBranch != null && this.successBranch == this.failedBranch) {
this.$message.warning(`${i18n.$t('Cannot select the same node for successful branch flow and failed branch flow')}`)
return false
}
@ -536,13 +536,13 @@
}
return true
},
_verifWorkGroup() {
_verifWorkGroup () {
let item = this.store.state.security.workerGroupsListAll.find(item => {
return item.id == this.workerGroup;
});
if(item==undefined) {
return item.id == this.workerGroup
})
if (item == undefined) {
this.$message.warning(`${i18n.$t('The Worker group no longer exists, please select the correct Worker group!')}`)
return false;
return false
}
return true
},
@ -555,30 +555,29 @@
return
}
// verif workGroup
if(!this._verifWorkGroup()) {
if (!this._verifWorkGroup()) {
return
}
// Verify task alarm parameters
if (this.nodeData.taskType === 'DEPENDENT') {
if (!this.$refs['dependentTimeout']._verification()) {
if (!this.$refs.dependentTimeout._verification()) {
return
}
} else {
if (!this.$refs['timeout']._verification()) {
if (!this.$refs.timeout._verification()) {
return
}
}
// Verify node parameters
if (!this.$refs[this.nodeData.taskType]._verification()) {
return
}
// Verify preTasks and update dag-things
if (this.$refs['PRE_TASK']) {
if (!this.$refs['PRE_TASK']._verification()) {
if (this.$refs.PRE_TASK) {
if (!this.$refs.PRE_TASK._verification()) {
return
}
else {
} else {
// Sync data-targetarr
$(`#${this.nodeData.id}`).attr(
'data-targetarr', this.preTaskIdsInWorkflow ? this.preTaskIdsInWorkflow.join(',') : '')
@ -594,7 +593,7 @@
target: targetId,
type: 'basic',
paintStyle: { strokeWidth: 2, stroke: '#2d8cf0' },
HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3}
HoverPaintStyle: { stroke: '#ccc', strokeWidth: 3 }
})
})
@ -680,7 +679,7 @@
fromThis: this
})
}
},
},
watch: {
/**
* Watch the item change, cache the value it changes
@ -695,7 +694,7 @@
// Backfill data
let taskList = this.store.state.dag.tasks
//fillback use cacheTasks
// fillback use cacheTasks
let cacheTasks = this.store.state.dag.cacheTasks
let o = {}
if (cacheTasks[this.nodeData.id]) {
@ -720,21 +719,21 @@
this.maxRetryTimes = o.maxRetryTimes
this.retryInterval = o.retryInterval
this.delayTime = o.delayTime
if(o.conditionResult) {
if (o.conditionResult) {
this.successBranch = o.conditionResult.successNode[0]
this.failedBranch = o.conditionResult.failedNode[0]
}
// If the workergroup has been deleted, set the default workergroup
var hasMatch = false;
// If the workergroup has been deleted, set the default workergroup
var hasMatch = false
for (let i = 0; i < this.store.state.security.workerGroupsListAll.length; i++) {
var workerGroup = this.store.state.security.workerGroupsListAll[i].id
if (o.workerGroup == workerGroup) {
hasMatch = true;
break;
hasMatch = true
break
}
}
if(o.workerGroup == undefined) {
this.store.dispatch('dag/getTaskInstanceList',{
if (o.workerGroup == undefined) {
this.store.dispatch('dag/getTaskInstanceList', {
pageSize: 10, pageNo: 1, processInstanceId: this.nodeData.instanceId, name: o.name
}).then(res => {
this.workerGroup = res.totalList[0].workerGroup
@ -746,7 +745,6 @@
this.params = o.params || {}
this.dependence = o.dependence || {}
this.cacheDependence = o.dependence || {}
} else {
this.workerGroup = this.store.state.security.workerGroupsListAll[0].id
}
@ -765,10 +763,10 @@
},
mounted () {
let self = this
$("#cancelBtn").mousedown(function(event){
event.preventDefault();
$('#cancelBtn').mousedown(function (event) {
event.preventDefault()
self.close()
});
})
},
updated () {
},
@ -784,7 +782,7 @@
return this.nodeData.taskType === 'SUB_PROCESS' && this.name
},
//Define the item model
// Define the item model
_item () {
return {
type: this.nodeData.taskType,
@ -826,7 +824,7 @@
mDependentTimeout,
mPriority,
mWorkerGroups,
mPreTasks,
mPreTasks
}
}
</script>

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

@ -67,7 +67,7 @@
*/
const handerTextareaSize = (isH = 0) => {
$('body').find('.tooltip.fade.top.in').remove()
return $('.textarea-ft').css({ 'height': `${$('.content-log-box').height() - isH}px` })
return $('.textarea-ft').css({ height: `${$('.content-log-box').height() - isH}px` })
}
let content = ''
@ -179,8 +179,8 @@
this.loadingIndex = this.loadingIndex - 1
this._ckLog()
}, 1000, {
'leading': false,
'trailing': true
leading: false,
trailing: true
}),
/**
* down
@ -189,8 +189,8 @@
this.loadingIndex = this.loadingIndex + 1
this._ckLog()
}, 1000, {
'leading': false,
'trailing': true
leading: false,
trailing: true
}),
/**
* Monitor scroll bar

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

@ -128,7 +128,7 @@
this.$emit('on-dsData', {
type: this.type,
datasource: val
});
})
}
},
created () {

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

@ -74,7 +74,7 @@
props: {
dependItemList: Array,
index: Number,
dependTaskList:Array
dependTaskList: Array
},
model: {
prop: 'dependItemList',
@ -109,7 +109,7 @@
* remove task
*/
_remove (i) {
this.dependTaskList[this.index].dependItemList.splice(i,1)
this.dependTaskList[this.index].dependItemList.splice(i, 1)
this._removeTip()
if (!this.dependItemList.length || this.dependItemList.length === 0) {
this.$emit('on-delete-all', {
@ -176,14 +176,14 @@
*/
_onChangeProjectId (value) {
this._getProcessByProjectId(value).then(definitionList => {
/*this.$set(this.dependItemList, this.itemIndex, this._dlOldParams(value, definitionList, item))*/
/* this.$set(this.dependItemList, this.itemIndex, this._dlOldParams(value, definitionList, item)) */
let definitionId = definitionList[0].value
this._getDependItemList(definitionId).then(depTasksList => {
let item = this.dependItemList[this.itemIndex]
// init set depTasks All
item.depTasks = 'ALL'
// set dependItemList item data
this.$set(this.dependItemList, this.itemIndex, this._cpOldParams(value,definitionId, definitionList,depTasksList, item))
this.$set(this.dependItemList, this.itemIndex, this._cpOldParams(value, definitionId, definitionList, depTasksList, item))
})
})
},
@ -212,7 +212,7 @@
depTasksList: depTasksList,
cycle: 'day',
dateValue: 'today',
dateValueList: _.cloneDeep(dateValueList['day']),
dateValueList: _.cloneDeep(dateValueList.day),
state: ''
}
},
@ -231,7 +231,7 @@
}
},
_cpOldParams (value,definitionId, definitionList,depTasksList, item) {
_cpOldParams (value, definitionId, definitionList, depTasksList, item) {
return {
projectId: value,
definitionList: definitionList,

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

@ -83,7 +83,7 @@
// Current execution index
httpParamsIndex: null,
//
positionList:positionList
positionList: positionList
}
},
mixins: [disabledState],
@ -142,7 +142,7 @@
if (!v.prop) {
flag = false
}
if(v.value === ''){
if (v.value === '') {
this.$message.warning(`${i18n.$t('value is empty')}`)
return false
}
@ -173,7 +173,7 @@
}
})
if (!flag) {
this.$message.warning(`${i18n.$t('value is empty')}`)
this.$message.warning(`${i18n.$t('value is empty')}`)
return false
}
this.$emit('on-http-params', _.cloneDeep(this.httpParamsList))
@ -191,7 +191,7 @@
},
computed: {
inputStyle () {
return "width:30%"
return 'width:30%'
}
},
mounted () {
@ -240,4 +240,3 @@
}
}
</style>

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

@ -43,7 +43,7 @@
data () {
return {
// script
rawScript: '',
rawScript: ''
}
},
mixins: [disabledState],
@ -56,13 +56,13 @@
*/
_handlerEditor () {
// editor
let self =this
let self = this
editor = codemirror('code-shell-mirror1', {
mode: 'shell',
readOnly: this.isDetails
})
editor.on("change",function(){
self.$emit('getJsonBoxValue',editor.getValue())
editor.on('change', function () {
self.$emit('getJsonBoxValue', editor.getValue())
})
this.keypress = () => {
@ -79,7 +79,7 @@
editor.setValue(this.rawScript)
return editor
},
}
},
watch: {},
created () {

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

@ -64,7 +64,7 @@
props: {
dependItemList: Array,
index: Number,
dependTaskList:Array,
dependTaskList: Array,
preNode: Array
},
model: {
@ -78,7 +78,7 @@
_add () {
// btn loading
this.isLoading = true
this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams()))
this.$emit('dependItemListEvent', _.concat(this.dependItemList, this._rtNewParams()))
// remove tooltip
this._removeTip()
@ -87,7 +87,7 @@
* remove task
*/
_remove (i) {
this.dependTaskList[this.index].dependItemList.splice(i,1)
this.dependTaskList[this.index].dependItemList.splice(i, 1)
this._removeTip()
if (!this.dependItemList.length || this.dependItemList.length === 0) {
this.$emit('on-delete-all', {
@ -137,7 +137,7 @@
status: ''
}
},
_rtOldParams (value,depTasksList, item) {
_rtOldParams (value, depTasksList, item) {
return {
depTasks: '',
status: ''

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

@ -43,7 +43,7 @@
data () {
return {
// script
rawScript: '',
rawScript: ''
}
},
mixins: [disabledState],
@ -56,13 +56,13 @@
*/
_handlerEditor () {
// editor
let self =this
let self = this
editor = codemirror('code-shell-mirror1', {
mode: 'shell',
readOnly: this.isDetails
})
editor.on("change",function(){
self.$emit('getSriptBoxValue',editor.getValue())
editor.on('change', function () {
self.$emit('getSriptBoxValue', editor.getValue())
})
this.keypress = () => {
@ -79,7 +79,7 @@
editor.setValue(this.rawScript)
return editor
},
}
},
watch: {},
created () {

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

@ -25,7 +25,7 @@
v-for="city in udfsList"
:key="city.id"
:value="city.id"
:label="city.code">
:label="city.code">
</el-option>
</el-select>
</div>

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

@ -99,9 +99,9 @@
$('body').find('.tooltip.fade.top.in').remove()
},
_onDeleteAll (i) {
this.dependTaskList.map((item,i)=>{
if(item.dependItemList.length === 0){
this.dependTaskList.splice(i,1)
this.dependTaskList.map((item, i) => {
if (item.dependItemList.length === 0) {
this.dependTaskList.splice(i, 1)
}
})
// this._deleteDep(i)
@ -109,7 +109,7 @@
_setGlobalRelation () {
this.relation = this.relation === 'AND' ? 'OR' : 'AND'
},
getDependTaskList(i){
getDependTaskList (i) {
// console.log('getDependTaskList',i)
},
_setRelation (i) {
@ -143,7 +143,7 @@
created () {
let o = this.backfillItem
let dependentResult = $(`#${o.id}`).data('dependent-result') || {}
// Does not represent an empty object backfill
if (!_.isEmpty(o)) {
this.relation = _.cloneDeep(o.dependence.relation) || 'AND'
@ -151,11 +151,11 @@
let defaultState = this.isDetails ? 'WAITING' : ''
// Process instance return status display matches by key
_.map(this.dependTaskList, v => _.map(v.dependItemList, v1 => {
$(`#${o.id}`).siblings().each(function(){
if(v1.depTasks == $(this).text()) {
$(`#${o.id}`).siblings().each(function () {
if (v1.depTasks == $(this).text()) {
v1.state = $(this).attr('data-dependent-depstate')
}
});
})
}))
}
},

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

@ -214,12 +214,12 @@
// Custom parameter
localParams: [],
customConfig: 0,
//jvm memory xms
// jvm memory xms
xms: 1,
//jvm memory xms
// jvm memory xms
xmx: 1,
scriptBoxDialog: false,
item: '',
item: ''
}
},
mixins: [disabledState],
@ -228,7 +228,7 @@
createNodeId: Number
},
methods: {
setEditorVal() {
setEditorVal () {
this.item = editor.getValue()
this.scriptBoxDialog = true
},
@ -236,7 +236,7 @@
editor.setValue(val)
},
_onSwitch (is) {
if(is) {
if (is) {
this.customConfig = 1
setTimeout(() => {
this._handlerJsonEditor()
@ -284,7 +284,7 @@
* verification
*/
_verification () {
if(this.customConfig) {
if (this.customConfig) {
if (!jsonEditor.getValue()) {
this.$message.warning(`${i18n.$t('Please enter a JSON Statement(required)')}`)
return false
@ -300,8 +300,8 @@
customConfig: this.customConfig,
json: jsonEditor.getValue(),
localParams: this.localParams,
xms:+this.xms,
xmx:+this.xmx
xms: +this.xms,
xmx: +this.xmx
})
return true
} else {
@ -349,8 +349,8 @@
jobSpeedRecord: this.jobSpeedRecord,
preStatements: this.preStatements,
postStatements: this.postStatements,
xms:+this.xms,
xmx:+this.xmx
xms: +this.xms,
xmx: +this.xmx
})
return true
}
@ -420,25 +420,25 @@
dataSource: this.rtDatasource,
dtType: this.dtType,
dataTarget: this.rtDatatarget,
sql: editor?editor.getValue():'',
sql: editor ? editor.getValue() : '',
targetTable: this.targetTable,
jobSpeedByte: this.jobSpeedByte * 1024,
jobSpeedRecord: this.jobSpeedRecord,
preStatements: this.preStatements,
postStatements: this.postStatements,
xms: +this.xms,
xmx: +this.xmx,
});
xmx: +this.xmx
})
},
_destroyEditor () {
if (editor) {
if (editor) {
editor.toTextArea() // Uninstall
editor.off($('.code-sql-mirror'), 'keypress', this.keypress)
editor.off($('.code-sql-mirror'), 'changes', this.changes)
}
},
_destroyJsonEditor () {
if (jsonEditor) {
if (jsonEditor) {
jsonEditor.toTextArea() // Uninstall
jsonEditor.off($('.code-json-mirror'), 'keypress', this.keypress)
jsonEditor.off($('.code-json-mirror'), 'changes', this.changes)
@ -450,12 +450,11 @@
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
// set jvm memory
this.xms = o.params.xms || 1 ;
this.xmx = o.params.xmx || 1 ;
this.xms = o.params.xms || 1
this.xmx = o.params.xmx || 1
// backfill
if(o.params.customConfig == 0) {
if (o.params.customConfig == 0) {
this.customConfig = 0
this.enable = false
this.dsType = o.params.dsType || ''
@ -477,7 +476,7 @@
}
},
mounted () {
if(this.customConfig) {
if (this.customConfig) {
setTimeout(() => {
this._handlerJsonEditor()
}, 200)
@ -501,9 +500,9 @@
}
},
watch: {
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this._cacheParams();
this._cacheParams()
}
},
computed: {

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

@ -97,9 +97,9 @@
$('body').find('.tooltip.fade.top.in').remove()
},
_onDeleteAll (i) {
this.dependTaskList.map((item,i)=>{
if(item.dependItemList.length === 0){
this.dependTaskList.splice(i,1)
this.dependTaskList.map((item, i) => {
if (item.dependItemList.length === 0) {
this.dependTaskList.splice(i, 1)
}
})
// this._deleteDep(i)
@ -107,7 +107,7 @@
_setGlobalRelation () {
this.relation = this.relation === 'AND' ? 'OR' : 'AND'
},
getDependTaskList(i){
getDependTaskList (i) {
// console.log('getDependTaskList',i)
},
_setRelation (i) {

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

@ -226,17 +226,17 @@
// Program type(List)
programTypeList: [{ code: 'JAVA' }, { code: 'SCALA' }, { code: 'PYTHON' }],
flinkVersion:'<1.10',
flinkVersion: '<1.10',
// Flink Versions(List)
flinkVersionList: [{ code: '<1.10' }, { code: '>=1.10' }],
normalizer(node) {
normalizer (node) {
return {
label: node.name
}
},
allNoResources: [],
noRes: [],
noRes: []
}
},
props: {
@ -247,10 +247,10 @@
/**
* getResourceId
*/
marjarId(name) {
this.store.dispatch('dag/getResourceId',{
marjarId (name) {
this.store.dispatch('dag/getResourceId', {
type: 'FILE',
fullName: '/'+name
fullName: '/' + name
}).then(res => {
this.mainJar = res.id
}).catch(e => {
@ -284,7 +284,6 @@
return false
}
if (!this.mainJar) {
this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
return false
@ -311,7 +310,7 @@
}
// noRes
if (this.noRes.length>0) {
if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
return false
}
@ -329,7 +328,7 @@
},
deployMode: this.deployMode,
resourceList: _.map(this.resourceList, v => {
return {id: v}
return { id: v }
}),
localParams: this.localParams,
flinkVersion: this.flinkVersion,
@ -343,55 +342,55 @@
})
return true
},
diGuiTree(item) { // Recursive convenience tree structure
diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?        
this.operationTree(item) : this.diGuiTree(item.children);
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
? this.operationTree(item) : this.diGuiTree(item.children)
})
},
operationTree(item) {
if(item.dirctory) {
item.isDisabled =true
operationTree (item) {
if (item.dirctory) {
item.isDisabled = true
}
delete item.children
},
searchTree(element, id) {
searchTree (element, id) {
// id
if (element.id == id) {
return element;
return element
} else if (element.children != null) {
var i;
var result = null;
var i
var result = null
for (i = 0; result == null && i < element.children.length; i++) {
result = this.searchTree(element.children[i], id);
result = this.searchTree(element.children[i], id)
}
return result;
return result
}
return null;
return null
},
dataProcess(backResource) {
dataProcess (backResource) {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.mainJarList.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.mainJarList.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
resourceIdArr = isResourceId.map(item => {
return item.id
})
Array.prototype.diff = function(a) {
return this.filter(function(i) {return a.indexOf(i) < 0;});
};
let diffSet = this.resourceList.diff(resourceIdArr);
Array.prototype.diff = function (a) {
return this.filter(function (i) { return a.indexOf(i) < 0 })
}
let diffSet = this.resourceList.diff(resourceIdArr)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
backResource.forEach(item1=>{
if(item==item1.id || item==item1.res) {
if (diffSet.length > 0) {
diffSet.forEach(item => {
backResource.forEach(item1 => {
if (item == item1.id || item == item1.res) {
optionsCmp.push(item1)
}
})
@ -400,22 +399,22 @@
let noResources = [{
id: -1,
name: $t('Unauthorized or deleted resources'),
fullName: '/'+$t('Unauthorized or deleted resources'),
fullName: '/' + $t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
if (optionsCmp.length > 0) {
this.allNoResources = optionsCmp
optionsCmp = optionsCmp.map(item=>{
return {id: item.id,name: item.name,fullName: item.res}
optionsCmp = optionsCmp.map(item => {
return { id: item.id, name: item.name, fullName: item.res }
})
optionsCmp.forEach(item=>{
optionsCmp.forEach(item => {
item.isNew = true
})
noResources[0].children = optionsCmp
this.mainJarList = this.mainJarList.concat(noResources)
}
}
},
}
},
watch: {
// Listening type
@ -424,33 +423,33 @@
this.mainClass = ''
}
},
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this.$emit('on-cache-params', val);
this.$emit('on-cache-params', val)
}
},
computed: {
cacheParams () {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.mainJarList.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.mainJarList.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
return {id: item.id,name: item.name,res: item.fullName}
resourceIdArr = isResourceId.map(item => {
return { id: item.id, name: item.name, res: item.fullName }
})
}
let result = []
resourceIdArr.forEach(item=>{
this.allNoResources.forEach(item1=>{
if(item.id==item1.id) {
resourceIdArr.forEach(item => {
this.allNoResources.forEach(item1 => {
if (item.id == item1.id) {
// resultBool = true
result.push(item1)
result.push(item1)
}
})
})
@ -474,65 +473,64 @@
}
},
created () {
let item = this.store.state.dag.resourcesListS
let items = this.store.state.dag.resourcesListJar
this.diGuiTree(item)
this.diGuiTree(items)
this.mainJarList = item
this.mainJarLists = items
let o = this.backfillItem
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.mainClass = o.params.mainClass || ''
if(o.params.mainJar.res) {
this.marjarId(o.params.mainJar.res)
} else if(o.params.mainJar.res=='') {
this.mainJar = ''
} else {
this.mainJar = o.params.mainJar.id || ''
}
this.deployMode = o.params.deployMode || ''
this.flinkVersion = o.params.flinkVersion || '<1.10'
this.slot = o.params.slot || 1
this.taskManager = o.params.taskManager || '2'
this.jobManagerMemory = o.params.jobManagerMemory || '1G'
this.taskManagerMemory = o.params.taskManagerMemory || '2G'
let item = this.store.state.dag.resourcesListS
let items = this.store.state.dag.resourcesListJar
this.diGuiTree(item)
this.diGuiTree(items)
this.mainJarList = item
this.mainJarLists = items
let o = this.backfillItem
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.mainClass = o.params.mainClass || ''
if (o.params.mainJar.res) {
this.marjarId(o.params.mainJar.res)
} else if (o.params.mainJar.res == '') {
this.mainJar = ''
} else {
this.mainJar = o.params.mainJar.id || ''
}
this.deployMode = o.params.deployMode || ''
this.flinkVersion = o.params.flinkVersion || '<1.10'
this.slot = o.params.slot || 1
this.taskManager = o.params.taskManager || '2'
this.jobManagerMemory = o.params.jobManagerMemory || '1G'
this.taskManagerMemory = o.params.taskManagerMemory || '2G'
this.mainArgs = o.params.mainArgs || ''
this.others = o.params.others
this.programType = o.params.programType || 'SCALA'
this.mainArgs = o.params.mainArgs || ''
this.others = o.params.others
this.programType = o.params.programType || 'SCALA'
// backfill resourceList
let backResource = o.params.resourceList || []
let resourceList = o.params.resourceList || []
if (resourceList.length) {
_.map(resourceList, v => {
if(!v.id) {
this.store.dispatch('dag/getResourceId',{
type: 'FILE',
fullName: '/'+v.res
}).then(res => {
this.resourceList.push(res.id)
this.dataProcess(backResource)
}).catch(e => {
this.resourceList.push(v.res)
this.dataProcess(backResource)
})
} else {
this.resourceList.push(v.id)
// backfill resourceList
let backResource = o.params.resourceList || []
let resourceList = o.params.resourceList || []
if (resourceList.length) {
_.map(resourceList, v => {
if (!v.id) {
this.store.dispatch('dag/getResourceId', {
type: 'FILE',
fullName: '/' + v.res
}).then(res => {
this.resourceList.push(res.id)
this.dataProcess(backResource)
}
})
this.cacheResourceList = resourceList
}
}).catch(e => {
this.resourceList.push(v.res)
this.dataProcess(backResource)
})
} else {
this.resourceList.push(v.id)
this.dataProcess(backResource)
}
})
this.cacheResourceList = resourceList
}
// backfill localParams
let localParams = o.params.localParams || []
if (localParams.length) {
this.localParams = localParams
}
// backfill localParams
let localParams = o.params.localParams || []
if (localParams.length) {
this.localParams = localParams
}
}
},
mounted () {

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

@ -89,7 +89,6 @@
</div>
</m-list-box>
<m-list-box >
<div slot="text">{{$t('Timeout Settings')}}</div>
<div slot="content">
@ -144,8 +143,8 @@
data () {
return {
timeoutSettings: false,
connectTimeout : 60000 ,
socketTimeout : 60000 ,
connectTimeout: 60000,
socketTimeout: 60000,
url: '',
condition: '',
@ -154,7 +153,7 @@
httpMethod: 'GET',
httpMethodList: [{ code: 'GET' }, { code: 'POST' }, { code: 'HEAD' }, { code: 'PUT' }, { code: 'DELETE' }],
httpCheckCondition: 'STATUS_CODE_DEFAULT',
httpCheckConditionList: cookies.get('language') == 'en_US'? [{ code: 'STATUS_CODE_DEFAULT',value:'Default response code 200' }, { code: 'STATUS_CODE_CUSTOM',value:'Custom response code' }, { code: 'BODY_CONTAINS',value:'Content includes' }, { code: 'BODY_NOT_CONTAINS',value:'Content does not contain' }]:[{ code: 'STATUS_CODE_DEFAULT',value:'默认响应码200' }, { code: 'STATUS_CODE_CUSTOM',value:'自定义响应码' }, { code: 'BODY_CONTAINS',value:'内容包含' }, { code: 'BODY_NOT_CONTAINS',value:'内容不包含' }]
httpCheckConditionList: cookies.get('language') == 'en_US' ? [{ code: 'STATUS_CODE_DEFAULT', value: 'Default response code 200' }, { code: 'STATUS_CODE_CUSTOM', value: 'Custom response code' }, { code: 'BODY_CONTAINS', value: 'Content includes' }, { code: 'BODY_NOT_CONTAINS', value: 'Content does not contain' }] : [{ code: 'STATUS_CODE_DEFAULT', value: '默认响应码200' }, { code: 'STATUS_CODE_CUSTOM', value: '自定义响应码' }, { code: 'BODY_CONTAINS', value: '内容包含' }, { code: 'BODY_NOT_CONTAINS', value: '内容不包含' }]
}
},
props: {
@ -205,8 +204,8 @@
httpMethod: this.httpMethod,
httpCheckCondition: this.httpCheckCondition,
condition: this.condition,
connectTimeout : this.connectTimeout ,
socketTimeout : this.socketTimeout
connectTimeout: this.connectTimeout,
socketTimeout: this.socketTimeout
})
return true
}
@ -220,8 +219,8 @@
httpMethod: this.httpMethod,
httpCheckCondition: this.httpCheckCondition,
condition: this.condition,
connectTimeout : this.connectTimeout ,
socketTimeout : this.socketTimeout
connectTimeout: this.connectTimeout,
socketTimeout: this.socketTimeout
}
}
},
@ -231,32 +230,32 @@
* @param val
*/
cacheParams (val) {
this.$emit('on-cache-params', val);
this.$emit('on-cache-params', val)
}
},
created () {
let o = this.backfillItem
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.url = o.params.url || ''
this.httpMethod = o.params.httpMethod || 'GET'
this.httpCheckCondition = o.params.httpCheckCondition || 'DEFAULT'
this.condition = o.params.condition || ''
this.connectTimeout = o.params.connectTimeout
this.socketTimeout = o.params.socketTimeout
if(this.connectTimeout != 60000 || this.socketTimeout != 60000 ){
this.timeoutSettings = true
}
// backfill localParams
let localParams = o.params.localParams || []
if (localParams.length) {
this.localParams = localParams
}
let httpParams = o.params.httpParams || []
if (httpParams.length) {
this.httpParams = httpParams
}
let o = this.backfillItem
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.url = o.params.url || ''
this.httpMethod = o.params.httpMethod || 'GET'
this.httpCheckCondition = o.params.httpCheckCondition || 'DEFAULT'
this.condition = o.params.condition || ''
this.connectTimeout = o.params.connectTimeout
this.socketTimeout = o.params.socketTimeout
if (this.connectTimeout != 60000 || this.socketTimeout != 60000) {
this.timeoutSettings = true
}
// backfill localParams
let localParams = o.params.localParams || []
if (localParams.length) {
this.localParams = localParams
}
let httpParams = o.params.httpParams || []
if (httpParams.length) {
this.httpParams = httpParams
}
}
},
mounted () {
},

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

@ -131,7 +131,7 @@
programType: 'JAVA',
// Program type(List)
programTypeList: [{ code: 'JAVA' }, { code: 'PYTHON' }],
normalizer(node) {
normalizer (node) {
return {
label: node.name
}
@ -148,10 +148,10 @@
/**
* getResourceId
*/
marjarId(name) {
this.store.dispatch('dag/getResourceId',{
marjarId (name) {
this.store.dispatch('dag/getResourceId', {
type: 'FILE',
fullName: '/'+name
fullName: '/' + name
}).then(res => {
this.mainJar = res.id
}).catch(e => {
@ -176,55 +176,55 @@
_onCacheResourcesData (a) {
this.cacheResourceList = a
},
diGuiTree(item) { // Recursive convenience tree structure
diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?        
this.operationTree(item) : this.diGuiTree(item.children);
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
? this.operationTree(item) : this.diGuiTree(item.children)
})
},
operationTree(item) {
if(item.dirctory) {
item.isDisabled =true
operationTree (item) {
if (item.dirctory) {
item.isDisabled = true
}
delete item.children
},
searchTree(element, id) {
searchTree (element, id) {
// id
if (element.id == id) {
return element;
return element
} else if (element.children != null) {
var i;
var result = null;
var i
var result = null
for (i = 0; result == null && i < element.children.length; i++) {
result = this.searchTree(element.children[i], id);
result = this.searchTree(element.children[i], id)
}
return result;
return result
}
return null;
return null
},
dataProcess(backResource) {
dataProcess (backResource) {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.mainJarList.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.mainJarList.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
resourceIdArr = isResourceId.map(item => {
return item.id
})
Array.prototype.diff = function(a) {
return this.filter(function(i) {return a.indexOf(i) < 0;});
};
let diffSet = this.resourceList.diff(resourceIdArr);
Array.prototype.diff = function (a) {
return this.filter(function (i) { return a.indexOf(i) < 0 })
}
let diffSet = this.resourceList.diff(resourceIdArr)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
backResource.forEach(item1=>{
if(item==item1.id || item==item1.res) {
if (diffSet.length > 0) {
diffSet.forEach(item => {
backResource.forEach(item1 => {
if (item == item1.id || item == item1.res) {
optionsCmp.push(item1)
}
})
@ -233,15 +233,15 @@
let noResources = [{
id: -1,
name: $t('Unauthorized or deleted resources'),
fullName: '/'+$t('Unauthorized or deleted resources'),
fullName: '/' + $t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
if (optionsCmp.length > 0) {
this.allNoResources = optionsCmp
optionsCmp = optionsCmp.map(item=>{
return {id: item.id,name: item.name,fullName: item.res}
optionsCmp = optionsCmp.map(item => {
return { id: item.id, name: item.name, fullName: item.res }
})
optionsCmp.forEach(item=>{
optionsCmp.forEach(item => {
item.isNew = true
})
noResources[0].children = optionsCmp
@ -264,7 +264,7 @@
}
// noRes
if (this.noRes.length>0) {
if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
return false
}
@ -280,7 +280,7 @@
id: this.mainJar
},
resourceList: _.map(this.resourceList, v => {
return {id: v}
return { id: v }
}),
localParams: this.localParams,
mainArgs: this.mainArgs,
@ -288,8 +288,8 @@
programType: this.programType
})
return true
},
}
},
watch: {
/**
@ -300,33 +300,33 @@
this.mainClass = ''
}
},
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this.$emit('on-cache-params', val);
this.$emit('on-cache-params', val)
}
},
computed: {
cacheParams () {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.mainJarList.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.mainJarList.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
return {id: item.id,name: item.name,res: item.fullName}
resourceIdArr = isResourceId.map(item => {
return { id: item.id, name: item.name, res: item.fullName }
})
}
let result = []
resourceIdArr.forEach(item=>{
this.allNoResources.forEach(item1=>{
if(item.id==item1.id) {
resourceIdArr.forEach(item => {
this.allNoResources.forEach(item1 => {
if (item.id == item1.id) {
// resultBool = true
result.push(item1)
result.push(item1)
}
})
})
@ -345,58 +345,58 @@
}
},
created () {
let item = this.store.state.dag.resourcesListS
let items = this.store.state.dag.resourcesListJar
this.diGuiTree(item)
this.diGuiTree(items)
this.mainJarList = item
this.mainJarLists = items
let o = this.backfillItem
let item = this.store.state.dag.resourcesListS
let items = this.store.state.dag.resourcesListJar
this.diGuiTree(item)
this.diGuiTree(items)
this.mainJarList = item
this.mainJarLists = items
let o = this.backfillItem
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.mainClass = o.params.mainClass || ''
if(o.params.mainJar.res) {
this.marjarId(o.params.mainJar.res)
} else if(o.params.mainJar.res=='') {
this.mainJar = ''
} else {
this.mainJar = o.params.mainJar.id || ''
}
this.mainArgs = o.params.mainArgs || ''
this.others = o.params.others
this.programType = o.params.programType || 'JAVA'
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.mainClass = o.params.mainClass || ''
if (o.params.mainJar.res) {
this.marjarId(o.params.mainJar.res)
} else if (o.params.mainJar.res == '') {
this.mainJar = ''
} else {
this.mainJar = o.params.mainJar.id || ''
}
this.mainArgs = o.params.mainArgs || ''
this.others = o.params.others
this.programType = o.params.programType || 'JAVA'
// backfill resourceList
let resourceList = o.params.resourceList || []
if (resourceList.length) {
_.map(resourceList, v => {
if(!v.id) {
this.store.dispatch('dag/getResourceId',{
type: 'FILE',
fullName: '/'+v.res
}).then(res => {
this.resourceList.push(res.id)
this.dataProcess(backResource)
}).catch(e => {
this.resourceList.push(v.res)
this.dataProcess(backResource)
})
} else {
this.resourceList.push(v.id)
// backfill resourceList
let resourceList = o.params.resourceList || []
if (resourceList.length) {
_.map(resourceList, v => {
if (!v.id) {
this.store.dispatch('dag/getResourceId', {
type: 'FILE',
fullName: '/' + v.res
}).then(res => {
this.resourceList.push(res.id)
this.dataProcess(backResource)
}
})
this.cacheResourceList = resourceList
}
}).catch(e => {
this.resourceList.push(v.res)
this.dataProcess(backResource)
})
} else {
this.resourceList.push(v.id)
this.dataProcess(backResource)
}
})
this.cacheResourceList = resourceList
}
// backfill localParams
let backResource = o.params.resourceList || []
let localParams = o.params.localParams || []
if (localParams.length) {
this.localParams = localParams
}
// backfill localParams
let backResource = o.params.resourceList || []
let localParams = o.params.localParams || []
if (localParams.length) {
this.localParams = localParams
}
}
},
mounted () {

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

@ -53,15 +53,15 @@
},
data () {
return {
preTasksSelectorId: '_preTasksSelectorId', // Refresh target vue-component by changing id
preTasksSelectorId: '_preTasksSelectorId', // Refresh target vue-component by changing id
preTasks: [],
preTasksOld: [],
preTasksOld: []
}
},
mounted () {
this.preTasks = this.backfillItem['preTasks'] || this.preTasks
this.preTasks = this.backfillItem.preTasks || this.preTasks
this.preTasksOld = this.preTasks
// Refresh target vue-component by changing id
this.$nextTick(() => {
this.preTasksSelectorId = 'preTasksSelectorId'
@ -69,7 +69,7 @@
},
computed: {
preTaskList: function () {
let currentTaskId = this.backfillItem['id'] || this.id
let currentTaskId = this.backfillItem.id || this.id
let cacheTasks = Object.assign({}, this.store.state.dag.tasks)
let keys = Object.keys(cacheTasks)
for (let i = 0; i < keys.length; i++) {
@ -92,7 +92,7 @@
// preTaskIds used to delete connection
preTasksToDelete: function () {
return this.preTasksOld.filter(taskId => this.preTasks.indexOf(taskId) === -1)
},
}
},
methods: {
// Pass data to parent-level to process dag
@ -100,7 +100,7 @@
this.$emit('on-pre-tasks', {
preTasks: this.preTasks,
preTasksToAdd: this.preTasksToAdd,
preTasksToDelete: this.preTasksToDelete,
preTasksToDelete: this.preTasksToDelete
})
return true
}

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

@ -122,9 +122,9 @@
}
},
watch: {
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this.$emit('on-cache-params', val);
this.$emit('on-cache-params', val)
}
},
computed: {

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

@ -84,7 +84,7 @@
// Cache ResourceList
cacheResourceList: [],
resourceOptions: [],
normalizer(node) {
normalizer (node) {
return {
label: node.name
}
@ -106,7 +106,7 @@
_onLocalParams (a) {
this.localParams = a
},
setEditorVal() {
setEditorVal () {
this.item = editor.getValue()
this.scriptBoxDialog = true
},
@ -141,7 +141,7 @@
}
// noRes
if (this.noRes.length>0) {
if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
return false
}
@ -149,7 +149,7 @@
// storage
this.$emit('on-params', {
resourceList: _.map(this.resourceList, v => {
return {id: v}
return { id: v }
}),
localParams: this.localParams,
rawScript: editor.getValue()
@ -181,55 +181,55 @@
return editor
},
diGuiTree(item) { // Recursive convenience tree structure
diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?        
this.operationTree(item) : this.diGuiTree(item.children);
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
? this.operationTree(item) : this.diGuiTree(item.children)
})
},
operationTree(item) {
if(item.dirctory) {
item.isDisabled =true
operationTree (item) {
if (item.dirctory) {
item.isDisabled = true
}
delete item.children
},
searchTree(element, id) {
searchTree (element, id) {
// id
if (element.id == id) {
return element;
return element
} else if (element.children != null) {
var i;
var result = null;
var i
var result = null
for (i = 0; result == null && i < element.children.length; i++) {
result = this.searchTree(element.children[i], id);
result = this.searchTree(element.children[i], id)
}
return result;
return result
}
return null;
return null
},
dataProcess(backResource) {
dataProcess (backResource) {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.resourceOptions.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.resourceOptions.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
resourceIdArr = isResourceId.map(item => {
return item.id
})
Array.prototype.diff = function(a) {
return this.filter(function(i) {return a.indexOf(i) < 0;});
};
let diffSet = this.resourceList.diff(resourceIdArr);
Array.prototype.diff = function (a) {
return this.filter(function (i) { return a.indexOf(i) < 0 })
}
let diffSet = this.resourceList.diff(resourceIdArr)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
backResource.forEach(item1=>{
if(item==item1.id || item==item1.res) {
if (diffSet.length > 0) {
diffSet.forEach(item => {
backResource.forEach(item1 => {
if (item == item1.id || item == item1.res) {
optionsCmp.push(item1)
}
})
@ -238,15 +238,15 @@
let noResources = [{
id: -1,
name: $t('Unauthorized or deleted resources'),
fullName: '/'+$t('Unauthorized or deleted resources'),
fullName: '/' + $t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
if (optionsCmp.length > 0) {
this.allNoResources = optionsCmp
optionsCmp = optionsCmp.map(item=>{
return {id: item.id,name: item.name,fullName: item.res}
optionsCmp = optionsCmp.map(item => {
return { id: item.id, name: item.name, fullName: item.res }
})
optionsCmp.forEach(item=>{
optionsCmp.forEach(item => {
item.isNew = true
})
noResources[0].children = optionsCmp
@ -256,33 +256,33 @@
}
},
watch: {
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this.$emit('on-cache-params', val);
this.$emit('on-cache-params', val)
}
},
computed: {
cacheParams () {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.resourceOptions.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.resourceOptions.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
return {id: item.id,name: item.name,res: item.fullName}
resourceIdArr = isResourceId.map(item => {
return { id: item.id, name: item.name, res: item.fullName }
})
}
let result = []
resourceIdArr.forEach(item=>{
this.allNoResources.forEach(item1=>{
if(item.id==item1.id) {
resourceIdArr.forEach(item => {
this.allNoResources.forEach(item1 => {
if (item.id == item1.id) {
// resultBool = true
result.push(item1)
result.push(item1)
}
})
})
@ -308,10 +308,10 @@
let resourceList = o.params.resourceList || []
if (resourceList.length) {
_.map(resourceList, v => {
if(!v.id) {
this.store.dispatch('dag/getResourceId',{
if (!v.id) {
this.store.dispatch('dag/getResourceId', {
type: 'FILE',
fullName: '/'+v.res
fullName: '/' + v.res
}).then(res => {
this.resourceList.push(res.id)
this.dataProcess(backResource)
@ -343,7 +343,7 @@
editor.toTextArea() // Uninstall
editor.off($('.code-python-mirror'), 'keypress', this.keypress)
},
components: { mLocalParams, mListBox, mResources,Treeselect, mScriptBox }
components: { mLocalParams, mListBox, mResources, Treeselect, mScriptBox }
}
</script>
<style lang="scss" rel="stylesheet/scss" scope>
@ -360,4 +360,4 @@
right: -12px;
top: -16px;
}
</style>
</style>

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

@ -87,7 +87,7 @@
cacheResourceList: [],
// define options
options: [],
normalizer(node) {
normalizer (node) {
return {
label: node.name
}
@ -109,7 +109,7 @@
_onLocalParams (a) {
this.localParams = a
},
setEditorVal() {
setEditorVal () {
this.item = editor.getValue()
this.scriptBoxDialog = true
},
@ -118,7 +118,7 @@
// this.scriptBoxDialog = false
},
closeAble () {
// this.scriptBoxDialog = false
// this.scriptBoxDialog = false
},
/**
* return resourceList
@ -148,12 +148,12 @@
return false
}
// noRes
if (this.noRes.length>0) {
if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
return false
}
// Process resourcelist
let dataProcessing= _.map(this.resourceList, v => {
let dataProcessing = _.map(this.resourceList, v => {
return {
id: v
}
@ -190,55 +190,55 @@
return editor
},
diGuiTree(item) { // Recursive convenience tree structure
diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?        
this.operationTree(item) : this.diGuiTree(item.children);
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
? this.operationTree(item) : this.diGuiTree(item.children)
})
},
operationTree(item) {
if(item.dirctory) {
item.isDisabled =true
operationTree (item) {
if (item.dirctory) {
item.isDisabled = true
}
delete item.children
},
searchTree(element, id) {
searchTree (element, id) {
// id
if (element.id == id) {
return element;
return element
} else if (element.children != null) {
var i;
var result = null;
var i
var result = null
for (i = 0; result == null && i < element.children.length; i++) {
result = this.searchTree(element.children[i], id);
result = this.searchTree(element.children[i], id)
}
return result;
return result
}
return null;
return null
},
dataProcess(backResource) {
dataProcess (backResource) {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.options.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.options.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
resourceIdArr = isResourceId.map(item => {
return item.id
})
Array.prototype.diff = function(a) {
return this.filter(function(i) {return a.indexOf(i) < 0;});
};
let diffSet = this.resourceList.diff(resourceIdArr);
Array.prototype.diff = function (a) {
return this.filter(function (i) { return a.indexOf(i) < 0 })
}
let diffSet = this.resourceList.diff(resourceIdArr)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
backResource.forEach(item1=>{
if(item==item1.id || item==item1.res) {
if (diffSet.length > 0) {
diffSet.forEach(item => {
backResource.forEach(item1 => {
if (item == item1.id || item == item1.res) {
optionsCmp.push(item1)
}
})
@ -247,15 +247,15 @@
let noResources = [{
id: -1,
name: $t('Unauthorized or deleted resources'),
fullName: '/'+$t('Unauthorized or deleted resources'),
fullName: '/' + $t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
if (optionsCmp.length > 0) {
this.allNoResources = optionsCmp
optionsCmp = optionsCmp.map(item=>{
return {id: item.id,name: item.name,fullName: item.res}
optionsCmp = optionsCmp.map(item => {
return { id: item.id, name: item.name, fullName: item.res }
})
optionsCmp.forEach(item=>{
optionsCmp.forEach(item => {
item.isNew = true
})
noResources[0].children = optionsCmp
@ -265,33 +265,33 @@
}
},
watch: {
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this.$emit('on-cache-params', val);
this.$emit('on-cache-params', val)
}
},
computed: {
cacheParams () {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.options.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.options.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
return {id: item.id,name: item.name,res: item.fullName}
resourceIdArr = isResourceId.map(item => {
return { id: item.id, name: item.name, res: item.fullName }
})
}
let result = []
resourceIdArr.forEach(item=>{
this.allNoResources.forEach(item1=>{
if(item.id==item1.id) {
resourceIdArr.forEach(item => {
this.allNoResources.forEach(item1 => {
if (item.id == item1.id) {
// resultBool = true
result.push(item1)
result.push(item1)
}
})
})
@ -307,7 +307,7 @@
this.diGuiTree(item)
this.options = item
let o = this.backfillItem
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.rawScript = o.params.rawScript || ''
@ -316,11 +316,11 @@
let backResource = o.params.resourceList || []
let resourceList = o.params.resourceList || []
if (resourceList.length) {
_.map(resourceList, v => {
if(!v.id) {
this.store.dispatch('dag/getResourceId',{
_.map(resourceList, v => {
if (!v.id) {
this.store.dispatch('dag/getResourceId', {
type: 'FILE',
fullName: '/'+v.res
fullName: '/' + v.res
}).then(res => {
this.resourceList.push(res.id)
this.dataProcess(backResource)
@ -335,7 +335,7 @@
})
this.cacheResourceList = resourceList
}
// backfill localParams
let localParams = o.params.localParams || []
if (localParams.length) {

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

@ -242,7 +242,7 @@
sparkVersion: 'SPARK2',
// Spark version(LIst)
sparkVersionList: [{ code: 'SPARK2' }, { code: 'SPARK1' }],
normalizer(node) {
normalizer (node) {
return {
label: node.name
}
@ -259,10 +259,10 @@
/**
* getResourceId
*/
marjarId(name) {
this.store.dispatch('dag/getResourceId',{
marjarId (name) {
this.store.dispatch('dag/getResourceId', {
type: 'FILE',
fullName: '/'+name
fullName: '/' + name
}).then(res => {
this.mainJar = res.id
}).catch(e => {
@ -287,55 +287,55 @@
_onCacheResourcesData (a) {
this.cacheResourceList = a
},
diGuiTree(item) { // Recursive convenience tree structure
diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?        
this.operationTree(item) : this.diGuiTree(item.children);
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
? this.operationTree(item) : this.diGuiTree(item.children)
})
},
operationTree(item) {
if(item.dirctory) {
item.isDisabled =true
operationTree (item) {
if (item.dirctory) {
item.isDisabled = true
}
delete item.children
},
searchTree(element, id) {
searchTree (element, id) {
// id
if (element.id == id) {
return element;
return element
} else if (element.children != null) {
var i;
var result = null;
var i
var result = null
for (i = 0; result == null && i < element.children.length; i++) {
result = this.searchTree(element.children[i], id);
result = this.searchTree(element.children[i], id)
}
return result;
return result
}
return null;
return null
},
dataProcess(backResource) {
dataProcess (backResource) {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.mainJarList.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.mainJarList.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
resourceIdArr = isResourceId.map(item => {
return item.id
})
Array.prototype.diff = function(a) {
return this.filter(function(i) {return a.indexOf(i) < 0;});
};
let diffSet = this.resourceList.diff(resourceIdArr);
Array.prototype.diff = function (a) {
return this.filter(function (i) { return a.indexOf(i) < 0 })
}
let diffSet = this.resourceList.diff(resourceIdArr)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
backResource.forEach(item1=>{
if(item==item1.id || item==item1.res) {
if (diffSet.length > 0) {
diffSet.forEach(item => {
backResource.forEach(item1 => {
if (item == item1.id || item == item1.res) {
optionsCmp.push(item1)
}
})
@ -344,15 +344,15 @@
let noResources = [{
id: -1,
name: $t('Unauthorized or deleted resources'),
fullName: '/'+$t('Unauthorized or deleted resources'),
fullName: '/' + $t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
if (optionsCmp.length > 0) {
this.allNoResources = optionsCmp
optionsCmp = optionsCmp.map(item=>{
return {id: item.id,name: item.name,fullName: item.res}
optionsCmp = optionsCmp.map(item => {
return { id: item.id, name: item.name, fullName: item.res }
})
optionsCmp.forEach(item=>{
optionsCmp.forEach(item => {
item.isNew = true
})
noResources[0].children = optionsCmp
@ -380,7 +380,7 @@
}
// noRes
if (this.noRes.length>0) {
if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
return false
}
@ -419,7 +419,7 @@
return false
}
// Process resourcelist
let dataProcessing= _.map(this.resourceList, v => {
let dataProcessing = _.map(this.resourceList, v => {
return {
id: v
}
@ -454,7 +454,7 @@
this.mainClass = ''
}
},
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this.$emit('on-cache-params', val)
}
@ -463,24 +463,24 @@
cacheParams () {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.mainJarList.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.mainJarList.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
return {id: item.id,name: item.name,res: item.fullName}
resourceIdArr = isResourceId.map(item => {
return { id: item.id, name: item.name, res: item.fullName }
})
}
let result = []
resourceIdArr.forEach(item=>{
this.allNoResources.forEach(item1=>{
if(item.id==item1.id) {
resourceIdArr.forEach(item => {
this.allNoResources.forEach(item1 => {
if (item.id == item1.id) {
// resultBool = true
result.push(item1)
result.push(item1)
}
})
})
@ -506,65 +506,65 @@
}
},
created () {
let item = this.store.state.dag.resourcesListS
let items = this.store.state.dag.resourcesListJar
this.diGuiTree(item)
this.diGuiTree(items)
this.mainJarList = item
this.mainJarLists = items
let o = this.backfillItem
let item = this.store.state.dag.resourcesListS
let items = this.store.state.dag.resourcesListJar
this.diGuiTree(item)
this.diGuiTree(items)
this.mainJarList = item
this.mainJarLists = items
let o = this.backfillItem
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.mainClass = o.params.mainClass || ''
if(o.params.mainJar.res) {
this.marjarId(o.params.mainJar.res)
} else if(o.params.mainJar.res=='') {
this.mainJar = ''
} else {
this.mainJar = o.params.mainJar.id || ''
}
this.deployMode = o.params.deployMode || ''
this.driverCores = o.params.driverCores || 1
this.driverMemory = o.params.driverMemory || '512M'
this.numExecutors = o.params.numExecutors || 2
this.executorMemory = o.params.executorMemory || '2G'
this.executorCores = o.params.executorCores || 2
this.mainArgs = o.params.mainArgs || ''
this.others = o.params.others
this.programType = o.params.programType || 'SCALA'
this.sparkVersion = o.params.sparkVersion || 'SPARK2'
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.mainClass = o.params.mainClass || ''
if (o.params.mainJar.res) {
this.marjarId(o.params.mainJar.res)
} else if (o.params.mainJar.res == '') {
this.mainJar = ''
} else {
this.mainJar = o.params.mainJar.id || ''
}
this.deployMode = o.params.deployMode || ''
this.driverCores = o.params.driverCores || 1
this.driverMemory = o.params.driverMemory || '512M'
this.numExecutors = o.params.numExecutors || 2
this.executorMemory = o.params.executorMemory || '2G'
this.executorCores = o.params.executorCores || 2
this.mainArgs = o.params.mainArgs || ''
this.others = o.params.others
this.programType = o.params.programType || 'SCALA'
this.sparkVersion = o.params.sparkVersion || 'SPARK2'
// backfill resourceList
let backResource = o.params.resourceList || []
let resourceList = o.params.resourceList || []
if (resourceList.length) {
_.map(resourceList, v => {
if(!v.id) {
this.store.dispatch('dag/getResourceId',{
type: 'FILE',
fullName: '/'+v.res
}).then(res => {
this.resourceList.push(res.id)
this.dataProcess(backResource)
}).catch(e => {
this.resourceList.push(v.res)
this.dataProcess(backResource)
})
} else {
this.resourceList.push(v.id)
// backfill resourceList
let backResource = o.params.resourceList || []
let resourceList = o.params.resourceList || []
if (resourceList.length) {
_.map(resourceList, v => {
if (!v.id) {
this.store.dispatch('dag/getResourceId', {
type: 'FILE',
fullName: '/' + v.res
}).then(res => {
this.resourceList.push(res.id)
this.dataProcess(backResource)
}
})
this.cacheResourceList = resourceList
}
}).catch(e => {
this.resourceList.push(v.res)
this.dataProcess(backResource)
})
} else {
this.resourceList.push(v.id)
this.dataProcess(backResource)
}
})
this.cacheResourceList = resourceList
}
// backfill localParams
let localParams = o.params.localParams || []
if (localParams.length) {
this.localParams = localParams
}
// backfill localParams
let localParams = o.params.localParams || []
if (localParams.length) {
this.localParams = localParams
}
}
},
mounted () {

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

@ -202,7 +202,7 @@
createNodeId: Number
},
methods: {
setEditorVal() {
setEditorVal () {
this.item = editor.getValue()
this.scriptBoxDialog = true
},
@ -214,7 +214,7 @@
*/
_onSqlType (a) {
this.sqlType = a
if(a==0) {
if (a == 0) {
this.showType = ['TABLE']
}
},
@ -262,24 +262,24 @@
if (!this.$refs.refDs._verifDatasource()) {
return false
}
if (this.sqlType==0 && !this.showType.length) {
if (this.sqlType == 0 && !this.showType.length) {
this.$message.warning(`${i18n.$t('One form or attachment must be selected')}`)
return false
}
if (this.sqlType==0 && !this.title) {
if (this.sqlType == 0 && !this.title) {
this.$message.warning(`${i18n.$t('Mail subject required')}`)
return false
}
if (this.sqlType==0 && !this.receivers.length) {
if (this.sqlType == 0 && !this.receivers.length) {
this.$message.warning(`${i18n.$t('Recipient required')}`)
return false
}
// receivers Subcomponent verification
if (this.sqlType==0 && !this.$refs.refEmail._manualEmail()) {
if (this.sqlType == 0 && !this.$refs.refEmail._manualEmail()) {
return false
}
// receiversCc Subcomponent verification
if (this.sqlType==0 && !this.$refs.refCc._manualEmail()) {
if (this.sqlType == 0 && !this.$refs.refCc._manualEmail()) {
return false
}
// udfs Subcomponent verification Verification only if the data type is HIVE
@ -390,7 +390,6 @@
receivers: this.receivers.join(','),
receiversCc: this.receiversCc.join(','),
showType: (() => {
let showType = this.showType
if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
return [showType[1], showType[0]].join(',')
@ -402,10 +401,10 @@
connParams: this.connParams,
preStatements: this.preStatements,
postStatements: this.postStatements
});
})
},
_destroyEditor () {
if (editor) {
if (editor) {
editor.toTextArea() // Uninstall
editor.off($('.code-sql-mirror'), 'keypress', this.keypress)
editor.off($('.code-sql-mirror'), 'changes', this.changes)
@ -415,7 +414,7 @@
watch: {
// Listening to sqlType
sqlType (val) {
if (val==0) {
if (val == 0) {
this.showType = []
}
if (val != 0) {
@ -430,7 +429,7 @@
this.connParams = ''
}
},
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this._cacheParams()
}
@ -448,7 +447,7 @@
this.sqlType = o.params.sqlType
this.connParams = o.params.connParams || ''
this.localParams = o.params.localParams || []
if(o.params.showType == '') {
if (o.params.showType == '') {
this.showType = []
} else {
this.showType = o.params.showType.split(',') || []
@ -491,7 +490,6 @@
receivers: this.receivers.join(','),
receiversCc: this.receiversCc.join(','),
showType: (() => {
let showType = this.showType
if (showType.length === 2 && showType[0] === 'ATTACHMENT') {
return [showType[1], showType[0]].join(',')
@ -520,4 +518,3 @@
top: -16px;
}
</style>

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

@ -614,103 +614,103 @@
/**
* mysql query type
*/
srcQueryType:'1',
srcQueryType: '1',
/**
* source data source
*/
srcDatasource:'',
srcDatasource: '',
/**
* target data source
*/
targetDatasource:'',
targetDatasource: '',
/**
* concurrency
*/
concurrency:1,
concurrency: 1,
/**
* default job type
*/
jobType:'TEMPLATE',
jobType: 'TEMPLATE',
/**
* direct model type
*/
modelType:'import',
modelType: 'import',
modelTypeList: [{ code: 'import' }, { code: 'export' }],
sourceTypeList: [
{
code: "MYSQL"
},
code: 'MYSQL'
}
],
targetTypeList:[
targetTypeList: [
{
code:"HIVE"
code: 'HIVE'
},
{
code:"HDFS"
code: 'HDFS'
}
],
sourceType:"MYSQL",
targetType:"HDFS",
sourceMysqlParams:{
srcType:"MYSQL",
srcDatasource:"",
srcTable:"",
srcQueryType:"1",
srcQuerySql:'',
srcColumnType:"0",
srcColumns:"",
srcConditionList:[],
mapColumnHive:[],
mapColumnJava:[]
sourceType: 'MYSQL',
targetType: 'HDFS',
sourceMysqlParams: {
srcType: 'MYSQL',
srcDatasource: '',
srcTable: '',
srcQueryType: '1',
srcQuerySql: '',
srcColumnType: '0',
srcColumns: '',
srcConditionList: [],
mapColumnHive: [],
mapColumnJava: []
},
sourceHdfsParams:{
exportDir:""
sourceHdfsParams: {
exportDir: ''
},
sourceHiveParams:{
hiveDatabase:"",
hiveTable:"",
hivePartitionKey:"",
hivePartitionValue:""
sourceHiveParams: {
hiveDatabase: '',
hiveTable: '',
hivePartitionKey: '',
hivePartitionValue: ''
},
targetHdfsParams:{
targetPath:"",
deleteTargetDir:true,
fileType:"--as-avrodatafile",
compressionCodec:"snappy",
fieldsTerminated:"",
linesTerminated:"",
targetHdfsParams: {
targetPath: '',
deleteTargetDir: true,
fileType: '--as-avrodatafile',
compressionCodec: 'snappy',
fieldsTerminated: '',
linesTerminated: ''
},
targetMysqlParams:{
targetType:"MYSQL",
targetDatasource:"",
targetTable:"",
targetColumns:"",
fieldsTerminated:"",
linesTerminated:"",
preQuery:"",
isUpdate:false,
targetUpdateKey:"",
targetUpdateMode:"allowinsert"
targetMysqlParams: {
targetType: 'MYSQL',
targetDatasource: '',
targetTable: '',
targetColumns: '',
fieldsTerminated: '',
linesTerminated: '',
preQuery: '',
isUpdate: false,
targetUpdateKey: '',
targetUpdateMode: 'allowinsert'
},
targetHiveParams:{
hiveDatabase:"",
hiveTable:"",
createHiveTable:false,
dropDelimiter:false,
hiveOverWrite:true,
replaceDelimiter:"",
hivePartitionKey:"",
hivePartitionValue:""
targetHiveParams: {
hiveDatabase: '',
hiveTable: '',
createHiveTable: false,
dropDelimiter: false,
hiveOverWrite: true,
replaceDelimiter: '',
hivePartitionKey: '',
hivePartitionValue: ''
},
item: '',
scriptBoxDialog: false
@ -721,108 +721,108 @@
backfillItem: Object
},
methods: {
setEditorVal() {
setEditorVal () {
this.item = editor.getValue()
this.scriptBoxDialog = true
},
getSriptBoxValue (val) {
editor.setValue(val)
},
_handleQueryType(o){
_handleQueryType (o) {
this.sourceMysqlParams.srcQueryType = this.srcQueryType
this._getTargetTypeList(this.sourceType)
this.targetType = this.targetTypeList[0].code
},
_handleModelTypeChange(a){
_handleModelTypeChange (a) {
this._getSourceTypeList(a)
this.sourceType = this.sourceTypeList[0].code
this._handleSourceTypeChange({label: this.sourceType, value: this.sourceType})
this._handleSourceTypeChange({ label: this.sourceType, value: this.sourceType })
},
_handleSourceTypeChange(a){
_handleSourceTypeChange (a) {
this._getTargetTypeList(a.label)
this.targetType = this.targetTypeList[0].code
},
_getSourceTypeList(data){
switch(data){
_getSourceTypeList (data) {
switch (data) {
case 'import':
this.sourceTypeList = [
{
code:"MYSQL"
},
code: 'MYSQL'
}
]
break;
break
case 'export':
this.sourceTypeList = [
{
code: "HDFS"
code: 'HDFS'
},
{
code: "HIVE"
code: 'HIVE'
}
]
break;
break
default:
this.sourceTypeList = [
{
code:"MYSQL"
code: 'MYSQL'
},
{
code:"HIVE"
code: 'HIVE'
},
{
code:"HDFS"
code: 'HDFS'
}
]
break;
break
}
},
_getTargetTypeList(data){
switch(data){
_getTargetTypeList (data) {
switch (data) {
case 'MYSQL':
if (this.srcQueryType === "1") {
if (this.srcQueryType === '1') {
this.targetTypeList = [
{
code: "HDFS"
code: 'HDFS'
}]
} else {
this.targetTypeList = [
{
code: "HIVE"
code: 'HIVE'
},
{
code: "HDFS"
code: 'HDFS'
}
]
}
break;
break
case 'HDFS':
this.targetTypeList = [
{
code:"MYSQL"
code: 'MYSQL'
}
]
break;
break
case 'HIVE':
this.targetTypeList = [
{
code:"MYSQL"
code: 'MYSQL'
}
]
break;
break
default:
this.targetTypeList = [
{
code:"HIVE"
code: 'HIVE'
},
{
code:"HDFS"
code: 'HDFS'
}
]
break;
break
}
},
@ -853,26 +853,26 @@
/**
* stringify the source params
*/
_handleSourceParams() {
_handleSourceParams () {
var params = null
switch(this.sourceType){
case "MYSQL":
this.sourceMysqlParams.srcQuerySql = this.sourceMysqlParams.srcQueryType === "1" && editor ?
editor.getValue() : this.sourceMysqlParams.srcQuerySql
switch (this.sourceType) {
case 'MYSQL':
this.sourceMysqlParams.srcQuerySql = this.sourceMysqlParams.srcQueryType === '1' && editor
? editor.getValue() : this.sourceMysqlParams.srcQuerySql
params = JSON.stringify(this.sourceMysqlParams)
break;
case "ORACLE":
break
case 'ORACLE':
params = JSON.stringify(this.sourceOracleParams)
break;
case "HDFS":
break
case 'HDFS':
params = JSON.stringify(this.sourceHdfsParams)
break;
case "HIVE":
break
case 'HIVE':
params = JSON.stringify(this.sourceHiveParams)
break;
break
default:
params = "";
break;
params = ''
break
}
return params
},
@ -880,21 +880,21 @@
/**
* stringify the target params
*/
_handleTargetParams() {
_handleTargetParams () {
var params = null
switch(this.targetType){
case "HIVE":
switch (this.targetType) {
case 'HIVE':
params = JSON.stringify(this.targetHiveParams)
break;
case "HDFS":
break
case 'HDFS':
params = JSON.stringify(this.targetHdfsParams)
break;
case "MYSQL":
break
case 'MYSQL':
params = JSON.stringify(this.targetMysqlParams)
break;
break
default:
params = "";
break;
params = ''
break
}
return params
@ -903,47 +903,46 @@
/**
* get source params by source type
*/
_getSourceParams(data) {
switch(this.sourceType){
case "MYSQL":
_getSourceParams (data) {
switch (this.sourceType) {
case 'MYSQL':
this.sourceMysqlParams = JSON.parse(data)
this.srcDatasource = this.sourceMysqlParams.srcDatasource
break;
case "ORACLE":
break
case 'ORACLE':
this.sourceOracleParams = JSON.parse(data)
break;
case "HDFS":
break
case 'HDFS':
this.sourceHdfsParams = JSON.parse(data)
break;
case "HIVE":
break
case 'HIVE':
this.sourceHiveParams = JSON.parse(data)
break;
break
default:
break;
break
}
},
/**
* get target params by target type
*/
_getTargetParams(data) {
switch(this.targetType){
case "HIVE":
_getTargetParams (data) {
switch (this.targetType) {
case 'HIVE':
this.targetHiveParams = JSON.parse(data)
break;
case "HDFS":
break
case 'HDFS':
this.targetHdfsParams = JSON.parse(data)
break;
case "MYSQL":
break
case 'MYSQL':
this.targetMysqlParams = JSON.parse(data)
this.targetDatasource = this.targetMysqlParams.targetDatasource
break;
break
default:
break;
break
}
},
/**
* verification
*/
@ -957,7 +956,7 @@
this.$message.warning(`${i18n.$t('Please enter Custom Shell(required)')}`)
return false
}
sqoopParams['customShell'] = shellEditor.getValue()
sqoopParams.customShell = shellEditor.getValue()
} else {
if (!this.jobName) {
this.$message.warning(`${i18n.$t('Please enter Job Name(required)')}`)
@ -965,7 +964,7 @@
}
switch (this.sourceType) {
case "MYSQL":
case 'MYSQL':
if (!this.$refs.refSourceDs._verifDatasource()) {
return false
}
@ -974,84 +973,84 @@
this.$message.warning(`${i18n.$t('Please enter a SQL Statement(required)')}`)
return false
}
this.sourceMysqlParams.srcTable = ""
this.sourceMysqlParams.srcColumnType = "0"
this.sourceMysqlParams.srcColumns = ""
this.sourceMysqlParams.srcTable = ''
this.sourceMysqlParams.srcColumnType = '0'
this.sourceMysqlParams.srcColumns = ''
} else {
if (this.sourceMysqlParams.srcTable === "") {
if (this.sourceMysqlParams.srcTable === '') {
this.$message.warning(`${i18n.$t('Please enter Mysql Table(required)')}`)
return false
}
this.sourceMysqlParams.srcQuerySql = ""
if (this.sourceMysqlParams.srcColumnType === "1" && this.sourceMysqlParams.srcColumns === "") {
this.sourceMysqlParams.srcQuerySql = ''
if (this.sourceMysqlParams.srcColumnType === '1' && this.sourceMysqlParams.srcColumns === '') {
this.$message.warning(`${i18n.$t('Please enter Columns (Comma separated)')}`)
return false
}
if (this.sourceMysqlParams.srcColumnType === "0") {
this.sourceMysqlParams.srcColumns = ""
if (this.sourceMysqlParams.srcColumnType === '0') {
this.sourceMysqlParams.srcColumns = ''
}
}
break;
case "HDFS":
if (this.sourceHdfsParams.exportDir === "") {
break
case 'HDFS':
if (this.sourceHdfsParams.exportDir === '') {
this.$message.warning(`${i18n.$t('Please enter Export Dir(required)')}`)
return false
}
break;
case "HIVE":
if (this.sourceHiveParams.hiveDatabase === "") {
break
case 'HIVE':
if (this.sourceHiveParams.hiveDatabase === '') {
this.$message.warning(`${i18n.$t('Please enter Hive Database(required)')}`)
return false
}
if (this.sourceHiveParams.hiveTable === "") {
if (this.sourceHiveParams.hiveTable === '') {
this.$message.warning(`${i18n.$t('Please enter Hive Table(required)')}`)
return false
}
break;
break
default:
break;
break
}
switch (this.targetType) {
case "HIVE":
if (this.targetHiveParams.hiveDatabase === "") {
case 'HIVE':
if (this.targetHiveParams.hiveDatabase === '') {
this.$message.warning(`${i18n.$t('Please enter Hive Database(required)')}`)
return false
}
if (this.targetHiveParams.hiveTable === "") {
if (this.targetHiveParams.hiveTable === '') {
this.$message.warning(`${i18n.$t('Please enter Hive Table(required)')}`)
return false
}
break;
case "HDFS":
if (this.targetHdfsParams.targetPath === "") {
break
case 'HDFS':
if (this.targetHdfsParams.targetPath === '') {
this.$message.warning(`${i18n.$t('Please enter Target Dir(required)')}`)
return false
}
break;
case "MYSQL":
break
case 'MYSQL':
if (!this.$refs.refTargetDs._verifDatasource()) {
return false
}
if (this.targetMysqlParams.targetTable === "") {
if (this.targetMysqlParams.targetTable === '') {
this.$message.warning(`${i18n.$t('Please enter Mysql Table(required)')}`)
return false
}
break;
break
default:
break;
break
}
sqoopParams['jobName'] = this.jobName
sqoopParams['hadoopCustomParams'] = this.hadoopCustomParams
sqoopParams['sqoopAdvancedParams'] = this.sqoopAdvancedParams
sqoopParams['concurrency'] = this.concurrency
sqoopParams['modelType'] = this.modelType
sqoopParams['sourceType'] = this.sourceType
sqoopParams['targetType'] = this.targetType
sqoopParams['targetParams'] = this._handleTargetParams()
sqoopParams['sourceParams'] = this._handleSourceParams()
sqoopParams.jobName = this.jobName
sqoopParams.hadoopCustomParams = this.hadoopCustomParams
sqoopParams.sqoopAdvancedParams = this.sqoopAdvancedParams
sqoopParams.concurrency = this.concurrency
sqoopParams.modelType = this.modelType
sqoopParams.sourceType = this.sourceType
sqoopParams.targetType = this.targetType
sqoopParams.targetParams = this._handleTargetParams()
sqoopParams.sourceParams = this._handleSourceParams()
}
// storage
@ -1142,14 +1141,14 @@
_cacheParams () {
this.$emit('on-cache-params', {
concurrency:this.concurrency,
modelType:this.modelType,
sourceType:this.sourceType,
targetType:this.targetType,
sourceParams:this._handleSourceParams(),
targetParams:this._handleTargetParams(),
localParams:this.localParams
});
concurrency: this.concurrency,
modelType: this.modelType,
sourceType: this.sourceType,
targetType: this.targetType,
sourceParams: this._handleSourceParams(),
targetParams: this._handleTargetParams(),
localParams: this.localParams
})
},
_destroyEditor () {
@ -1171,7 +1170,7 @@
watch: {
// Listening to sqlType
sqlType (val) {
if (val==0) {
if (val == 0) {
this.showType = []
}
if (val != 0) {
@ -1186,7 +1185,7 @@
this.connParams = ''
}
},
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this._cacheParams()
}
@ -1248,21 +1247,21 @@
computed: {
cacheParams () {
return {
concurrency:this.concurrency,
modelType:this.modelType,
sourceType:this.sourceType,
targetType:this.targetType,
localParams:this.localParams,
sourceMysqlParams:this.sourceMysqlParams,
sourceHdfsParams:this.sourceHdfsParams,
sourceHiveParams:this.sourceHiveParams,
targetHdfsParams:this.targetHdfsParams,
targetMysqlParams:this.targetMysqlParams,
targetHiveParams:this.targetHiveParams
concurrency: this.concurrency,
modelType: this.modelType,
sourceType: this.sourceType,
targetType: this.targetType,
localParams: this.localParams,
sourceMysqlParams: this.sourceMysqlParams,
sourceHdfsParams: this.sourceHdfsParams,
sourceHiveParams: this.sourceHiveParams,
targetHdfsParams: this.targetHdfsParams,
targetMysqlParams: this.targetMysqlParams,
targetHiveParams: this.targetHiveParams
}
}
},
components: { mListBox, mDatasource, mLocalParams, mScriptBox}
components: { mListBox, mDatasource, mLocalParams, mScriptBox }
}
</script>
<style lang="scss" rel="stylesheet/scss">
@ -1276,4 +1275,3 @@
top: -16px;
}
</style>

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

@ -97,7 +97,7 @@
created () {
let processListS = _.cloneDeep(this.store.state.dag.processListS)
let id = null
if(this.router.history.current.name==='projects-instance-details') {
if (this.router.history.current.name === 'projects-instance-details') {
id = this.router.history.current.query.id || null
} else {
id = this.router.history.current.params.id || null
@ -119,7 +119,7 @@
this.wdiCurr = o.params.processDefinitionId
} else {
if (this.processDefinitionList.length) {
this.wdiCurr = this.processDefinitionList[0]['id']
this.wdiCurr = this.processDefinitionList[0].id
this.$emit('on-set-process-name', this._handleName(this.wdiCurr))
}
}

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

@ -114,7 +114,7 @@
// waterdrop script
baseScript: 'sh ${WATERDROP_HOME}/bin/start-waterdrop.sh',
// resourceNameVal
resourceNameVal : [],
resourceNameVal: [],
// Custom parameter
localParams: [],
// resource(list)
@ -128,14 +128,14 @@
// Spark version(LIst)
masterType: [{ code: 'yarn' }, { code: 'local' }, { code: 'spark://' }, { code: 'mesos://' }],
// Deployment masterUrl state
masterUrlState:false,
masterUrlState: false,
// Deployment masterUrl
masterUrl: '',
// Cache ResourceList
cacheResourceList: [],
// define options
options: [],
normalizer(node) {
normalizer (node) {
return {
label: node.name
}
@ -177,7 +177,7 @@
return false
}
// noRes
if (this.noRes.length>0) {
if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
return false
}
@ -186,40 +186,40 @@
this.$message.warning(`${i18n.$t('Please select the waterdrop resources')}`)
return false
}
if (this.resourceNameVal.resourceList && this.resourceNameVal.resourceList.length==0) {
if (this.resourceNameVal.resourceList && this.resourceNameVal.resourceList.length == 0) {
this.$message.warning(`${i18n.$t('Please select the waterdrop resources')}`)
return false
}
// Process resourcelist
let dataProcessing= _.map(this.resourceList, v => {
let dataProcessing = _.map(this.resourceList, v => {
return {
id: v
}
})
//verify deploy mode
// verify deploy mode
let deployMode = this.deployMode
let master = this.master
let masterUrl = this.masterUrl
if(this.deployMode == 'local'){
if (this.deployMode == 'local') {
master = 'local'
masterUrl = ''
deployMode = 'client'
}
// get local params
let locparams = ''
this.localParams.forEach(v=>{
locparams = locparams + ' --variable ' + v.prop + '=' + v.value
}
this.localParams.forEach(v => {
locparams = locparams + ' --variable ' + v.prop + '=' + v.value
}
)
// get waterdrop script
let tureScript = ''
this.resourceNameVal.resourceList.forEach(v=>{
this.resourceNameVal.resourceList.forEach(v => {
tureScript = tureScript + this.baseScript +
' --master '+ master + masterUrl +
' --deploy-mode '+ deployMode +
' --queue '+ this.queue +
' --config ' + v.res +
' --master ' + master + masterUrl +
' --deploy-mode ' + deployMode +
' --queue ' + this.queue +
' --config ' + v.res +
locparams + ' \n'
})
@ -227,60 +227,60 @@
this.$emit('on-params', {
resourceList: dataProcessing,
localParams: this.localParams,
rawScript: tureScript,
rawScript: tureScript
})
return true
},
diGuiTree(item) { // Recursive convenience tree structure
diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?
this.operationTree(item) : this.diGuiTree(item.children);
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
? this.operationTree(item) : this.diGuiTree(item.children)
})
},
operationTree(item) {
if(item.dirctory) {
item.isDisabled =true
operationTree (item) {
if (item.dirctory) {
item.isDisabled = true
}
delete item.children
},
searchTree(element, id) {
searchTree (element, id) {
// id
if (element.id == id) {
return element;
return element
} else if (element.children != null) {
var i;
var result = null;
var i
var result = null
for (i = 0; result == null && i < element.children.length; i++) {
result = this.searchTree(element.children[i], id);
result = this.searchTree(element.children[i], id)
}
return result;
return result
}
return null;
return null
},
dataProcess(backResource) {
dataProcess (backResource) {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.options.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.options.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
resourceIdArr = isResourceId.map(item => {
return item.id
})
Array.prototype.diff = function(a) {
return this.filter(function(i) {return a.indexOf(i) < 0;});
};
let diffSet = this.resourceList.diff(resourceIdArr);
Array.prototype.diff = function (a) {
return this.filter(function (i) { return a.indexOf(i) < 0 })
}
let diffSet = this.resourceList.diff(resourceIdArr)
let optionsCmp = []
if(diffSet.length>0) {
diffSet.forEach(item=>{
backResource.forEach(item1=>{
if(item==item1.id || item==item1.res) {
if (diffSet.length > 0) {
diffSet.forEach(item => {
backResource.forEach(item1 => {
if (item == item1.id || item == item1.res) {
optionsCmp.push(item1)
}
})
@ -289,15 +289,15 @@
let noResources = [{
id: -1,
name: $t('Unauthorized or deleted resources'),
fullName: '/'+$t('Unauthorized or deleted resources'),
fullName: '/' + $t('Unauthorized or deleted resources'),
children: []
}]
if(optionsCmp.length>0) {
if (optionsCmp.length > 0) {
this.allNoResources = optionsCmp
optionsCmp = optionsCmp.map(item=>{
return {id: item.id,name: item.name,fullName: item.res}
optionsCmp = optionsCmp.map(item => {
return { id: item.id, name: item.name, fullName: item.res }
})
optionsCmp.forEach(item=>{
optionsCmp.forEach(item => {
item.isNew = true
})
noResources[0].children = optionsCmp
@ -307,44 +307,44 @@
}
},
watch: {
//Watch the cacheParams
// Watch the cacheParams
cacheParams (val) {
this.resourceNameVal = val
this.$emit('on-cache-params', val);
this.$emit('on-cache-params', val)
},
"master": {
handler(code) {
if(code == 'spark://'){
this.masterUrlState = true;
}else if(code == 'mesos://'){
this.masterUrlState = true;
}else{
this.masterUrlState = false;
master: {
handler (code) {
if (code == 'spark://') {
this.masterUrlState = true
} else if (code == 'mesos://') {
this.masterUrlState = true
} else {
this.masterUrlState = false
this.masterUrl = ''
}
}
},
}
},
computed: {
cacheParams () {
let isResourceId = []
let resourceIdArr = []
if(this.resourceList.length>0) {
this.resourceList.forEach(v=>{
this.options.forEach(v1=>{
if(this.searchTree(v1,v)) {
isResourceId.push(this.searchTree(v1,v))
if (this.resourceList.length > 0) {
this.resourceList.forEach(v => {
this.options.forEach(v1 => {
if (this.searchTree(v1, v)) {
isResourceId.push(this.searchTree(v1, v))
}
})
})
resourceIdArr = isResourceId.map(item=>{
return {id: item.id,name: item.name,res: item.fullName}
resourceIdArr = isResourceId.map(item => {
return { id: item.id, name: item.name, res: item.fullName }
})
}
let result = []
resourceIdArr.forEach(item=>{
this.allNoResources.forEach(item1=>{
if(item.id==item1.id) {
resourceIdArr.forEach(item => {
this.allNoResources.forEach(item1 => {
if (item.id == item1.id) {
// resultBool = true
result.push(item1)
}
@ -357,7 +357,7 @@
deployMode: this.deployMode,
master: this.master,
masterUrl: this.masterUrl,
queue:this.queue,
queue: this.queue
}
}
},
@ -370,7 +370,7 @@
// Non-null objects represent backfill
if (!_.isEmpty(o)) {
this.master = o.params.master || 'yarn'
this.deployMode = o.params.deployMode || 'client'
this.deployMode = o.params.deployMode || 'client'
this.masterUrl = o.params.masterUrl || ''
this.queue = o.params.queue || 'default'
this.rawScript = o.params.rawScript || ''
@ -380,10 +380,10 @@
let resourceList = o.params.resourceList || []
if (resourceList.length) {
_.map(resourceList, v => {
if(!v.id) {
this.store.dispatch('dag/getResourceId',{
if (!v.id) {
this.store.dispatch('dag/getResourceId', {
type: 'FILE',
fullName: '/'+v.res
fullName: '/' + v.res
}).then(res => {
this.resourceList.push(res.id)
this.dataProcess(backResource)

12
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue

@ -38,7 +38,7 @@
import store from '@/conf/home/store'
import { runningType } from '@/conf/home/pages/dag/_source/config'
import { warningTypeList } from '@/conf/home/pages/projects/pages/definition/pages/list/_source/util'
export default {
name: 'starting-params-dag-index',
data () {
@ -69,16 +69,16 @@
return '-'
},
_rtWorkerGroupName (id) {
let o = _.filter(this.workerGroupList, v => v.id === id)
let o = _.filter(this.workerGroupList, v => v.id === id)
if (o && o.length) {
return o[0].name
}
return '-'
},
_getNotifyGroupList () {
this.store.dispatch('dag/getNotifyGroupList').then(res => {
this.notifyGroupList = res
})
this.store.dispatch('dag/getNotifyGroupList').then(res => {
this.notifyGroupList = res
})
},
_getWorkerGroupList () {
let stateWorkerGroupsList = this.store.state.security.workerGroupsListAll || []
@ -92,7 +92,7 @@
}
},
watch: {
'$route': {
$route: {
deep: true,
handler () {
this.isActive = false

10
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/_source/selectTenant.vue

@ -49,13 +49,13 @@
prop: 'value',
event: 'tenantSelectEvent'
},
mounted() {
let result = this.itemList.some(item=>{
if(item.id == this.value) {
mounted () {
let result = this.itemList.some(item => {
if (item.id == this.value) {
return true
}
})
if(!result) {
})
if (!result) {
this.value = 'default'
}
},

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

@ -91,7 +91,7 @@
import mLocalParams from '../formModel/tasks/_source/localParams'
import disabledState from '@/module/mixin/disabledState'
import Affirm from '../jumpAffirm'
import FormTenant from "./_source/selectTenant";
import FormTenant from './_source/selectTenant'
export default {
name: 'udp',
@ -134,7 +134,7 @@
}
return true
},
_accuStore(){
_accuStore () {
this.store.commit('dag/setGlobalParams', _.cloneDeep(this.udpList))
this.store.commit('dag/setName', _.cloneDeep(this.name))
this.store.commit('dag/setTimeout', _.cloneDeep(this.timeout))
@ -210,10 +210,9 @@
this.tenantId = dag.tenantId
}
})
},
mounted () {},
components: {FormTenant, mLocalParams }
components: { FormTenant, mLocalParams }
}
</script>

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue

@ -37,7 +37,7 @@
}
},
watch: {
'$route': {
$route: {
deep: true,
handler () {
this.isActive = false

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue

@ -41,8 +41,8 @@
props: {},
methods: {
...mapMutations('dag', ['resetParams', 'setIsDetails']),
...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList', 'getProcessDetails','getResourcesListJar']),
...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getProcessDetails', 'getResourcesListJar']),
...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
/**
* init
*/
@ -89,7 +89,7 @@
},
watch: {
// Listening for routing changes
'$route': {
$route: {
deep: true,
handler () {
this.init()

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue

@ -40,8 +40,8 @@
props: {},
methods: {
...mapMutations('dag', ['resetParams']),
...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList','getResourcesListJar','getResourcesListJar']),
...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getResourcesListJar', 'getResourcesListJar']),
...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
/**
* init
*/
@ -74,7 +74,7 @@
}
},
watch: {
'$route': {
$route: {
deep: true,
handler () {
this.init()

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue

@ -43,8 +43,8 @@
props: {},
methods: {
...mapMutations('dag', ['setIsDetails', 'resetParams']),
...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList', 'getInstancedetail','getResourcesListJar']),
...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getInstancedetail', 'getResourcesListJar']),
...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
/**
* init
*/
@ -101,7 +101,7 @@
}
},
watch: {
'$route': {
$route: {
deep: true,
handler () {
this.init()

63
dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue

@ -152,7 +152,7 @@
<script>
import i18n from '@/module/i18n'
import store from '@/conf/home/store'
import {isJson} from '@/module/util/util'
import { isJson } from '@/module/util/util'
import mPopup from '@/module/components/popup/popup'
import mListBoxF from '@/module/components/listBoxF/listBoxF'
@ -176,7 +176,7 @@
// data storage name
database: '',
// principal
principal:'',
principal: '',
// database username
userName: '',
// Database password
@ -190,8 +190,8 @@
showPrincipal: true,
showdDatabase: false,
showConnectType: false,
isShowPrincipal:true,
prePortMapper:{},
isShowPrincipal: true,
prePortMapper: {},
datasourceTypeList: [
{
value: 'MYSQL',
@ -352,7 +352,7 @@
if (this.item) {
param.id = this.item.id
}
this.store.dispatch(`datasource/${this.item ? `updateDatasource` : `createDatasources`}`, param).then(res => {
this.store.dispatch(`datasource/${this.item ? 'updateDatasource' : 'createDatasources'}`, param).then(res => {
this.$message.success(res.msg)
this.spinnerLoading = false
this.$emit('onUpdate')
@ -364,18 +364,18 @@
/**
* Get modified data
*/
_getEditDatasource() {
this.store.dispatch('datasource/getEditDatasource', {id: this.item.id}).then(res => {
_getEditDatasource () {
this.store.dispatch('datasource/getEditDatasource', { id: this.item.id }).then(res => {
this.type = res.type
this.name = res.name
this.note = res.note
this.host = res.host
//When in Editpage, Prevent default value overwrite backfill value
let that = this;
// When in Editpage, Prevent default value overwrite backfill value
let that = this
setTimeout(() => {
this.port = res.port
},0)
}, 0)
this.principal = res.principal
this.database = res.database
@ -390,24 +390,22 @@
/**
* Set default port for each type.
*/
_setDefaultValues(value) {
//Default type is MYSQL
_setDefaultValues (value) {
// Default type is MYSQL
let type = this.type || 'MYSQL'
let defaultPort = this._getDefaultPort(type)
//Backfill the previous input from memcache
// Backfill the previous input from memcache
let mapperPort = this.prePortMapper[type]
this.port = mapperPort || defaultPort
},
/**
* Get default port by type
*/
_getDefaultPort(type) {
_getDefaultPort (type) {
var defaultPort = ''
switch (type) {
case 'MYSQL':
@ -439,10 +437,9 @@
break
default:
break
}
return defaultPort
},
}
},
created () {
// Backfill
@ -451,33 +448,32 @@
}
this._setDefaultValues()
},
watch: {
type(value){
if(value == 'POSTGRESQL') {
this.showdDatabase = true;
type (value) {
if (value == 'POSTGRESQL') {
this.showdDatabase = true
} else {
this.showdDatabase = false;
this.showdDatabase = false
}
if (value== 'ORACLE' && !this.item.id) {
this.showConnectType = true;
if (value == 'ORACLE' && !this.item.id) {
this.showConnectType = true
this.connectType = 'ORACLE_SERVICE_NAME'
} else if(value== 'ORACLE' && this.item.id) {
this.showConnectType = true;
} else if (value == 'ORACLE' && this.item.id) {
this.showConnectType = true
} else {
this.showConnectType = false;
this.showConnectType = false
}
//Set default port for each type datasource
// Set default port for each type datasource
this._setDefaultValues(value)
return new Promise((resolve, reject) => {
this.store.dispatch('datasource/getKerberosStartupState').then(res => {
this.isShowPrincipal=res
if((value =='HIVE'||value == 'SPARK')&&this.isShowPrincipal== true){
this.isShowPrincipal = res
if ((value == 'HIVE' || value == 'SPARK') && this.isShowPrincipal == true) {
this.showPrincipal = false
}else{
} else {
this.showPrincipal = true
}
}).catch(e => {
@ -490,7 +486,7 @@
* Cache the previous input port for each type datasource
* @param value
*/
port(value){
port (value) {
this.prePortMapper[this.type] = value
}
},
@ -539,5 +535,4 @@
}
}
</style>

12
dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue

@ -81,11 +81,11 @@
// Number of pages
pageNo: 1,
// Search value
searchVal: '',
searchVal: ''
},
dialogVisible: false,
item: {},
item: {}
}
},
mixins: [listUrlParamHandle],
@ -128,8 +128,8 @@
_getList (flag) {
this.isLoading = !flag
this.getDatasourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo -1
if (this.searchParams.pageNo > 1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.datasourcesList = []
this.datasourcesList = res.totalList
@ -142,7 +142,7 @@
},
_onUpdate () {
this._debounceGET('false')
},
}
},
watch: {
// router

18
dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue

@ -19,13 +19,13 @@
</template>
<script>
import mProjectHome from '@/conf/home/pages/projects/pages/index'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
name: 'home',
components: { mProjectHome, mListConstruction },
mounted() {
},
}
import mProjectHome from '@/conf/home/pages/projects/pages/index'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
name: 'home',
components: { mProjectHome, mListConstruction },
mounted () {
}
}
</script>

6
dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue

@ -25,9 +25,9 @@
import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
export default {
name: 'monitor-index',
mounted() {
mounted () {
},
components: { mSecondaryMenu }
}
</script>
</script>

1
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue

@ -77,4 +77,3 @@
}
}
</style>

70
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue

@ -79,41 +79,41 @@
</div>
</template>
<script>
import { mapActions } from "vuex";
import mList from "./_source/zookeeperList";
import mSpin from "@/module/components/spin/spin";
import mNoData from "@/module/components/noData/noData";
import themeData from "@/module/echarts/themeData.json";
import mListConstruction from "@/module/components/listConstruction/listConstruction";
import { mapActions } from 'vuex'
import mList from './_source/zookeeperList'
import mSpin from '@/module/components/spin/spin'
import mNoData from '@/module/components/noData/noData'
import themeData from '@/module/echarts/themeData.json'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
name: "servers-mysql",
data() {
return {
isLoading: false,
mysqlList: [],
color: themeData.color
};
},
props: {},
methods: {
...mapActions("monitor", ["getDatabaseData"])
},
watch: {},
created() {
this.isLoading = true;
this.getDatabaseData()
.then(res => {
this.mysqlList = res;
this.isLoading = false;
})
.catch(() => {
this.isLoading = false;
});
},
mounted() {},
components: { mList, mListConstruction, mSpin, mNoData }
};
export default {
name: 'servers-mysql',
data () {
return {
isLoading: false,
mysqlList: [],
color: themeData.color
}
},
props: {},
methods: {
...mapActions('monitor', ['getDatabaseData'])
},
watch: {},
created () {
this.isLoading = true
this.getDatabaseData()
.then(res => {
this.mysqlList = res
this.isLoading = false
})
.catch(() => {
this.isLoading = false
})
},
mounted () {},
components: { mList, mListConstruction, mSpin, mNoData }
}
</script>
<style lang="scss" rel="stylesheet/scss">
@import "./servers";
@ -135,4 +135,4 @@ export default {
color: #2a455b;
}
}
</style>
</style>

2
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue

@ -95,7 +95,7 @@
this.getMasterData().then(res => {
this.masterList = _.map(res, (v, i) => {
return _.assign(v, {
id: v.host + "_" + v.id,
id: v.host + '_' + v.id,
resInfo: JSON.parse(v.resInfo)
})
})

22
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue

@ -74,7 +74,7 @@
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
name: 'statistics',
name: 'statistics',
data () {
return {
isLoading: false,
@ -83,12 +83,12 @@
color: themeData.color
}
},
props:{},
props: {},
methods: {
//...mapActions('monitor', ['getDatabaseData'])
// ...mapActions('monitor', ['getDatabaseData'])
// ...mapActions('projects', ['getCommandStateCount']),
...mapActions('projects', ['getQueueCount']),
...mapActions('projects', ['getCommandStateCount']),
...mapActions('projects', ['getCommandStateCount'])
},
watch: {},
created () {
@ -98,26 +98,26 @@
this.isLoading = false
}).catch(() => {
this.isLoading = false
})
})
this.getCommandStateCount().then(res => {
let normal = 0
let error = 0
_.forEach(res.data, (v, i) => {
let key = _.keys(v)
if(key[0] == 'errorCount') {
if (key[0] == 'errorCount') {
error = error + v.errorCount
}
if(key[1] == 'normalCount'){
if (key[1] == 'normalCount') {
normal = normal + v.normalCount
}
}
}
)
this.commandCountData = {
'normalCount': normal,
'errorCount' : error
normalCount: normal,
errorCount: error
}
}).catch( () => {
}).catch(() => {
})
},
mounted () {

2
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/worker.vue

@ -112,7 +112,7 @@
this.getWorkerData().then(res => {
this.workerList = _.map(res, (v, i) => {
return _.assign(v, {
id: v.host + "_" + v.id,
id: v.host + '_' + v.id,
resInfo: JSON.parse(v.resInfo)
})
})

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/conditions/instance/processInstance.vue

@ -94,14 +94,14 @@
this.searchParams.startDate = val[0]
this.searchParams.endDate = val[1]
this.dataTime[0] = val[0]
this.dataTime[1]= val[1]
this.dataTime[1] = val[1]
},
/**
* change state
*/
_onChangeState (val) {
this.searchParams.stateType = val
},
}
},
watch: {
},

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/conditions/instance/taskInstance.vue

@ -83,7 +83,7 @@
executorName: '',
processInstanceName: ''
},
dataTime: [],
dataTime: []
}
},
props: {},
@ -98,14 +98,14 @@
this.searchParams.startDate = val[0]
this.searchParams.endDate = val[1]
this.dataTime[0] = val[0]
this.dataTime[1]= val[1]
this.dataTime[1] = val[1]
},
/**
* change state
*/
_onChangeState (val) {
this.searchParams.stateType = val
},
}
},
watch: {
},

18
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/conditions.vue

@ -74,26 +74,26 @@
stateList: [
{
label: `${this.$t('none')}`,
code: ``
code: ''
},
{
label: `${this.$t('success')}`,
code: `成功`
code: '成功'
},
{
label: `${this.$t('waiting')}`,
code: `等待`
code: '等待'
},
{
label: `${this.$t('execution')}`,
code: `执行中`
code: '执行中'
},
{
label: `${this.$t('finish')}`,
code: `完成`
code: '完成'
}, {
label: `${this.$t('failed')}`,
code: `失败`
code: '失败'
}
],
searchParams: {
@ -105,7 +105,7 @@
startDate: '',
endDate: ''
},
dataTime: [],
dataTime: []
}
},
props: {},
@ -118,7 +118,7 @@
*/
_onChangeStartStop (val) {
this.searchParams.startDate = val[0]
this.searchParams.endDate = val[1]
this.searchParams.endDate = val[1]
},
/**
* change state
@ -148,4 +148,4 @@
},
components: { mConditions }
}
</script>
</script>

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/taskRecordList/_source/list.vue

@ -88,4 +88,4 @@
},
components: { }
}
</script>
</script>

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue

@ -100,7 +100,7 @@
if (this.email === '') {
return true
}
this.email = _.trim(this.email).replace(/(;$)|(;$)/g, "")
this.email = _.trim(this.email).replace(/(;$)|(;$)/g, '')
let email = this.email

55
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue

@ -190,8 +190,8 @@
...mapActions('dag', ['editProcessState', 'getStartCheck', 'getReceiver', 'deleteDefinition', 'batchDeleteDefinition', 'exportDefinition', 'getProcessDefinitionVersionsPage', 'copyProcess', 'switchProcessDefinitionVersion', 'deleteProcessDefinitionVersion', 'moveProcess']),
...mapActions('security', ['getWorkerGroupsAll']),
selectable(row,index) {
if(row.releaseState === 'ONLINE') {
selectable (row, index) {
if (row.releaseState === 'ONLINE') {
return false
} else {
return true
@ -209,8 +209,8 @@
_start (item) {
this.getWorkerGroupsAll()
this.getStartCheck({ processDefinitionId: item.id }).then(res => {
this.startData = item
this.startDialog = true
this.startData = item
this.startDialog = true
}).catch(e => {
this.$message.error(e.msg || '')
})
@ -353,11 +353,11 @@
* @param processDefinitionId the process definition id
* @param fromThis fromThis
*/
mVersionSwitchProcessDefinitionVersion({ version, processDefinitionId, fromThis }) {
mVersionSwitchProcessDefinitionVersion ({ version, processDefinitionId, fromThis }) {
this.switchProcessDefinitionVersion({
version: version,
processDefinitionId: processDefinitionId
}).then(res=>{
}).then(res => {
this.$message.success($t('Switch Version Successfully'))
this.$router.push({ path: `/projects/definition/list/${processDefinitionId}` })
}).catch(e => {
@ -372,19 +372,19 @@
* @param processDefinitionId the process definition id of page version
* @param fromThis fromThis
*/
mVersionGetProcessDefinitionVersionsPage({ pageNo, pageSize, processDefinitionId, fromThis }) {
mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize, processDefinitionId, fromThis }) {
this.getProcessDefinitionVersionsPage({
pageNo: pageNo,
pageSize: pageSize,
processDefinitionId: processDefinitionId
}).then(res=>{
this.versionData.processDefinitionVersions = res.data.lists
this.versionData.total = res.data.totalCount
this.versionData.pageSize = res.data.pageSize
this.versionData.pageNo = res.data.currentPage
}).catch(e=>{
this.$message.error(e.msg || '')
})
pageNo: pageNo,
pageSize: pageSize,
processDefinitionId: processDefinitionId
}).then(res => {
this.versionData.processDefinitionVersions = res.data.lists
this.versionData.total = res.data.totalCount
this.versionData.pageSize = res.data.pageSize
this.versionData.pageNo = res.data.currentPage
}).catch(e => {
this.$message.error(e.msg || '')
})
},
/**
* delete one version of process definition
@ -393,11 +393,11 @@
* @param processDefinitionId the process definition id user want to delete
* @param fromThis fromThis
*/
mVersionDeleteProcessDefinitionVersion({ version, processDefinitionId, fromThis }) {
mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId, fromThis }) {
this.deleteProcessDefinitionVersion({
version: version,
processDefinitionId: processDefinitionId
}).then(res=>{
}).then(res => {
this.$message.success(res.msg || '')
this.mVersionGetProcessDefinitionVersionsPage({
pageNo: 1,
@ -420,14 +420,13 @@
let total = res.data.totalCount
let pageSize = res.data.pageSize
let pageNo = res.data.currentPage
this.versionData.processDefinition = item,
this.versionData.processDefinitionVersions = processDefinitionVersions,
this.versionData.total = total,
this.versionData.pageNo = pageNo,
this.versionData.pageSize = pageSize
this.drawer = true
}).catch(e => {
this.$message.error(e.msg || '')
})
@ -436,7 +435,7 @@
_batchExport () {
this.exportDefinition({
processDefinitionIds: this.strSelectIds,
fileName: "process_"+new Date().getTime()
fileName: 'process_' + new Date().getTime()
}).then(res => {
this._onUpdate()
this.checkAll = false
@ -451,11 +450,11 @@
* Batch Copy
*/
_batchCopy () {
this.relatedItemsDialog= true
this.relatedItemsDialog = true
this.tmp = false
},
onBatchCopy (item) {
this._copyProcess({id: this.strSelectIds,projectId: item})
this._copyProcess({ id: this.strSelectIds, projectId: item })
this.relatedItemsDialog = false
},
closeRelatedItems () {
@ -464,12 +463,12 @@
/**
* _batchMove
*/
_batchMove() {
_batchMove () {
this.tmp = true
this.relatedItemsDialog = true
},
onBatchMove (item) {
this._moveProcess({id: this.strSelectIds,projectId: item})
this._moveProcess({ id: this.strSelectIds, projectId: item })
this.relatedItemsDialog = false
},
/**
@ -492,7 +491,7 @@
*/
_arrDelChange (v) {
let arr = []
arr = _.map(v, 'id');
arr = _.map(v, 'id')
this.strSelectIds = _.join(arr, ',')
},
/**

36
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/relatedItems.vue

@ -56,39 +56,39 @@
}
},
props: {
tmp: Boolean
tmp: Boolean
},
methods: {
_ok () {
if(this._verification()) {
if(this.tmp) {
this.$emit('onBatchMove',this.itemId)
} else {
this.$emit('onBatchCopy',this.itemId)
}
if (this._verification()) {
if (this.tmp) {
this.$emit('onBatchMove', this.itemId)
} else {
this.$emit('onBatchCopy', this.itemId)
}
}
},
_verification() {
if(!this.itemId) {
this.$message.warning(`${i18n.$t('Project name is required')}`)
return false
_verification () {
if (!this.itemId) {
this.$message.warning(`${i18n.$t('Project name is required')}`)
return false
}
return true
}
},
watch: {
},
created () {
this.store.dispatch('dag/getAllItems', {}).then(res => {
if(res.data.length> 0) {
this.itemList = res.data
}
})
this.store.dispatch('dag/getAllItems', {}).then(res => {
if (res.data.length > 0) {
this.itemList = res.data
}
})
},
mounted () {
},
components: { mPopup, mListBoxF }
}
</script>
</script>

14
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue

@ -85,7 +85,7 @@
style="width: 200px;"
size="small"
v-model="warningGroupId"
:disabled="!notifyGroupList.length">
:disabled="!notifyGroupList.length">
<el-input slot="trigger" slot-scope="{ selectedModel }" readonly :placeholder="$t('Please select a notification group')" size="small" :value="selectedModel ? selectedModel.label : ''" style="width: 200px;" @on-click-icon.stop="warningGroupId = ''">
<em slot="suffix" class="el-icon-error" style="font-size: 15px;cursor: pointer;" v-show="warningGroupId"></em>
<em slot="suffix" class="el-icon-bottom" style="font-size: 12px;" v-show="!warningGroupId"></em>
@ -214,7 +214,7 @@
scheduleTime: this.scheduleTime.length && this.scheduleTime.join(',') || '',
failureStrategy: this.failureStrategy,
warningType: this.warningType,
warningGroupId: this.warningGroupId=='' ? 0 : this.warningGroupId,
warningGroupId: this.warningGroupId == '' ? 0 : this.warningGroupId,
execType: this.execType ? 'COMPLEMENT_DATA' : null,
startNodeList: this.startNodeList,
taskDependType: this.taskDependType,
@ -242,10 +242,10 @@
},
_getNotifyGroupList () {
return new Promise((resolve, reject) => {
this.store.dispatch('dag/getNotifyGroupList').then(res => {
this.notifyGroupList = res
resolve()
})
this.store.dispatch('dag/getNotifyGroupList').then(res => {
this.notifyGroupList = res
resolve()
})
})
},
_getReceiver () {
@ -277,7 +277,7 @@
} else {
this.store.dispatch('security/getWorkerGroupsAll').then(res => {
this.$nextTick(() => {
if(res.length>0) {
if (res.length > 0) {
this.workerGroup = res[0].id
}
})

74
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue

@ -228,7 +228,7 @@
failureStrategy: this.failureStrategy,
warningType: this.warningType,
processInstancePriority: this.processInstancePriority,
warningGroupId: this.warningGroupId =='' ? 0 : this.warningGroupId,
warningGroupId: this.warningGroupId == '' ? 0 : this.warningGroupId,
receivers: this.receivers.join(',') || '',
receiversCc: this.receiversCc.join(',') || '',
workerGroup: this.workerGroup
@ -256,37 +256,37 @@
},
_preview () {
if (this._verification()) {
let api = 'dag/previewSchedule'
let searchParams = {
schedule: JSON.stringify({
startTime: this.scheduleTime[0],
endTime: this.scheduleTime[1],
crontab: this.crontab
})
}
let msg = ''
if (this._verification()) {
let api = 'dag/previewSchedule'
let searchParams = {
schedule: JSON.stringify({
startTime: this.scheduleTime[0],
endTime: this.scheduleTime[1],
crontab: this.crontab
})
}
let msg = ''
this.store.dispatch(api, searchParams).then(res => {
if (res.length) {
this.previewTimes = res
} else {
this.$message.warning(`${i18n.$t('There is no data for this period of time')}`)
}
})
}
},
this.store.dispatch(api, searchParams).then(res => {
if (res.length) {
this.previewTimes = res
} else {
this.$message.warning(`${i18n.$t('There is no data for this period of time')}`)
}
})
}
},
_getNotifyGroupList () {
return new Promise((resolve, reject) => {
this.store.dispatch('dag/getNotifyGroupList').then(res => {
this.notifyGroupList = res
if (this.notifyGroupList.length) {
resolve()
} else {
reject(new Error(0))
}
})
this.store.dispatch('dag/getNotifyGroupList').then(res => {
this.notifyGroupList = res
if (this.notifyGroupList.length) {
resolve()
} else {
reject(new Error(0))
}
})
})
},
ok () {
@ -302,7 +302,7 @@
watch: {
},
created () {
if(this.timingData.item.workerGroup===undefined) {
if (this.timingData.item.workerGroup === undefined) {
let stateWorkerGroupsList = this.store.state.security.workerGroupsListAll || []
if (stateWorkerGroupsList.length) {
this.workerGroup = stateWorkerGroupsList[0].id
@ -316,22 +316,22 @@
} else {
this.workerGroup = this.timingData.item.workerGroup
}
if(this.timingData.item.crontab !== null){
if (this.timingData.item.crontab !== null) {
this.crontab = this.timingData.item.crontab
}
if(this.timingData.type == 'timing') {
if (this.timingData.type == 'timing') {
let date = new Date()
let year = date.getFullYear()
let month = date.getMonth() + 1
let day = date.getDate()
if (month < 10) {
month = "0" + month;
month = '0' + month
}
if (day < 10) {
day = "0" + day;
day = '0' + day
}
let startDate = year + "-" + month + "-" + day + ' ' + '00:00:00'
let endDate = (year+100) + "-" + month + "-" + day + ' ' + '00:00:00'
let startDate = year + '-' + month + '-' + day + ' ' + '00:00:00'
let endDate = (year + 100) + '-' + month + '-' + day + ' ' + '00:00:00'
let times = []
times[0] = startDate
times[1] = endDate
@ -419,10 +419,10 @@
}
}
.x-date-packer-panel .x-date-packer-day .lattice label.bg-hover {
background: #00BFFF!important;
background: #00BFFF!important;
margin-top: -4px;
}
.x-date-packer-panel .x-date-packer-day .lattice em:hover {
background: #0098e1!important;
background: #0098e1!important;
}
</style>

14
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue

@ -109,15 +109,15 @@
* get data list
*/
_getList (flag) {
if(sessionStorage.getItem('isLeft')==0) {
if (sessionStorage.getItem('isLeft') == 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this.isLoading = !flag
this.getProcessListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo -1
if (this.searchParams.pageNo > 1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.processListP = []
this.processListP = res.totalList
@ -146,11 +146,11 @@
created () {
localStore.removeItem('subProcessId')
},
mounted() {
mounted () {
},
beforeDestroy () {
sessionStorage.setItem('isLeft',1)
sessionStorage.setItem('isLeft', 1)
},
components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}
@ -185,4 +185,4 @@
}
}
}
</style>
</style>

3
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue

@ -106,7 +106,7 @@
props: {},
methods: {
...mapActions('dag', ['getViewTree']),
_close(){
_close () {
this.$router.go(-1)
},
/**
@ -265,5 +265,4 @@
}
}
</style>

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue

@ -133,7 +133,7 @@
props: {
},
methods: {
...mapActions('dag', ['getScheduleList', 'scheduleOffline', 'scheduleOnline', 'getReceiver','deleteTiming']),
...mapActions('dag', ['getScheduleList', 'scheduleOffline', 'scheduleOnline', 'getReceiver', 'deleteTiming']),
/**
* delete
*/
@ -260,7 +260,7 @@
},
closeTiming () {
this.timingDialog = false
},
}
},
watch: {},
created () {

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue

@ -32,8 +32,8 @@
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
name: 'definition-timing-index',
methods :{
_close(){
methods: {
_close () {
this.$router.go(-1)
}
},

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue

@ -70,7 +70,7 @@
},
watch: {
'searchParams': {
searchParams: {
deep: true,
immediate: true,
handler (o) {
@ -91,4 +91,4 @@
computed: {},
components: { mNoData }
}
</script>
</script>

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue

@ -38,7 +38,7 @@
return {
isSpin: true,
msg: true,
parameter: {projectId: 0}
parameter: { projectId: 0 }
}
},
props: {
@ -71,9 +71,9 @@
},
created () {
this.isSpin = true
this.parameter.projectId = this.projectId;
this.parameter.projectId = this.projectId
this.getDefineUserCount(this.parameter).then(res => {
this.msg = res.data.count > 0 ? true : false
this.msg = res.data.count > 0
this.defineUserList = []
this._handleDefineUser(res)
this.isSpin = false

10
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue

@ -75,7 +75,7 @@
this.$router.push({
name: 'projects-instance-list',
query: {
stateType: _.find(stateType, ['label', name])['code'],
stateType: _.find(stateType, ['label', name]).code,
startDate: this.searchParams.startDate,
endDate: this.searchParams.endDate
}
@ -85,11 +85,11 @@
let data = res.data.taskCountDtos
this.processStateList = _.map(data, v => {
return {
key: _.find(stateType, ['code', v.taskStateType])['label'],
key: _.find(stateType, ['code', v.taskStateType]).label,
value: v.count
}
})
const myChart = Chart.pie('#process-state-pie', this.processStateList, { title: '' })
const myChart = Chart.pie('#process-state-pie', this.processStateList, { title: '' })
myChart.echart.setOption(pie)
//
if (this.searchParams.projectId) {
@ -100,7 +100,7 @@
}
},
watch: {
'searchParams': {
searchParams: {
deep: true,
immediate: true,
handler (o) {
@ -115,7 +115,7 @@
})
}
},
'$store.state.projects.sideBar': function() {
'$store.state.projects.sideBar': function () {
echarts.init(document.getElementById('process-state-pie')).resize()
}
},

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue

@ -76,7 +76,7 @@
}
},
watch: {
'searchParams': {
searchParams: {
deep: true,
immediate: true,
handler (o) {
@ -98,4 +98,4 @@
},
components: { mNoData }
}
</script>
</script>

8
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue

@ -78,7 +78,7 @@
this.$router.push({
name: 'task-instance',
query: {
stateType: _.find(stateType, ['label', name])['code'],
stateType: _.find(stateType, ['label', name]).code,
startDate: this.searchParams.startDate,
endDate: this.searchParams.endDate
}
@ -88,7 +88,7 @@
let data = res.data.taskCountDtos
this.taskCtatusList = _.map(data, v => {
return {
key: _.find(stateType, ['code', v.taskStateType])['label'],
key: _.find(stateType, ['code', v.taskStateType]).label,
value: v.count,
type: 'type'
}
@ -105,7 +105,7 @@
}
},
watch: {
'searchParams': {
searchParams: {
deep: true,
immediate: true,
handler (o) {
@ -120,7 +120,7 @@
})
}
},
'$store.state.projects.sideBar': function() {
'$store.state.projects.sideBar': function () {
echarts.init(document.getElementById('task-status-pie')).resize()
}
},

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue

@ -74,7 +74,7 @@
this.$router.push({
name: 'task-instance',
query: {
stateType: _.find(stateType, ['label', name])['code'],
stateType: _.find(stateType, ['label', name]).code,
startDate: this.searchParams.startDate,
endDate: this.searchParams.endDate
}
@ -85,7 +85,7 @@
this.taskStatusList = _.map(data, v => {
return {
// CHECK!!
key: _.find(stateType, ['code', v.taskStateType])['label'],
key: _.find(stateType, ['code', v.taskStateType]).label,
value: v.count,
type: 'type'
}
@ -102,7 +102,7 @@
}
},
watch: {
'searchParams': {
searchParams: {
deep: true,
immediate: true,
handler (o) {

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue

@ -85,7 +85,7 @@
startDate: '',
endDate: ''
},
dataTime: [],
dataTime: []
}
},
props: {

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue

@ -21,4 +21,4 @@
export default {
name: 'process-instance-index'
}
</script>
</script>

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue

@ -27,4 +27,4 @@
},
components: { mInstanceDetails, mSecondaryMenu }
}
</script>
</script>

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue

@ -162,7 +162,7 @@
{{scope.row.count}}
</el-button>
</span>
<!--Recovery Suspend-->
<el-button
v-show="(scope.row.state === 'PAUSE' || scope.row.state == 'STOP') && buttonType !== 'suspend'"
@ -312,7 +312,7 @@
* @param STOP
*/
_stop (item, index) {
if(item.state == 'STOP') {
if (item.state == 'STOP') {
this._countDownFn({
id: item.id,
executeType: 'RECOVER_SUSPENDED_PROCESS',
@ -443,7 +443,7 @@
// },
_arrDelChange (v) {
let arr = []
arr = _.map(v, 'id');
arr = _.map(v, 'id')
console.log(arr)
this.strDelete = _.join(arr, ',')
},

16
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue

@ -108,7 +108,7 @@
setUrlParams(this.searchParams)
this._debounceGET()
},
_pageSize(val) {
_pageSize (val) {
this.searchParams.pageSize = val
setUrlParams(this.searchParams)
this._debounceGET()
@ -119,8 +119,8 @@
_getProcessInstanceListP (flag) {
this.isLoading = !flag
this.getProcessInstance(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo -1
if (this.searchParams.pageNo > 1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.processInstanceList = []
this.processInstanceList = res.totalList
@ -148,15 +148,15 @@
* @desc Prevent functions from being called multiple times
*/
_debounceGET: _.debounce(function (flag) {
if(sessionStorage.getItem('isLeft')==0) {
if (sessionStorage.getItem('isLeft') == 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this._getProcessInstanceListP(flag)
}, 100, {
'leading': false,
'trailing': true
leading: false,
trailing: true
})
},
watch: {
@ -169,7 +169,7 @@
this.searchParams.pageNo = !_.isEmpty(a.query) && a.query.pageNo || 1
}
},
'searchParams': {
searchParams: {
deep: true,
handler () {
this._debounceGET()
@ -199,7 +199,7 @@
beforeDestroy () {
// Destruction wheel
clearInterval(this.setIntervalP)
sessionStorage.setItem('isLeft',1)
sessionStorage.setItem('isLeft', 1)
},
components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}

10
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue

@ -35,7 +35,7 @@
},
methods: {
init () {
},
}
},
created () {
},
@ -43,14 +43,14 @@
const graphGrid = echarts.init(this.$refs['graph-grid'])
graphGrid.setOption(graphGridOption(this.locations, this.connects, this.sourceWorkFlowId, this.isShowLabel), true)
graphGrid.on('click', (params) => {
// Jump to the definition page
this.$router.push({ path: `/projects/definition/list/${params.data.id}`})
});
// Jump to the definition page
this.$router.push({ path: `/projects/definition/list/${params.data.id}` })
})
},
components: {},
computed: {
...mapState('kinship', ['locations', 'connects', 'sourceWorkFlowId'])
},
}
}
</script>

44
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/index.vue

@ -39,7 +39,7 @@
v-tooltip.small.top.start="$t('Reset')"
@click="reset"
></el-button>
<el-button
<el-button
icon="el-icon-view"
size="mini"
v-tooltip.small.top="$t('Dag label display control')"
@ -62,8 +62,6 @@
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import graphGrid from './_source/graphGrid.vue'
export default {
name: 'projects-kinship-index',
components: { graphGrid, mSpin, mNoData },
@ -71,12 +69,12 @@
return {
isLoading: true,
isShowLabel: true,
currentItemName: '',
currentItemName: ''
}
},
props: {},
methods: {
...mapActions('kinship', ['getWorkFlowList','getWorkFlowDAG']),
...mapActions('kinship', ['getWorkFlowList', 'getWorkFlowDAG']),
/**
* init
*/
@ -86,7 +84,7 @@
Promise.all([
// get process definition
this.getWorkFlowList(),
this.getWorkFlowDAG(),
this.getWorkFlowDAG()
]).then((data) => {
this.isLoading = false
}).catch(() => {
@ -96,38 +94,38 @@
/**
* reset
*/
reset() {
this.isLoading = true;
reset () {
this.isLoading = true
this.$nextTick(() => {
this.isLoading = false;
this.isLoading = false
})
},
async onChange(item) {
const { value, label } = item || {};
this.isLoading = true;
this.currentItemName = label;
async onChange (item) {
const { value, label } = item || {}
this.isLoading = true
this.currentItemName = label
try {
await this.getWorkFlowDAG(value);
await this.getWorkFlowDAG(value)
} catch (error) {
this.$message.error(error.msg || '')
}
this.isLoading = false;
this.isLoading = false
},
tooltipOption(text) {
tooltipOption (text) {
return {
text,
maxWidth: '500px',
placement: 'top',
theme: 'dark',
triggerEvent: 'mouseenter',
large: false,
large: false
}
},
changeLabel() {
this.isLoading = true;
this.isShowLabel = !this.isShowLabel;
changeLabel () {
this.isLoading = true
this.isShowLabel = !this.isShowLabel
this.$nextTick(() => {
this.isLoading = false;
this.isLoading = false
})
}
},
@ -142,9 +140,9 @@
},
computed: {
...mapState('kinship', ['locations', 'workList']),
inputFocusStyle() {
inputFocusStyle () {
return `width:280px`
},
}
},
mounted () {
}

8
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue

@ -80,7 +80,7 @@
param.projectId = this.item.id
}
this.$refs['popup'].spinnerLoading = true
this.$refs.popup.spinnerLoading = true
this.store.dispatch(`projects/${this.item ? 'updateProjects' : 'createProjects'}`, param).then(res => {
this.$emit('_onUpdate')
@ -88,13 +88,13 @@
message: res.msg,
type: 'success',
offset: 70
});
})
setTimeout(() => {
this.$refs['popup'].spinnerLoading = false
this.$refs.popup.spinnerLoading = false
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
this.$refs['popup'].spinnerLoading = false
this.$refs.popup.spinnerLoading = false
})
},
_verification () {

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue

@ -90,7 +90,7 @@
this.setProjectName(item.name)
localStore.setItem('projectName', `${item.name}`)
localStore.setItem('projectId', `${item.id}`)
this.$router.push({ path: `/projects/index` })
this.$router.push({ path: '/projects/index' })
},
/**
* Delete Project
@ -113,7 +113,7 @@
*/
_edit (item) {
findComponentDownward(this.$root, 'projects-list')._create(item)
},
}
},
watch: {

5
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/index.vue

@ -62,7 +62,6 @@
import mConditions from '@/module/components/conditions/conditions'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
name: 'projects-list',
data () {
@ -108,8 +107,8 @@
_getList (flag) {
this.isLoading = !flag
this.getProjectsList(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo -1
if (this.searchParams.pageNo > 1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.projectsList = []
this.projectsList = res.totalList

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

@ -122,7 +122,7 @@
},
_forceSuccess (item) {
this.forceTaskSuccess({taskInstanceId: item.id}).then(res => {
this.forceTaskSuccess({ taskInstanceId: item.id }).then(res => {
if (res.code === 0) {
this.$message.success(res.msg)
} else {
@ -134,7 +134,7 @@
},
_go (item) {
this.$router.push({ path: `/projects/instance/list/${item.processInstanceId}` })
},
}
},
watch: {
taskInstanceList (a) {
@ -149,6 +149,6 @@
mounted () {
this.list = this.taskInstanceList
},
components: { mLog}
components: { mLog }
}
</script>

14
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue

@ -106,7 +106,7 @@
_page (val) {
this.searchParams.pageNo = val
},
_pageSize(val) {
_pageSize (val) {
this.searchParams.pageSize = val
},
/**
@ -114,8 +114,8 @@
*/
_getList (flag) {
this.isLoading = !flag
if(this.searchParams.pageNo == undefined) {
this.$router.push({ path: `/projects/index` })
if (this.searchParams.pageNo == undefined) {
this.$router.push({ path: '/projects/index' })
return false
}
this.getTaskInstanceList(this.searchParams).then(res => {
@ -132,15 +132,15 @@
* @desc Prevent functions from being called multiple times
*/
_debounceGET: _.debounce(function (flag) {
if(sessionStorage.getItem('isLeft')==0) {
if (sessionStorage.getItem('isLeft') == 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this._getList(flag)
}, 100, {
'leading': false,
'trailing': true
leading: false,
trailing: true
})
},
watch: {
@ -164,7 +164,7 @@
beforeDestroy () {
// Destruction wheel
clearInterval(this.setIntervalP)
sessionStorage.setItem('isLeft',1)
sessionStorage.setItem('isLeft', 1)
},
components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}

2
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue

@ -28,4 +28,4 @@
name: 'timing-index',
components: { mList, mListConstruction }
}
</script>
</script>

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue

@ -25,7 +25,7 @@
export default {
name: 'resource-index',
components: { mSecondaryMenu },
mounted() {
},
mounted () {
}
}
</script>

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue

@ -20,7 +20,7 @@
<script>
export default {
name: 'file-manage-index',
mounted() {
},
mounted () {
}
}
</script>

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue

@ -136,7 +136,7 @@
this.$message.warning(`${i18n.$t('Please enter the resource content')}`)
return false
}
if (editor.doc.size>3000) {
if (editor.doc.size > 3000) {
this.$message.warning(`${i18n.$t('Resource content cannot exceed 3000 lines')}`)
return false
}

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createFolder/index.vue

@ -94,7 +94,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
this.$router.push({ path: `/resource/file`})
this.$router.push({ path: '/resource/file' })
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
@ -109,7 +109,7 @@
}
return true
},
}
},
watch: {},
created () {

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createUdfFolder/index.vue

@ -94,7 +94,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
this.$router.push({ path: `/resource/udf/resource`})
this.$router.push({ path: '/resource/udf/resource' })
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
@ -108,7 +108,7 @@
return false
}
return true
},
}
},
watch: {},
created () {

8
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue

@ -130,8 +130,8 @@
this._getViewResources()
}, 1000, {
'leading': false,
'trailing': true
leading: false,
trailing: true
}),
/**
* down
@ -143,8 +143,8 @@
this._getViewResources()
}, 1000, {
'leading': false,
'trailing': true
leading: false,
trailing: true
}),
/**
* off handle

6
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue

@ -80,8 +80,8 @@
...mapActions('resource', ['getViewResources', 'updateContent']),
ok () {
if (this._validation()) {
this.spinnerLoading = true
this.updateContent({
this.spinnerLoading = true
this.updateContent({
id: this.$route.params.id,
content: editor.getValue()
}).then(res => {
@ -97,7 +97,7 @@
}
},
_validation () {
if (editor.doc.size>3000) {
if (editor.doc.size > 3000) {
this.$message.warning(`${i18n.$t('Resource content cannot exceed 3000 lines')}`)
return false
}

6
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue

@ -111,7 +111,7 @@
},
_go (item) {
localStore.setItem('file', `${item.alias}|${item.size}`)
if(item.directory) {
if (item.directory) {
localStore.setItem('currentDir', `${item.fullName}`)
this.$router.push({ path: `/resource/file/subdirectory/${item.id}` })
} else {
@ -142,12 +142,12 @@
this.renameDialog = true
},
onUpDate(item) {
onUpDate (item) {
this.$set(this.list, this.index, item)
this.renameDialog = false
},
close() {
close () {
this.renameDialog = false
},

12
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue

@ -66,12 +66,12 @@
_ok (fn) {
this._verification().then(res => {
if (this.name === this.item.alias) {
return new Promise((resolve,reject) => {
this.description === this.item.description ? reject({msg:'内容未修改'}) : resolve()
return new Promise((resolve, reject) => {
this.description === this.item.description ? reject({ msg: '内容未修改' }) : resolve()
})
}else{
} else {
return this.store.dispatch('resource/resourceVerifyName', {
fullName: '/'+this.name,
fullName: '/' + this.name,
type: 'FILE'
})
}
@ -102,7 +102,7 @@
}
})
},
close() {
close () {
this.$emit('close')
}
},
@ -118,4 +118,4 @@
},
components: { mPopup, mListBoxF }
}
</script>
</script>

10
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue

@ -101,15 +101,15 @@
this.searchParams.pageSize = val
},
_getList (flag) {
if(sessionStorage.getItem('isLeft')==0) {
if (sessionStorage.getItem('isLeft') == 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo -1
if (this.searchParams.pageNo > 1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.fileResourcesList = res.totalList
this.total = res.total
@ -124,7 +124,7 @@
this.searchParams.searchVal = ''
this._debounceGET()
},
_onUpdate () {
_onUpdate () {
this._debounceGET()
}
},
@ -140,7 +140,7 @@
mounted () {
},
beforeDestroy () {
sessionStorage.setItem('isLeft',1)
sessionStorage.setItem('isLeft', 1)
},
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue

@ -121,7 +121,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
this.$router.push({ path: `/resource/file/subdirectory/${this.$route.params.id}`})
this.$router.push({ path: `/resource/file/subdirectory/${this.$route.params.id}` })
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
@ -138,7 +138,7 @@
this.$message.warning(`${i18n.$t('Please enter the resource content')}`)
return false
}
if (editor.doc.size>3000) {
if (editor.doc.size > 3000) {
this.$message.warning(`${i18n.$t('Resource content cannot exceed 3000 lines')}`)
return false
}

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFileFolder/index.vue

@ -94,7 +94,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
this.$router.push({ path: `/resource/file/subdirectory/${this.$route.params.id}`})
this.$router.push({ path: `/resource/file/subdirectory/${this.$route.params.id}` })
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
@ -109,7 +109,7 @@
}
return true
},
}
},
watch: {},
created () {

8
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue

@ -110,7 +110,7 @@
},
_go (item) {
localStore.setItem('file', `${item.alias}|${item.size}`)
if(item.directory) {
if (item.directory) {
localStore.setItem('currentDir', `${item.fullName}`)
this.$router.push({ path: `/resource/file/subdirectory/${item.id}` })
} else {
@ -141,12 +141,12 @@
this.renameDialog = true
},
onUpDate(item) {
onUpDate (item) {
this.$set(this.list, this.index, item)
this.renameDialog = false
},
close() {
close () {
this.renameDialog = false
},
@ -168,7 +168,7 @@
setTimeout(() => {
this.list = a
})
},
}
// Listening for routing changes
// '$route': {
// deep: false,

13
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/rename.vue

@ -67,12 +67,12 @@
_ok (fn) {
this._verification().then(res => {
if (this.name === this.item.alias) {
return new Promise((resolve,reject) => {
this.description === this.item.description ? reject({msg:'内容未修改'}) : resolve()
return new Promise((resolve, reject) => {
this.description === this.item.description ? reject({ msg: '内容未修改' }) : resolve()
})
}else{
} else {
return this.store.dispatch('resource/resourceVerifyName', {
fullName: localStore.getItem('currentDir')+'/'+this.name,
fullName: localStore.getItem('currentDir') + '/' + this.name,
type: 'FILE'
})
}
@ -101,10 +101,9 @@
} else {
resolve()
}
})
},
close() {
close () {
this.$emit('close')
}
},
@ -120,4 +119,4 @@
},
components: { mPopup, mListBoxF }
}
</script>
</script>

24
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue

@ -89,12 +89,12 @@
mixins: [listUrlParamHandle],
props: {},
methods: {
...mapActions('resource', ['getResourcesListP','getResourceId']),
...mapActions('resource', ['getResourcesListP', 'getResourceId']),
/**
* File Upload
*/
_uploading () {
findComponentDownward(this.$root, 'roof-nav')._fileChildUpdate('FILE',this.searchParams.id)
findComponentDownward(this.$root, 'roof-nav')._fileChildUpdate('FILE', this.searchParams.id)
},
_onConditions (o) {
this.searchParams = _.assign(this.searchParams, o)
@ -107,15 +107,15 @@
this.searchParams.pageSize = val
},
_getList (flag) {
if(sessionStorage.getItem('isLeft')==0) {
if (sessionStorage.getItem('isLeft') == 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo -1
if (this.searchParams.pageNo > 1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.fileResourcesList = res.totalList
this.total = res.total
@ -131,20 +131,20 @@
this.searchParams.searchVal = ''
this._debounceGET()
},
_onUpdate () {
_onUpdate () {
this.searchParams.id = this.$route.params.id
this._debounceGET()
},
_ckOperation(index) {
let breadName =''
_ckOperation (index) {
let breadName = ''
this.breadList.forEach((item, i) => {
if(i<=index) {
breadName = breadName+'/'+item
if (i <= index) {
breadName = breadName + '/' + item
}
})
this.transferApi(breadName)
},
transferApi(api) {
transferApi (api) {
this.getResourceId({
type: 'FILE',
fullName: api
@ -174,7 +174,7 @@
this.breadList = dir
},
beforeDestroy () {
sessionStorage.setItem('isLeft',1)
sessionStorage.setItem('isLeft', 1)
},
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/createUdfFolder/index.vue

@ -91,7 +91,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
this.$router.push({ path: `/resource/udf`})
this.$router.push({ path: '/resource/udf' })
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
@ -106,7 +106,7 @@
}
return true
},
}
},
watch: {},
created () {

38
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue

@ -119,11 +119,11 @@
udfResourceList: [],
isUpdate: false,
upDisabled: false,
normalizer(node) {
normalizer (node) {
return {
label: node.name
}
},
}
}
},
props: {
@ -131,19 +131,19 @@
},
methods: {
_ok () {
this.$refs['popup'].spinnerLoading = true
this.$refs.popup.spinnerLoading = true
if (this._validation()) {
this._verifyUdfFuncName().then(res => {
this._createUdfFunc().then()
}).then(res => {
setTimeout(() => {
this.$refs['popup'].spinnerLoading = false
this.$refs.popup.spinnerLoading = false
}, 800)
}).catch(e => {
this.$refs['popup'].spinnerLoading = false
this.$refs.popup.spinnerLoading = false
})
} else {
this.$refs['popup'].spinnerLoading = false
this.$refs.popup.spinnerLoading = false
}
},
_createUdfFunc () {
@ -166,7 +166,7 @@
param.id = id
}
// api
this.store.dispatch(`resource/${id ? `updateUdfFunc` : `createUdfFunc`}`, param).then(res => {
this.store.dispatch(`resource/${id ? 'updateUdfFunc' : 'createUdfFunc'}`, param).then(res => {
this.$emit('onUpdate', param)
this.$message.success(res.msg)
resolve()
@ -183,8 +183,8 @@
this.upDisabled = true
},
// selTree
selTree(node) {
this.$refs.assignment.receivedValue(node.id,node.fullName)
selTree (node) {
this.$refs.assignment.receivedValue(node.id, node.fullName)
},
/**
* get udf resources
@ -197,13 +197,13 @@
item = this.filterEmptyDirectory(item)
let item1 = _.cloneDeep(res.data)
this.diGuiTree(item)
this.diGuiTree(this.filterJarFile(item1))
item1 = item1.filter( item => {
if(item.dirctory) {
item1 = item1.filter(item => {
if (item.dirctory) {
return item
}
});
})
this.udfResourceList = item
this.udfResourceDirList = item1
resolve()
@ -211,13 +211,13 @@
})
},
// filterEmptyDirectory
filterEmptyDirectory(array) {
filterEmptyDirectory (array) {
for (const item of array) {
if (item.children) {
this.filterEmptyDirectory(item.children)
}
}
return array.filter(n => ((/\.jar$/.test(n.name) && n.children.length==0) || (!/\.jar$/.test(n.name) && n.children.length>0)))
return array.filter(n => ((/\.jar$/.test(n.name) && n.children.length == 0) || (!/\.jar$/.test(n.name) && n.children.length > 0)))
},
// filterJarFile
filterJarFile (array) {
@ -229,10 +229,10 @@
return array.filter(n => !/\.jar$/.test(n.name))
},
// diGuiTree
diGuiTree(item) { // Recursive convenience tree structure
diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?        
delete item.children : this.diGuiTree(item.children);
item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
? delete item.children : this.diGuiTree(item.children)
})
},
/**
@ -288,7 +288,7 @@
}
})
},
close() {
close () {
this.$emit('close')
}
},

8
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue

@ -112,15 +112,15 @@
this._debounceGET()
},
_getList (flag) {
if(sessionStorage.getItem('isLeft')==0) {
if (sessionStorage.getItem('isLeft') == 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this.isLoading = !flag
this.getUdfFuncListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo -1
if (this.searchParams.pageNo > 1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.udfFuncList = []
this.udfFuncList = res.totalList
@ -144,7 +144,7 @@
mounted () {
},
beforeDestroy () {
sessionStorage.setItem('isLeft',1)
sessionStorage.setItem('isLeft', 1)
},
components: { mListConstruction, mConditions, mList, mSpin, mCreateUdf, mNoData }
}

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue

@ -111,7 +111,7 @@
},
_go (item) {
localStore.setItem('file', `${item.alias}|${item.size}`)
if(item.directory) {
if (item.directory) {
localStore.setItem('currentDir', `${item.fullName}`)
this.$router.push({ path: `/resource/udf/subUdfDirectory/${item.id}` })
}
@ -158,4 +158,4 @@
},
components: { mRename }
}
</script>
</script>

12
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue

@ -67,12 +67,12 @@
_ok (fn) {
this._verification().then(res => {
if (this.name === this.item.alias) {
return new Promise((resolve,reject) => {
this.description === this.item.description ? reject({msg:'内容未修改'}) : resolve()
return new Promise((resolve, reject) => {
this.description === this.item.description ? reject({ msg: '内容未修改' }) : resolve()
})
}else{
} else {
return this.store.dispatch('resource/resourceVerifyName', {
fullName: '/'+this.name,
fullName: '/' + this.name,
type: 'UDF'
})
}
@ -103,7 +103,7 @@
}
})
},
close() {
close () {
this.$emit('close')
}
},
@ -119,4 +119,4 @@
},
components: { mPopup, mListBoxF }
}
</script>
</script>

8
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue

@ -107,15 +107,15 @@
this._debounceGET()
},
_getList (flag) {
if(sessionStorage.getItem('isLeft')==0) {
if (sessionStorage.getItem('isLeft') == 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo -1
if (this.searchParams.pageNo > 1 && res.totalList.length == 0) {
this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.udfResourcesList = []
this.udfResourcesList = res.totalList
@ -139,7 +139,7 @@
mounted () {
},
beforeDestroy () {
sessionStorage.setItem('isLeft',1)
sessionStorage.setItem('isLeft', 1)
},
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save