diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss index 3ad2416ee3..35a811f442 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/taskbar.scss @@ -105,6 +105,12 @@ &.icos-spark { background-image: url("../images/task-icos/spark.png"); } + &.icos-switch { + background-image: url("../images/task-icos/switch.png"); + } + &.icos-tis { + background-image: url("../images/task-icos/tis.png"); + } } span { @@ -159,6 +165,12 @@ &.icos-spark { background-image: url("../images/task-icos/spark_hover.png"); } + &.icos-switch { + background-image: url("../images/task-icos/switch_hover.png"); + } + &.icos-tis { + background-image: url("../images/task-icos/tis_hover.png"); + } } } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue index 4fcde2cfe1..4071fd955b 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/canvas/toolbar.vue @@ -112,7 +112,7 @@ > + +
+ +
0 ? { subProcessCodes: codes.join(',') } : null + path: `/${$name[0]}/${this.projectCode}/${$name[1]}/list/${last}`, + query: ids.length > 0 ? { subs: ids.join(',') } : null }) }, - toSubProcess ({ subProcessCode, fromThis }) { - let subProcessCodes = [] - let getIds = this.$route.query.subProcessCodes - if (getIds) { - let newId = getIds.split(',') - newId.push(this.definitionCode) - subProcessCodes = newId + toSubProcess ({ subProcessCode, subInstanceId }) { + const tarIdentifier = this.type === 'instance' ? subInstanceId : subProcessCode + const curIdentifier = this.type === 'instance' ? this.instanceId : this.definitionCode + let subs = [] + let olds = this.$route.query.subs + if (olds) { + subs = olds.split(',') + subs.push(curIdentifier) } else { - subProcessCodes.push(this.definitionCode) + subs.push(curIdentifier) } let $name = this.$route.name.split('-') this.$router.push({ - path: `/${$name[0]}/${this.projectCode}/${$name[1]}/list/${subProcessCode}`, - query: { subProcessCodes: subProcessCodes.join(',') } + path: `/${$name[0]}/${this.projectCode}/${$name[1]}/list/${tarIdentifier}`, + query: { subs: subs.join(',') } }) }, seeHistory (taskName) { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/copyFromTask.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/referenceFromTask.vue similarity index 98% rename from dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/copyFromTask.vue rename to dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/referenceFromTask.vue index cc5ad42fde..ef1489cb85 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/copyFromTask.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/referenceFromTask.vue @@ -16,7 +16,7 @@ */