This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch 1.3.2-release
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.2-release by this push:
new 0d180ae [ui]It is forbidden to select non-existent resources and
modify the tree display data format
new 276c599 Merge pull request #3534 from break60/1.3.2-release
0d180ae is described below
commit 0d180ae99507019d99d5e9f187cf313a3ff69b83
Author: break60 <[email protected]>
AuthorDate: Tue Aug 18 10:37:52 2020 +0800
[ui]It is forbidden to select non-existent resources and modify the tree
display data format
---
.../js/conf/home/pages/dag/_source/formModel/tasks/flink.vue | 1 +
.../js/conf/home/pages/dag/_source/formModel/tasks/mr.vue | 1 +
.../conf/home/pages/dag/_source/formModel/tasks/python.vue | 1 +
.../js/conf/home/pages/dag/_source/formModel/tasks/shell.vue | 1 +
.../js/conf/home/pages/dag/_source/formModel/tasks/spark.vue | 1 +
.../projects/pages/definition/pages/tree/_source/util.js | 12 ++++++------
6 files changed, 11 insertions(+), 6 deletions(-)
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 dca5ade..a8ebadb 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 4512835..c883992 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 379de6a..f335d50 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 0c07a9a..4f215f6 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 b678a72..fff580a 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 2df1783..4cddb0e 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 = '<div style="text-align: left;word-break:break-all">'
- str += `id : ${data.id}</br>`
- str += `host : ${data.host}</br>`
- str += `name : ${data.name}</br>`
- str += `state : ${data.state ? tasksState[data.state].desc :
'-'}（${data.state}）</br>`
+ str += `id : ${data.id ? data.id : '-'}</br>`
+ str += `host : ${data.host ? data.host : '-'}</br>`
+ str += `name : ${data.name ? data.name : '-'}</br>`
+ str += `state : ${data.state ? tasksState[data.state].desc :
'-'}（${data.state ? data.state : '-'}）</br>`
if (data.type) {
- str += `type : ${data.type}</br>`
+ str += `type : ${data.type ? data.type : '-'}</br>`
}
str += `startTime : ${data.startTime ? formatDate(data.startTime) :
'-'}</br>`
str += `endTime : ${data.endTime ? formatDate(data.endTime) : '-'}</br>`
- str += `duration : ${data.duration}</br>`
+ str += `duration : ${data.duration ? data.duration : '-'}</br>`
str += '</div>'
return str
}
