From 3c197753950e13e1ab3bb373e2f6f94b64f69044 Mon Sep 17 00:00:00 2001
From: xlsea <m@xlsea.cn>
Date: Mon, 1 Jul 2024 20:19:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(sj=5Fmap=5Freduce):=20=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E8=8A=82=E7=82=B9=E6=96=B0=E5=A2=9E=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?ID=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/workflow/modules/drawer/branch-drawer.vue | 6 +++---
 src/components/workflow/modules/nodes/branch-node.vue    | 5 +++++
 src/components/workflow/modules/nodes/callback-node.vue  | 1 +
 src/components/workflow/modules/nodes/start-node.vue     | 6 +++++-
 src/components/workflow/modules/nodes/task-node.vue      | 1 +
 src/service/api/workflow.ts                              | 2 +-
 src/typings/workflow.d.ts                                | 3 ++-
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/components/workflow/modules/drawer/branch-drawer.vue b/src/components/workflow/modules/drawer/branch-drawer.vue
index 8d04ac8..ae21af7 100644
--- a/src/components/workflow/modules/drawer/branch-drawer.vue
+++ b/src/components/workflow/modules/drawer/branch-drawer.vue
@@ -36,7 +36,7 @@ const form = ref<Workflow.ConditionNodeType>({
   decision: {
     logicalCondition: 1,
     expressionType: 1,
-    checkContent: []
+    checkContents: []
   }
 });
 
@@ -156,8 +156,8 @@ const rules: FormRules = {
             :extensions="[oneDark]"
           />
         </NFormItem>
-        <NFormItem path="decision.checkContent" label="模拟上下文">
-          <DynamicInput v-model:value="form.decision!.checkContent!" path="decision.checkContent" />
+        <NFormItem path="decision.checkContents" label="模拟上下文">
+          <DynamicInput v-model:value="form.decision!.checkContents!" path="decision.checkContents" />
         </NFormItem>
       </NForm>
 
diff --git a/src/components/workflow/modules/nodes/branch-node.vue b/src/components/workflow/modules/nodes/branch-node.vue
index fde7f4f..35fb60c 100644
--- a/src/components/workflow/modules/nodes/branch-node.vue
+++ b/src/components/workflow/modules/nodes/branch-node.vue
@@ -206,6 +206,11 @@ const getClass = (item: Workflow.ConditionNodeType) => {
                   <span class="node-title">
                     <NBadge dot processing color="#52c41a" />
                     &nbsp;{{ item.nodeName }}
+                    <span
+                      v-if="item.id && item.nodeName !== $t('workflow.node.condition.conditionNodes.otherNodeName')"
+                    >
+                      &nbsp;({{ item.id }})
+                    </span>
                     <NTooltip v-if="item.nodeName === $t('workflow.node.condition.conditionNodes.otherNodeName')">
                       <template #trigger>
                         <icon-ant-design:info-circle-outlined class="ml-3px text-16px" />
diff --git a/src/components/workflow/modules/nodes/callback-node.vue b/src/components/workflow/modules/nodes/callback-node.vue
index 92e6b5c..cca88ad 100644
--- a/src/components/workflow/modules/nodes/callback-node.vue
+++ b/src/components/workflow/modules/nodes/callback-node.vue
@@ -148,6 +148,7 @@ const getClass = (item: Workflow.ConditionNodeType) => {
                     <span class="text text-#935af6">
                       <NBadge processing dot :color="item.workflowNodeStatus === 1 ? '#52c41a' : '#ff4d4f'" />
                       &nbsp;{{ item.nodeName }}
+                      <span v-if="item.id">&nbsp;({{ item.id }})</span>
                     </span>
                     <icon-ant-design:close-outlined v-if="!disabled" class="close" @click.stop="delTerm" />
                   </div>
diff --git a/src/components/workflow/modules/nodes/start-node.vue b/src/components/workflow/modules/nodes/start-node.vue
index 80bda32..9bbbdac 100644
--- a/src/components/workflow/modules/nodes/start-node.vue
+++ b/src/components/workflow/modules/nodes/start-node.vue
@@ -83,7 +83,11 @@ const show = () => {
       <div class="title">
         <span class="text">
           <NBadge dot :color="nodeData.workflowStatus === 1 ? '#52c41a' : '#ff000d'" />
-          <span class="text-#ff943e">&nbsp;{{ nodeData.workflowName ? nodeData.workflowName : '请选择组' }}</span>
+          <span class="text-#ff943e">
+            &nbsp;{{
+              nodeData.workflowName ? `${nodeData.workflowName} ${nodeData.id ? ` (${nodeData.id})` : ''}` : '请选择组'
+            }}
+          </span>
         </span>
       </div>
       <div v-if="nodeData.groupName" class="content">
diff --git a/src/components/workflow/modules/nodes/task-node.vue b/src/components/workflow/modules/nodes/task-node.vue
index 4cd947d..c805e67 100644
--- a/src/components/workflow/modules/nodes/task-node.vue
+++ b/src/components/workflow/modules/nodes/task-node.vue
@@ -216,6 +216,7 @@ const isShow = (taskBatchStatus: number) => {
                     <span class="text color-#3296fa">
                       <NBadge processing dot :color="item.workflowNodeStatus === 1 ? '#52c41a' : '#ff4d4f'" />
                       &nbsp;{{ item.nodeName }}
+                      <span v-if="item.id">&nbsp;({{ item.id }})</span>
                     </span>
                     <span class="priority-title">{{ $t('workflow.node.priority') }}{{ item.priorityLevel }}</span>
                     <icon-ant-design:close-outlined v-if="!disabled" class="close" @click.stop="delTerm(i)" />
diff --git a/src/service/api/workflow.ts b/src/service/api/workflow.ts
index 784e130..d91a191 100644
--- a/src/service/api/workflow.ts
+++ b/src/service/api/workflow.ts
@@ -70,7 +70,7 @@ export function fetchCheckNodeExpression(expression: Workflow.BrachNodeType) {
     method: 'post',
     data: {
       ...expression,
-      checkContent: JSON.stringify(parseContent(expression.checkContent))
+      checkContent: JSON.stringify(parseContent(expression.checkContents))
     }
   });
 }
diff --git a/src/typings/workflow.d.ts b/src/typings/workflow.d.ts
index a3488a6..c3cc5f0 100644
--- a/src/typings/workflow.d.ts
+++ b/src/typings/workflow.d.ts
@@ -86,7 +86,8 @@ declare namespace Workflow {
     /** 条件节点表达式 */
     nodeExpression?: string;
     /** 模拟上下文 */
-    checkContent?: { key: string; value: string | number | boolean; type: string }[];
+    checkContent?: string;
+    checkContents?: { key: string; value: string | number | boolean; type: string }[];
     /** 表达式类型 */
     expressionType?: Api.Common.Expression;
     /** 判定逻辑 */