Merge pull request #3534 from break60/1.3.2-release

[ui]It is forbidden to select non-existent resources and modify the t…

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) {

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) {

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) {

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) {

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) {

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 += `id : ${data.id ? data.id : '-'}</br>`
-  str += `host : ${data.host}</br>`
+  str += `host : ${data.host ? data.host : '-'}</br>`
-  str += `name : ${data.name}</br>`
+  str += `name : ${data.name ? data.name : '-'}</br>`
-  str += `state : ${data.state ? tasksState[data.state].desc : '-'}（${data.state}）</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
 }