add else node

xlorne · xlorne · commit bda6e52e258c · 2026-04-09T19:28:35.000+08:00
diff --git a/packages/flow-design/src/components/design-editor/components/branch-adder/index.tsx b/packages/flow-design/src/components/design-editor/components/branch-adder/index.tsx
@@ -36,6 +36,9 @@ export const BranchAdderRender: React.FC<BranchAdderProps> = (props) => {
             operation.addBlock(
                 node,
                 block,
+                {
+                    index: block.data.order - 1,
+                }
             );
             setTimeout(() => {
                 handleClose();
diff --git a/packages/flow-design/src/components/design-editor/components/node-icon/index.tsx b/packages/flow-design/src/components/design-editor/components/node-icon/index.tsx
@@ -41,6 +41,9 @@ export const NodeIcon: React.FC<NodeIconProps> = (props) => {
     if (icon === 'CONDITION_BRANCH') {
         return <BranchesOutlined style={style}/>
     }
+    if (icon === 'CONDITION_ELSE_BRANCH') {
+        return <BranchesOutlined style={style}/>
+    }
     if (icon === 'DELAY') {
         return <ClockCircleOutlined style={style}/>
     }
@@ -62,6 +65,9 @@ export const NodeIcon: React.FC<NodeIconProps> = (props) => {
     if (icon === 'INCLUSIVE_BRANCH') {
         return <MergeOutlined style={style}/>
     }
+    if (icon === 'INCLUSIVE_ELSE_BRANCH') {
+        return <MergeOutlined style={style}/>
+    }
     if (icon === 'NOTIFY') {
         return <BellOutlined style={style}/>
     }
diff --git a/packages/flow-design/src/components/design-editor/nodes/condition-else-branch/form-meta.tsx b/packages/flow-design/src/components/design-editor/nodes/condition-else-branch/form-meta.tsx
@@ -0,0 +1,38 @@
+import {provideJsonSchemaOutputs, syncVariableTitle,} from '@flowgram.ai/form-materials';
+import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-layout-editor';
+
+import {FlowNodeJSON} from '../../typings';
+import {NodePanel} from "@/components/design-editor/node-components/panel";
+import React from "react";
+import {NodeIcon} from "@/components/design-editor/components/node-icon";
+import {Space} from "antd";
+
+export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
+    return (
+        <NodePanel data={data}>
+            <Space style={
+                {
+                    width: 100,
+                    textAlign: 'center',
+                    padding: 5
+                }
+            }
+            >
+                <NodeIcon type={"CONDITION_ELSE_BRANCH"}/>
+                <span>其他情况</span>
+            </Space>
+        </NodePanel>
+    );
+};
+
+export const formMeta: FormMeta<FlowNodeJSON['data']> = {
+    render: renderForm,
+    validateTrigger: ValidateTrigger.onChange,
+    validate: {
+        title: ({value}: { value: string }) => (value ? undefined : 'Title is required'),
+    },
+    effect: {
+        title: syncVariableTitle,
+        outputs: provideJsonSchemaOutputs,
+    },
+};
diff --git a/packages/flow-design/src/components/design-editor/nodes/condition-else-branch/index.ts b/packages/flow-design/src/components/design-editor/nodes/condition-else-branch/index.ts
@@ -0,0 +1,35 @@
+import {FlowNodeRegistry} from '../../typings';
+import {formMeta} from './form-meta';
+import {nanoid} from "nanoid";
+
+export const ConditionElseBranchNodeRegistry: FlowNodeRegistry = {
+    type: 'CONDITION_ELSE_BRANCH',
+    extend: 'block',
+    meta: {
+        copyDisable: true,
+        addDisable: true,
+        deleteDisable: true,
+        sidebarDisable:true,
+        style:{
+            width: '100%',
+        }
+    },
+    info: {
+        icon: 'CONDITION_ELSE_BRANCH',
+        description: '分支else节点',
+    },
+    /**
+     * Render node via formMeta
+     */
+    formMeta,
+    onAdd(ctx, from) {
+        return {
+            id: `condition_branch_${nanoid(5)}`,
+            type: 'CONDITION_ELSE_BRANCH',
+            data: {
+                title: `条件else分支节点`,
+                value: 'branch Value'
+            },
+        };
+    }
+};
diff --git a/packages/flow-design/src/components/design-editor/nodes/inclusive-else-branch/form-meta.tsx b/packages/flow-design/src/components/design-editor/nodes/inclusive-else-branch/form-meta.tsx
@@ -0,0 +1,39 @@
+import {provideJsonSchemaOutputs, syncVariableTitle,} from '@flowgram.ai/form-materials';
+import {FormMeta, FormRenderProps, ValidateTrigger,} from '@flowgram.ai/fixed-layout-editor';
+
+import {FlowNodeJSON} from '../../typings';
+import {NodePanel} from "@/components/design-editor/node-components/panel";
+import React from "react";
+import {NodeIcon} from "@/components/design-editor/components/node-icon";
+import {Space} from "antd";
+
+export const renderForm = (data: FormRenderProps<FlowNodeJSON['data']>) => {
+
+    return (
+        <NodePanel data={data}>
+            <Space style={
+                {
+                    width: 100,
+                    textAlign: 'center',
+                    padding: 5
+                }
+            }
+            >
+                <NodeIcon type={"INCLUSIVE_ELSE_BRANCH"}/>
+                <span>其他情况</span>
+            </Space>
+        </NodePanel>
+    );
+};
+
+export const formMeta: FormMeta<FlowNodeJSON['data']> = {
+    render: renderForm,
+    validateTrigger: ValidateTrigger.onChange,
+    validate: {
+        title: ({value}: { value: string }) => (value ? undefined : 'Title is required'),
+    },
+    effect: {
+        title: syncVariableTitle,
+        outputs: provideJsonSchemaOutputs,
+    },
+};
diff --git a/packages/flow-design/src/components/design-editor/nodes/inclusive-else-branch/index.ts b/packages/flow-design/src/components/design-editor/nodes/inclusive-else-branch/index.ts
@@ -0,0 +1,24 @@
+import {FlowNodeRegistry} from '../../typings';
+import {formMeta} from './form-meta';
+
+export const InclusiveElseBranchNodeRegistry: FlowNodeRegistry = {
+    type: 'INCLUSIVE_ELSE_BRANCH',
+    extend: 'block',
+    meta: {
+        copyDisable: true,
+        addDisable: true,
+        sidebarDisable:true,
+        deleteDisable: true,
+        style:{
+            width: '100%',
+        }
+    },
+    info: {
+        icon: 'INCLUSIVE_ELSE_BRANCH',
+        description: '包容else分支',
+    },
+    /**
+     * Render node via formMeta
+     */
+    formMeta,
+};
diff --git a/packages/flow-design/src/components/design-editor/nodes/index.ts b/packages/flow-design/src/components/design-editor/nodes/index.ts
@@ -16,16 +16,20 @@ import {SubProcessNodeRegistry} from "@/components/design-editor/nodes/sub-proce
 import {TriggerNodeRegistry} from "@/components/design-editor/nodes/trigger";
 import {ManualNodeRegistry} from "@/components/design-editor/nodes/manual";
 import {ManualBranchNodeRegistry} from "@/components/design-editor/nodes/manual-branch";
+import {ConditionElseBranchNodeRegistry} from "@/components/design-editor/nodes/condition-else-branch";
+import {InclusiveElseBranchNodeRegistry} from "@/components/design-editor/nodes/inclusive-else-branch";
 
 export const FlowNodeRegistries: FlowNodeRegistry[] = [
     ApprovalNodeRegistry,
     ConditionNodeRegistry,
     ConditionBranchNodeRegistry,
+    ConditionElseBranchNodeRegistry,
     DelayNodeRegistry,
     EndNodeRegistry,
     HandleNodeRegistry,
     InclusiveNodeRegistry,
     InclusiveBranchNodeRegistry,
+    InclusiveElseBranchNodeRegistry,
     ManualNodeRegistry,
     ManualBranchNodeRegistry,
     NotifyNodeRegistry,
diff --git a/packages/flow-design/src/components/design-panel/presenters/index.ts b/packages/flow-design/src/components/design-panel/presenters/index.ts
@@ -158,7 +158,7 @@ export class Presenter {
         const block = nodeManager.toItemRender(flowNode);
         if (currentNode) {
             if (currentNode.blocks) {
-                const order = currentNode.blocks.length + 1;
+                const order = currentNode.blocks.length;
                 return {
                     ...block,
                     data: {
diff --git a/packages/flow-types/src/types/flow-design.ts b/packages/flow-types/src/types/flow-design.ts
@@ -8,6 +8,8 @@ export type NodeType =
     "CONDITION" |
     // 分支节点
     "CONDITION_BRANCH" |
+    // else分支节点
+    "CONDITION_ELSE_BRANCH" |
     // 延迟节点
     "DELAY" |
     // 结束
@@ -18,6 +20,8 @@ export type NodeType =
     "INCLUSIVE" |
     // 包容分支
     "INCLUSIVE_BRANCH" |
+    // else包容分支
+    "INCLUSIVE_ELSE_BRANCH" |
     // 人工控制
     "MANUAL" |
     // 人工分支

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,9 @@ export const NodeIcon: React.FC<NodeIconProps> = (props) => {`
`41`	`41`	`if (icon === 'CONDITION_BRANCH') {`
`42`	`42`	`return <BranchesOutlined style={style}/>`
`43`	`43`	`}`
	`44`	`+ if (icon === 'CONDITION_ELSE_BRANCH') {`
	`45`	`+ return <BranchesOutlined style={style}/>`
	`46`	`+ }`
`44`	`47`	`if (icon === 'DELAY') {`
`45`	`48`	`return <ClockCircleOutlined style={style}/>`
`46`	`49`	`}`
`@@ -62,6 +65,9 @@ export const NodeIcon: React.FC<NodeIconProps> = (props) => {`
`62`	`65`	`if (icon === 'INCLUSIVE_BRANCH') {`
`63`	`66`	`return <MergeOutlined style={style}/>`
`64`	`67`	`}`
	`68`	`+ if (icon === 'INCLUSIVE_ELSE_BRANCH') {`
	`69`	`+ return <MergeOutlined style={style}/>`
	`70`	`+ }`
`65`	`71`	`if (icon === 'NOTIFY') {`
`66`	`72`	`return <BellOutlined style={style}/>`
`67`	`73`	`}`