From 70e384c9fca9e7caf9a079b93c60ad5a379251b8 Mon Sep 17 00:00:00 2001 From: yeahhhz <45848815+yeahhhz@users.noreply.github.com> Date: Fri, 8 Sep 2023 07:39:05 +0800 Subject: [PATCH] [Improvement][UI] Optimize task disable node style in dark theme (#14871) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 旺阳 --- .../workflow/components/dag/use-custom-cell-builder.ts | 2 +- .../projects/workflow/components/dag/use-task-edit.ts | 2 +- .../views/projects/workflow/components/dag/x6-style.scss | 8 ++++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts index 7ff2e0c53d..d6705d20c6 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts +++ b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-custom-cell-builder.ts @@ -103,7 +103,7 @@ export function useCustomCellBuilder() { text: truncation }, rect: { - fill: flag === 'NO' ? '#f3f3f5' : '#ffffff' + fill: flag === 'NO' ? 'var(--custom-disable-bg)' : '#ffffff' } } } diff --git a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-task-edit.ts b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-task-edit.ts index 69fc85cb19..79d4eacb6a 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-task-edit.ts +++ b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/use-task-edit.ts @@ -170,7 +170,7 @@ export function useTaskEdit(options: Options) { setNodeName(task.code + '', taskDef.name) let fillColor = '#ffffff' if (task.flag === 'YES') { - fillColor = '#f3f3f5' + fillColor = 'var(--custom-disable-bg)' } setNodeFillColor(task.code + '', fillColor) diff --git a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/x6-style.scss b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/x6-style.scss index 740bbefb04..ac30449ee2 100644 --- a/dolphinscheduler-ui/src/views/projects/workflow/components/dag/x6-style.scss +++ b/dolphinscheduler-ui/src/views/projects/workflow/components/dag/x6-style.scss @@ -32,3 +32,11 @@ $BG_WHITE: #ffffff; } } } + +[class*="dag-light"] { + --custom-disable-bg: #f3f3f5 +} + +[class*="dag-dark"] { + --custom-disable-bg: #d3d3d3 +} \ No newline at end of file