Browse Source

[Fix][UI Next][V1.0.0-Alpha] Fix the task icons not shown in dag page (#9104)

3.0.0/version-upgrade
wangyizhi 3 years ago committed by GitHub
parent
commit
8d1974b9bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 0
      dolphinscheduler-ui-next/public/images/task-icons/conditions.png
  2. 0
      dolphinscheduler-ui-next/public/images/task-icons/conditions_hover.png
  3. 0
      dolphinscheduler-ui-next/public/images/task-icons/data_quality.png
  4. 0
      dolphinscheduler-ui-next/public/images/task-icons/data_quality_hover.png
  5. 0
      dolphinscheduler-ui-next/public/images/task-icons/datax.png
  6. 0
      dolphinscheduler-ui-next/public/images/task-icons/datax_hover.png
  7. 0
      dolphinscheduler-ui-next/public/images/task-icons/dependent.png
  8. 0
      dolphinscheduler-ui-next/public/images/task-icons/dependent_hover.png
  9. 0
      dolphinscheduler-ui-next/public/images/task-icons/emr.png
  10. 0
      dolphinscheduler-ui-next/public/images/task-icons/emr_hover.png
  11. 0
      dolphinscheduler-ui-next/public/images/task-icons/flink.png
  12. 0
      dolphinscheduler-ui-next/public/images/task-icons/flink_hover.png
  13. 0
      dolphinscheduler-ui-next/public/images/task-icons/http.png
  14. 0
      dolphinscheduler-ui-next/public/images/task-icons/http_hover.png
  15. 0
      dolphinscheduler-ui-next/public/images/task-icons/mr.png
  16. 0
      dolphinscheduler-ui-next/public/images/task-icons/mr_hover.png
  17. 0
      dolphinscheduler-ui-next/public/images/task-icons/pigeon.png
  18. 0
      dolphinscheduler-ui-next/public/images/task-icons/pigeon_hover.png
  19. 0
      dolphinscheduler-ui-next/public/images/task-icons/procedure.png
  20. 0
      dolphinscheduler-ui-next/public/images/task-icons/procedure_hover.png
  21. 0
      dolphinscheduler-ui-next/public/images/task-icons/python.png
  22. 0
      dolphinscheduler-ui-next/public/images/task-icons/python_hover.png
  23. 0
      dolphinscheduler-ui-next/public/images/task-icons/seatunnel.png
  24. 0
      dolphinscheduler-ui-next/public/images/task-icons/seatunnel_hover.png
  25. 0
      dolphinscheduler-ui-next/public/images/task-icons/shell.png
  26. 0
      dolphinscheduler-ui-next/public/images/task-icons/shell_hover.png
  27. 0
      dolphinscheduler-ui-next/public/images/task-icons/spark.png
  28. 0
      dolphinscheduler-ui-next/public/images/task-icons/spark_hover.png
  29. 0
      dolphinscheduler-ui-next/public/images/task-icons/sql.png
  30. 0
      dolphinscheduler-ui-next/public/images/task-icons/sql_hover.png
  31. 0
      dolphinscheduler-ui-next/public/images/task-icons/sqoop.png
  32. 0
      dolphinscheduler-ui-next/public/images/task-icons/sqoop_hover.png
  33. 0
      dolphinscheduler-ui-next/public/images/task-icons/sub_process.png
  34. 0
      dolphinscheduler-ui-next/public/images/task-icons/sub_process_hover.png
  35. 0
      dolphinscheduler-ui-next/public/images/task-icons/switch.png
  36. 0
      dolphinscheduler-ui-next/public/images/task-icons/switch_hover.png
  37. 72
      dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag.module.scss
  38. 8
      dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-cell-active.ts
  39. 4
      dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts
  40. 32
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/tree/index.tsx
  41. 10
      dolphinscheduler-ui-next/src/views/projects/workflow/relation/components/Graph.tsx

0
dolphinscheduler-ui-next/src/assets/images/task-icons/conditions.png → dolphinscheduler-ui-next/public/images/task-icons/conditions.png

Before

Width:  |  Height:  |  Size: 812 B

After

Width:  |  Height:  |  Size: 812 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/conditions_hover.png → dolphinscheduler-ui-next/public/images/task-icons/conditions_hover.png

Before

Width:  |  Height:  |  Size: 736 B

After

Width:  |  Height:  |  Size: 736 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/data_quality.png → dolphinscheduler-ui-next/public/images/task-icons/data_quality.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/data_quality_hover.png → dolphinscheduler-ui-next/public/images/task-icons/data_quality_hover.png

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/datax.png → dolphinscheduler-ui-next/public/images/task-icons/datax.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/datax_hover.png → dolphinscheduler-ui-next/public/images/task-icons/datax_hover.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/dependent.png → dolphinscheduler-ui-next/public/images/task-icons/dependent.png

Before

Width:  |  Height:  |  Size: 743 B

After

Width:  |  Height:  |  Size: 743 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/dependent_hover.png → dolphinscheduler-ui-next/public/images/task-icons/dependent_hover.png

Before

Width:  |  Height:  |  Size: 745 B

After

Width:  |  Height:  |  Size: 745 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/emr.png → dolphinscheduler-ui-next/public/images/task-icons/emr.png

Before

Width:  |  Height:  |  Size: 1015 B

After

Width:  |  Height:  |  Size: 1015 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/emr_hover.png → dolphinscheduler-ui-next/public/images/task-icons/emr_hover.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/flink.png → dolphinscheduler-ui-next/public/images/task-icons/flink.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/flink_hover.png → dolphinscheduler-ui-next/public/images/task-icons/flink_hover.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/http.png → dolphinscheduler-ui-next/public/images/task-icons/http.png

Before

Width:  |  Height:  |  Size: 707 B

After

Width:  |  Height:  |  Size: 707 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/http_hover.png → dolphinscheduler-ui-next/public/images/task-icons/http_hover.png

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 709 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/mr.png → dolphinscheduler-ui-next/public/images/task-icons/mr.png

Before

Width:  |  Height:  |  Size: 930 B

After

Width:  |  Height:  |  Size: 930 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/mr_hover.png → dolphinscheduler-ui-next/public/images/task-icons/mr_hover.png

Before

Width:  |  Height:  |  Size: 862 B

After

Width:  |  Height:  |  Size: 862 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/pigeon.png → dolphinscheduler-ui-next/public/images/task-icons/pigeon.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/pigeon_hover.png → dolphinscheduler-ui-next/public/images/task-icons/pigeon_hover.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/procedure.png → dolphinscheduler-ui-next/public/images/task-icons/procedure.png

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/procedure_hover.png → dolphinscheduler-ui-next/public/images/task-icons/procedure_hover.png

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/python.png → dolphinscheduler-ui-next/public/images/task-icons/python.png

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/python_hover.png → dolphinscheduler-ui-next/public/images/task-icons/python_hover.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/seatunnel.png → dolphinscheduler-ui-next/public/images/task-icons/seatunnel.png

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/seatunnel_hover.png → dolphinscheduler-ui-next/public/images/task-icons/seatunnel_hover.png

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/shell.png → dolphinscheduler-ui-next/public/images/task-icons/shell.png

Before

Width:  |  Height:  |  Size: 747 B

After

Width:  |  Height:  |  Size: 747 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/shell_hover.png → dolphinscheduler-ui-next/public/images/task-icons/shell_hover.png

Before

Width:  |  Height:  |  Size: 745 B

After

Width:  |  Height:  |  Size: 745 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/spark.png → dolphinscheduler-ui-next/public/images/task-icons/spark.png

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/spark_hover.png → dolphinscheduler-ui-next/public/images/task-icons/spark_hover.png

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/sql.png → dolphinscheduler-ui-next/public/images/task-icons/sql.png

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/sql_hover.png → dolphinscheduler-ui-next/public/images/task-icons/sql_hover.png

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
dolphinscheduler-ui-next/src/assets/images/task-icons/sqoop.png → dolphinscheduler-ui-next/public/images/task-icons/sqoop.png

Before

Width:  |  Height:  |  Size: 896 B

After

Width:  |  Height:  |  Size: 896 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/sqoop_hover.png → dolphinscheduler-ui-next/public/images/task-icons/sqoop_hover.png

Before

Width:  |  Height:  |  Size: 897 B

After

Width:  |  Height:  |  Size: 897 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/sub_process.png → dolphinscheduler-ui-next/public/images/task-icons/sub_process.png

Before

Width:  |  Height:  |  Size: 692 B

After

Width:  |  Height:  |  Size: 692 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/sub_process_hover.png → dolphinscheduler-ui-next/public/images/task-icons/sub_process_hover.png

Before

Width:  |  Height:  |  Size: 693 B

After

Width:  |  Height:  |  Size: 693 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/switch.png → dolphinscheduler-ui-next/public/images/task-icons/switch.png

Before

Width:  |  Height:  |  Size: 885 B

After

Width:  |  Height:  |  Size: 885 B

0
dolphinscheduler-ui-next/src/assets/images/task-icons/switch_hover.png → dolphinscheduler-ui-next/public/images/task-icons/switch_hover.png

Before

Width:  |  Height:  |  Size: 825 B

After

Width:  |  Height:  |  Size: 825 B

72
dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/dag.module.scss

@ -102,116 +102,116 @@ $bgLight: #ffffff;
background-size: 100% 100%; background-size: 100% 100%;
margin-right: 10px; margin-right: 10px;
&.icon-shell { &.icon-shell {
background-image: url('@/assets/images/task-icons/shell.png'); background-image: url('/images/task-icons/shell.png');
} }
&.icon-sub_process { &.icon-sub_process {
background-image: url('@/assets/images/task-icons/sub_process.png'); background-image: url('/images/task-icons/sub_process.png');
} }
&.icon-data_quality { &.icon-data_quality {
background-image: url('@/assets/images/task-icons/data_quality.png'); background-image: url('/images/task-icons/data_quality.png');
} }
&.icon-procedure { &.icon-procedure {
background-image: url('@/assets/images/task-icons/procedure.png'); background-image: url('/images/task-icons/procedure.png');
} }
&.icon-sql { &.icon-sql {
background-image: url('@/assets/images/task-icons/sql.png'); background-image: url('/images/task-icons/sql.png');
} }
&.icon-flink { &.icon-flink {
background-image: url('@/assets/images/task-icons/flink.png'); background-image: url('/images/task-icons/flink.png');
} }
&.icon-mr { &.icon-mr {
background-image: url('@/assets/images/task-icons/mr.png'); background-image: url('/images/task-icons/mr.png');
} }
&.icon-python { &.icon-python {
background-image: url('@/assets/images/task-icons/python.png'); background-image: url('/images/task-icons/python.png');
} }
&.icon-dependent { &.icon-dependent {
background-image: url('@/assets/images/task-icons/dependent.png'); background-image: url('/images/task-icons/dependent.png');
} }
&.icon-http { &.icon-http {
background-image: url('@/assets/images/task-icons/http.png'); background-image: url('/images/task-icons/http.png');
} }
&.icon-datax { &.icon-datax {
background-image: url('@/assets/images/task-icons/datax.png'); background-image: url('/images/task-icons/datax.png');
} }
&.icon-pigeon { &.icon-pigeon {
background-image: url('@/assets/images/task-icons/pigeon.png'); background-image: url('/images/task-icons/pigeon.png');
} }
&.icon-sqoop { &.icon-sqoop {
background-image: url('@/assets/images/task-icons/sqoop.png'); background-image: url('/images/task-icons/sqoop.png');
} }
&.icon-conditions { &.icon-conditions {
background-image: url('@/assets/images/task-icons/conditions.png'); background-image: url('/images/task-icons/conditions.png');
} }
&.icon-seatunnel { &.icon-seatunnel {
background-image: url('@/assets/images/task-icons/seatunnel.png'); background-image: url('/images/task-icons/seatunnel.png');
} }
&.icon-spark { &.icon-spark {
background-image: url('@/assets/images/task-icons/spark.png'); background-image: url('/images/task-icons/spark.png');
} }
&.icon-switch { &.icon-switch {
background-image: url('@/assets/images/task-icons/switch.png'); background-image: url('/images/task-icons/switch.png');
} }
&.icon-emr { &.icon-emr {
background-image: url('@/assets/images/task-icons/emr.png'); background-image: url('/images/task-icons/emr.png');
} }
} }
&:hover { &:hover {
.sidebar-icon { .sidebar-icon {
&.icon-shell { &.icon-shell {
background-image: url('@/assets/images/task-icons/shell_hover.png'); background-image: url('/images/task-icons/shell_hover.png');
} }
&.icon-sub_process { &.icon-sub_process {
background-image: url('@/assets/images/task-icons/sub_process_hover.png'); background-image: url('/images/task-icons/sub_process_hover.png');
} }
&.icon-data_quality { &.icon-data_quality {
background-image: url('@/assets/images/task-icons/data_quality_hover.png'); background-image: url('/images/task-icons/data_quality_hover.png');
} }
&.icon-procedure { &.icon-procedure {
background-image: url('@/assets/images/task-icons/procedure_hover.png'); background-image: url('/images/task-icons/procedure_hover.png');
} }
&.icon-sql { &.icon-sql {
background-image: url('@/assets/images/task-icons/sql_hover.png'); background-image: url('/images/task-icons/sql_hover.png');
} }
&.icon-flink { &.icon-flink {
background-image: url('@/assets/images/task-icons/flink_hover.png'); background-image: url('/images/task-icons/flink_hover.png');
} }
&.icon-mr { &.icon-mr {
background-image: url('@/assets/images/task-icons/mr_hover.png'); background-image: url('/images/task-icons/mr_hover.png');
} }
&.icon-python { &.icon-python {
background-image: url('@/assets/images/task-icons/python_hover.png'); background-image: url('/images/task-icons/python_hover.png');
} }
&.icon-dependent { &.icon-dependent {
background-image: url('@/assets/images/task-icons/dependent_hover.png'); background-image: url('/images/task-icons/dependent_hover.png');
} }
&.icon-http { &.icon-http {
background-image: url('@/assets/images/task-icons/http_hover.png'); background-image: url('/images/task-icons/http_hover.png');
} }
&.icon-datax { &.icon-datax {
background-image: url('@/assets/images/task-icons/datax_hover.png'); background-image: url('/images/task-icons/datax_hover.png');
} }
&.icon-pigeon { &.icon-pigeon {
background-image: url('@/assets/images/task-icons/pigeon_hover.png'); background-image: url('/images/task-icons/pigeon_hover.png');
} }
&.icon-sqoop { &.icon-sqoop {
background-image: url('@/assets/images/task-icons/sqoop_hover.png'); background-image: url('/images/task-icons/sqoop_hover.png');
} }
&.icon-conditions { &.icon-conditions {
background-image: url('@/assets/images/task-icons/conditions_hover.png'); background-image: url('/images/task-icons/conditions_hover.png');
} }
&.icon-seatunnel { &.icon-seatunnel {
background-image: url('@/assets/images/task-icons/seatunnel_hover.png'); background-image: url('/images/task-icons/seatunnel_hover.png');
} }
&.icon-spark { &.icon-spark {
background-image: url('@/assets/images/task-icons/spark_hover.png'); background-image: url('/images/task-icons/spark_hover.png');
} }
&.icon-switch { &.icon-switch {
background-image: url('@/assets/images/task-icons/switch_hover.png'); background-image: url('/images/task-icons/switch_hover.png');
} }
&.icon-emr { &.icon-emr {
background-image: url('@/assets/images/task-icons/emr_hover.png'); background-image: url('/images/task-icons/emr_hover.png');
} }
} }
} }

8
dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-cell-active.ts

@ -97,7 +97,9 @@ export function useCellActive(options: Options) {
let portAttrs = null let portAttrs = null
if (isHover || isSelected) { if (isHover || isSelected) {
img = `/src/assets/images/task-icons/${node.data.taskType.toLocaleLowerCase()}_hover.png` img = `${
import.meta.env.BASE_URL
}images/task-icons/${node.data.taskType.toLocaleLowerCase()}_hover.png`
if (isHover) { if (isHover) {
nodeAttrs = nodeHover nodeAttrs = nodeHover
portAttrs = _.merge(portDefault, portHover) portAttrs = _.merge(portDefault, portHover)
@ -106,7 +108,9 @@ export function useCellActive(options: Options) {
portAttrs = _.merge(portDefault, portSelected) portAttrs = _.merge(portDefault, portSelected)
} }
} else { } else {
img = `/src/assets/images/task-icons/${node.data.taskType.toLocaleLowerCase()}.png` img = `${
import.meta.env.BASE_URL
}images/task-icons/${node.data.taskType.toLocaleLowerCase()}.png`
nodeAttrs = NODE.attrs nodeAttrs = NODE.attrs
portAttrs = portDefault portAttrs = portDefault
} }

4
dolphinscheduler-ui-next/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts

@ -83,7 +83,9 @@ export function useCustomCellBuilder() {
attrs: { attrs: {
image: { image: {
// Use href instead of xlink:href, you may lose the icon when downloadPNG // Use href instead of xlink:href, you may lose the icon when downloadPNG
'xlink:href': `/src/assets/images/task-icons/${type.toLocaleLowerCase()}.png` 'xlink:href': `${
import.meta.env.BASE_URL
}images/task-icons/${type.toLocaleLowerCase()}.png`
}, },
title: { title: {
text: truncation text: truncation

32
dolphinscheduler-ui-next/src/views/projects/workflow/definition/tree/index.tsx

@ -55,82 +55,82 @@ export default defineComponent({
{ {
taskType: 'SHELL', taskType: 'SHELL',
color: '#646464', color: '#646464',
image: '/src/assets/images/task-icons/shell.png' image: `${import.meta.env.BASE_URL}images/task-icons/shell.png`
}, },
{ {
taskType: 'SUB_PROCESS', taskType: 'SUB_PROCESS',
color: '#4295DA', color: '#4295DA',
image: '/src/assets/images/task-icons/sub_process.png' image: `${import.meta.env.BASE_URL}images/task-icons/sub_process.png`
}, },
{ {
taskType: 'PROCEDURE', taskType: 'PROCEDURE',
color: '#545CC6', color: '#545CC6',
image: '/src/assets/images/task-icons/procedure.png' image: `${import.meta.env.BASE_URL}images/task-icons/procedure.png`
}, },
{ {
taskType: 'SQL', taskType: 'SQL',
color: '#8097A0', color: '#8097A0',
image: '/src/assets/images/task-icons/sql.png' image: `${import.meta.env.BASE_URL}images/task-icons/sql.png`
}, },
{ {
taskType: 'SPARK', taskType: 'SPARK',
color: '#a16435', color: '#a16435',
image: '/src/assets/images/task-icons/spark.png' image: `${import.meta.env.BASE_URL}images/task-icons/spark.png`
}, },
{ {
taskType: 'FLINK', taskType: 'FLINK',
color: '#d68f5b', color: '#d68f5b',
image: '/src/assets/images/task-icons/flink.png' image: `${import.meta.env.BASE_URL}images/task-icons/flink.png`
}, },
{ {
taskType: 'MR', taskType: 'MR',
color: '#A1A5C9', color: '#A1A5C9',
image: '/src/assets/images/task-icons/mr.png' image: `${import.meta.env.BASE_URL}images/task-icons/mr.png`
}, },
{ {
taskType: 'PYTHON', taskType: 'PYTHON',
color: '#60BCD5', color: '#60BCD5',
image: '/src/assets/images/task-icons/python.png' image: `${import.meta.env.BASE_URL}images/task-icons/python.png`
}, },
{ {
taskType: 'DEPENDENT', taskType: 'DEPENDENT',
color: '#60BCD5', color: '#60BCD5',
image: '/src/assets/images/task-icons/dependent.png' image: `${import.meta.env.BASE_URL}images/task-icons/dependent.png`
}, },
{ {
taskType: 'HTTP', taskType: 'HTTP',
color: '#7f3903', color: '#7f3903',
image: '/src/assets/images/task-icons/http.png' image: `${import.meta.env.BASE_URL}images/task-icons/http.png`
}, },
{ {
taskType: 'DATAX', taskType: 'DATAX',
color: '#75CC71', color: '#75CC71',
image: '/src/assets/images/task-icons/datax.png' image: `${import.meta.env.BASE_URL}images/task-icons/datax.png`
}, },
{ {
taskType: 'PIGEON', taskType: 'PIGEON',
color: '#5EC459', color: '#5EC459',
image: '/src/assets/images/task-icons/pigeon.png' image: `${import.meta.env.BASE_URL}images/task-icons/pigeon.png`
}, },
{ {
taskType: 'SQOOP', taskType: 'SQOOP',
color: '#f98b3d', color: '#f98b3d',
image: '/src/assets/images/task-icons/sqoop.png' image: `${import.meta.env.BASE_URL}images/task-icons/sqoop.png`
}, },
{ {
taskType: 'CONDITIONS', taskType: 'CONDITIONS',
color: '#b99376', color: '#b99376',
image: '/src/assets/images/task-icons/conditions.png' image: `${import.meta.env.BASE_URL}images/task-icons/conditions.png`
}, },
{ {
taskType: 'SWITCH', taskType: 'SWITCH',
color: '#ff6f00', color: '#ff6f00',
image: '/src/assets/images/task-icons/switch.png' image: `${import.meta.env.BASE_URL}images/task-icons/switch.png`
}, },
{ {
taskType: 'SEATUNNEL', taskType: 'SEATUNNEL',
color: '#8c8c8f', color: '#8c8c8f',
image: '/src/assets/images/task-icons/seatunnel.png' image: `${import.meta.env.BASE_URL}images/task-icons/seatunnel.png`
}, },
{ taskType: 'DAG', color: '#bbdde9' } { taskType: 'DAG', color: '#bbdde9' }
]) ])

10
dolphinscheduler-ui-next/src/views/projects/workflow/relation/components/Graph.tsx

@ -139,14 +139,18 @@ const GraphChart = defineComponent({
Number(item.schedulePublishStatus), Number(item.schedulePublishStatus),
Number(item.workFlowPublishStatus) Number(item.workFlowPublishStatus)
), ),
workFlowPublishStatus: Number(item.workFlowPublishStatus) === 0 workFlowPublishStatus:
Number(item.workFlowPublishStatus) === 0
? t('project.workflow.offline') ? t('project.workflow.offline')
: t('project.workflow.online'), : t('project.workflow.online'),
schedulePublishStatus: Number(item.schedulePublishStatus) === 0 schedulePublishStatus:
Number(item.schedulePublishStatus) === 0
? t('project.workflow.offline') ? t('project.workflow.offline')
: t('project.workflow.online'), : t('project.workflow.online'),
crontab: item.crontab, crontab: item.crontab,
scheduleStartTime: item.scheduleStartTime ? item.scheduleStartTime : '-', scheduleStartTime: item.scheduleStartTime
? item.scheduleStartTime
: '-',
scheduleEndTime: item.scheduleEndTime ? item.scheduleEndTime : '-' scheduleEndTime: item.scheduleEndTime ? item.scheduleEndTime : '-'
} }
}), }),

Loading…
Cancel
Save