yyd-flow-designer 0.1.5 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yyd-flow-designer",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": false,
   "description": "YYD Flow designer (process orchestration UI)",
   "keywords": [

package/src/designer/flow/Nodes/ExclusiveGateway.tsx

@@ -1,14 +1,31 @@
 import { Position } from '@xyflow/react';
 import BpmnNodeWrapper from '../components/BpmnNodeWrapper';
+import {
+    FLOW_ACTION_APPROVE,
+    FLOW_ACTION_KEY,
+    FLOW_ACTION_REJECT,
+} from '../config';
 import { IconExclusiveGateway } from '../icons';
 import { CustomNodeProps } from '../types';
 
+const DEFAULT_BRANCHES = [
+    {
+        id: 'no',
+        label: '驳回',
+        andor: 'and' as const,
+        conditions: [{ key: FLOW_ACTION_KEY, mode: 'equal', value: FLOW_ACTION_REJECT }],
+    },
+    {
+        id: 'yes',
+        label: '通过',
+        andor: 'and' as const,
+        conditions: [{ key: FLOW_ACTION_KEY, mode: 'equal', value: FLOW_ACTION_APPROVE }],
+    },
+];
+
 const ExclusiveGateway = (props: CustomNodeProps) => {
     const { id } = props;
-    const branches = props.data?.nodeConfig?.content?.branches ?? [
-        { id: 'no', label: '驳回', condition: '' },
-        { id: 'yes', label: '通过', condition: '' },
-    ];
+    const branches = props.data?.nodeConfig?.content?.branches ?? DEFAULT_BRANCHES;
 
     return (
         <BpmnNodeWrapper
@@ -42,21 +59,9 @@ ExclusiveGateway.nodeSchema = {
                 code: '',
                 name: '判断',
                 description: '',
-                inputs: [],
-                branches: [
-                    {
-                        id: 'no',
-                        label: '驳回',
-                        andor: 'and',
-                        conditions: [{ key: '', mode: 'equal', value: '' }],
-                    },
-                    {
-                        id: 'yes',
-                        label: '通过',
-                        andor: 'and',
-                        conditions: [{ key: '', mode: 'equal', value: '' }],
-                    },
-                ],
+                // 约定：续跑 UserTask 时 command.inputs.action = approve | reject
+                inputs: [{ key: FLOW_ACTION_KEY, mode: 'value', value: '' }],
+                branches: DEFAULT_BRANCHES,
             },
         },
     },

package/src/designer/flow/Nodes/UserTask.tsx

@@ -1,5 +1,6 @@
 import { Position } from '@xyflow/react';
 import BpmnNodeWrapper from '../components/BpmnNodeWrapper';
+import { FLOW_ACTION_KEY } from '../config';
 import { IconUserTask } from '../icons';
 import { CustomNodeProps } from '../types';
 
@@ -31,7 +32,8 @@ UserTask.nodeSchema = {
                 },
                 timeoutSetting: [],
                 inputs: [],
-                outputs: [],
+                // 提交时写入 command.inputs.action（approve | reject），供后续判断节点使用
+                outputs: [{ key: FLOW_ACTION_KEY, mode: 'value', value: '' }],
                 outputNotifyWebhook: { enabled: false, url: '', body: [] },
             },
         },

package/src/designer/flow/config.tsx

@@ -57,6 +57,11 @@ export const SERVICE_TYPE_OPTIONS = [
     { label: 'HTTP 调用', value: 'http' },
 ];
 
+/** 审批结果约定：UserTask 提交 / ExclusiveGateway 默认分支共用 */
+export const FLOW_ACTION_KEY = 'action';
+export const FLOW_ACTION_APPROVE = 'approve';
+export const FLOW_ACTION_REJECT = 'reject';
+
 /** 条件分支运算符（与 API 条件节点语义对齐） */
 export const BPMN_CONDITION_MODE_OPTIONS = [
     { label: '等于', value: 'equal' },

package/src/designer/flow/utils/validateFlowGraph.ts

@@ -103,6 +103,18 @@ export const validateFlowGraph = (nodes: Node[] = [], edges: Edge[] = []): FlowI
                     if (!(outgoingByHandle.get(`${node.id}::${handle}`) ?? 0)) {
                         issues.push({ level: 'error', message: `${label}：分支「${branchLabel}」未连出` });
                     }
+                    // 非末条分支若条件 key 全空，引擎会跳过；末条作兜底。空 equal 曾会恒真导致回环死循环。
+                    const isLast = idx === branches.length - 1;
+                    if (!isLast) {
+                        const conditions = Array.isArray(branch?.conditions) ? branch.conditions : [];
+                        const hasKeyed = conditions.some((c: any) => String(c?.key ?? '').trim());
+                        if (!hasKeyed) {
+                            issues.push({
+                                level: 'warning',
+                                message: `${label}：分支「${branchLabel}」未配置条件字段，执行时不会命中（仅末条可作兜底）`,
+                            });
+                        }
+                    }
                 });
             }
         }