diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue index dca5adec8b..a8ebadb631 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue @@ -404,6 +404,7 @@ id: -1, name: $t('No resources exist'), fullName: '/'+$t('No resources exist'), + isDisabled: true, children: [] }] if(optionsCmp.length>0) { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue index 451283557c..c883992fac 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue @@ -244,6 +244,7 @@ id: -1, name: $t('No resources exist'), fullName: '/'+$t('No resources exist'), + isDisabled: true, children: [] }] if(optionsCmp.length>0) { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue index 379de6a0d2..f335d50f5e 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue @@ -224,6 +224,7 @@ id: -1, name: $t('No resources exist'), fullName: '/'+$t('No resources exist'), + isDisabled: true, children: [] }] if(optionsCmp.length>0) { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue index 0c07a9afc1..4f215f65c2 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue @@ -262,6 +262,7 @@ id: -1, name: $t('No resources exist'), fullName: '/'+$t('No resources exist'), + isDisabled: true, children: [] }] if(optionsCmp.length>0) { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue index b678a72321..fff580a929 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue @@ -364,6 +364,7 @@ id: -1, name: $t('No resources exist'), fullName: '/'+$t('No resources exist'), + isDisabled: true, children: [] }] if(optionsCmp.length>0) { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js index 2df1783593..4cddb0e318 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js @@ -23,16 +23,16 @@ import { tasksState } from '@/conf/home/pages/dag/_source/config' */ const rtInstancesTooltip = (data) => { let str = '
' - str += `id : ${data.id}
` - str += `host : ${data.host}
` - str += `name : ${data.name}
` - str += `state : ${data.state ? tasksState[data.state].desc : '-'}(${data.state})
` + str += `id : ${data.id ? data.id : '-'}
` + str += `host : ${data.host ? data.host : '-'}
` + str += `name : ${data.name ? data.name : '-'}
` + str += `state : ${data.state ? tasksState[data.state].desc : '-'}(${data.state ? data.state : '-'})
` if (data.type) { - str += `type : ${data.type}
` + str += `type : ${data.type ? data.type : '-'}
` } str += `startTime : ${data.startTime ? formatDate(data.startTime) : '-'}
` str += `endTime : ${data.endTime ? formatDate(data.endTime) : '-'}
` - str += `duration : ${data.duration}
` + str += `duration : ${data.duration ? data.duration : '-'}
` str += '
' return str }