Merge remote-tracking branch 'yudao/dev' into dev

2025-11-05 09:56:47 +08:00
parent 62407c7aa2 db804c2602
commit ed923a2661
95 changed files with 2658 additions and 1351 deletions
--- a/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue
+++ b/apps/web-antd/src/views/bpm/processInstance/detail/modules/time-line.vue
@@ -109,11 +109,11 @@ function getApprovalNodeIcon(taskStatus: number, nodeType: BpmNodeTypeEnum) {
  }
  if (
    [
-      BpmNodeTypeEnum.START_USER_NODE,
-      BpmNodeTypeEnum.USER_TASK_NODE,
-      BpmNodeTypeEnum.TRANSACTOR_NODE,
      BpmNodeTypeEnum.CHILD_PROCESS_NODE,
      BpmNodeTypeEnum.END_EVENT_NODE,
+      BpmNodeTypeEnum.START_USER_NODE,
+      BpmNodeTypeEnum.TRANSACTOR_NODE,
+      BpmNodeTypeEnum.USER_TASK_NODE,
    ].includes(nodeType)
  ) {
    return statusIconMap[taskStatus]?.icon || 'mdi:clock-outline';