From 1bfba74b6bea7da6d14b0da1ab8b1efe02e474b3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 03 一月 2025 13:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/Process/style/flow-viewer.scss | 62 +++++++++++++++++++++++++------
1 files changed, 50 insertions(+), 12 deletions(-)
diff --git a/src/components/Process/style/flow-viewer.scss b/src/components/Process/style/flow-viewer.scss
index 051c33e..032ce1c 100644
--- a/src/components/Process/style/flow-viewer.scss
+++ b/src/components/Process/style/flow-viewer.scss
@@ -118,20 +118,28 @@
stroke: #56bb56 !important;
}
- .highlight-todo.djs-connection > .djs-visual > path {
- stroke: #eab24a !important;
- stroke-dasharray: 4px !important;
+
+ .highlight-todo.djs-shape .djs-visual > :nth-child(1) {
+ fill: #559db0 !important;
+ stroke: #559db0 !important;
fill-opacity: 0.2 !important;
}
- .highlight-todo.djs-shape .djs-visual > :nth-child(1) {
- stroke-dasharray: 5, 5;
- stroke-dashoffset: 500;
- stroke: #eab24a !important;
- fill: rgba(252, 211, 127, 0.2) !important;
+ .highlight-todo.djs-shape .djs-visual > :nth-child(2) {
+ fill: #559db0 !important;
}
- // 娴佺▼绾�
+ .highlight-todo.djs-shape .djs-visual > path {
+ fill: #559db0 !important;
+ fill-opacity: 0.2 !important;
+ stroke: #559db0 !important;
+ }
+
+ .highlight-todo.djs-connection > .djs-visual > path {
+ stroke: #559db0 !important;
+ }
+
+ // 宸茶秴鏃舵祦绋嬬嚎
.highlight-overtime.djs-shape .djs-visual > :nth-child(1) {
fill: #ff5353 !important;
stroke: #ff5353 !important;
@@ -150,6 +158,27 @@
.highlight-overtime.djs-connection > .djs-visual > path {
stroke: #ff5353 !important;
+ }
+
+ // 鍗冲皢瓒呮椂娴佺▼绾�
+ .highlight-willOvertime.djs-shape .djs-visual > :nth-child(1) {
+ fill: #eab24a !important;
+ stroke: #eab24a !important;
+ fill-opacity: 0.2 !important;
+ }
+
+ .highlight-willOvertime.djs-shape .djs-visual > :nth-child(2) {
+ fill: #eab24a !important;
+ }
+
+ .highlight-willOvertimeovertime.djs-shape .djs-visual > path {
+ fill: #eab24a !important;
+ fill-opacity: 0.2 !important;
+ stroke: #eab24a !important;
+ }
+
+ .highlight-willOvertime.djs-connection > .djs-visual > path {
+ stroke: #eab24a !important;
}
@@ -184,12 +213,21 @@
margin-right: 8px;
}
- .processing {
+ .willOvertime {
background-color: #fcf5ea;
padding: 4px;
border: 1px solid #fce9c7;
border-radius: 3px;
- color: #eab24a;
+ color: #de9603;
+ margin-right: 8px;
+ }
+
+ .processing {
+ background-color: #d8f1fc;
+ padding: 4px;
+ border: 1px solid #b6e1f5;
+ border-radius: 3px;
+ color: #559db0;
margin-right: 8px;
}
@@ -205,7 +243,7 @@
.overtime {
padding: 4px;
background: #ffd1d1;
- border: 1px solid rgba(255, 0, 0, 0.1);
+ border: 1px solid rgba(246, 181, 181, 0.1);
border-radius: 3px;
color: #ff5353;
margin-right: 5px;
--
Gitblit v1.8.0