feat(ai-web): 完成自研流程图的保存

service-ai/database/20250702.sql

@@ -52,7 +52,7 @@ create table hudi_collect_build_b12.service_ai_flow_task_template
     created_time  datetime(6) comment '记录创建时间',
     modified_time datetime(6) comment '记录更新时间',
     description   varchar(255) comment '模板功能、内容说明',
-    flow_graph    longtext comment '前端流程图数据',
+    flow_graph    longtext     not null comment '前端流程图数据',
     input_schema  longtext     not null comment '模板入参Schema',
     name          varchar(255) not null comment '模板名称',
     primary key (id)

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/task/TaskTemplateController.java

@@ -3,10 +3,8 @@ package com.lanyuanxiaoyao.service.ai.web.controller.task;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisCrudResponse;
 import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
 import com.lanyuanxiaoyao.service.ai.web.base.controller.SimpleControllerSupport;
-import com.lanyuanxiaoyao.service.ai.web.base.controller.query.Query;
 import com.lanyuanxiaoyao.service.ai.web.base.entity.SimpleItem;
 import com.lanyuanxiaoyao.service.ai.web.entity.FlowTaskTemplate;
 import com.lanyuanxiaoyao.service.ai.web.service.task.FlowTaskTemplateService;
@@ -17,6 +15,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.mapstruct.Context;
 import org.mapstruct.factory.Mappers;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -24,26 +24,19 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("flow_task/template")
 public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemplate, TaskTemplateController.SaveItem, TaskTemplateController.ListItem, TaskTemplateController.DetailItem> {
+  private final FlowTaskTemplateService flowTaskTemplateService;
   private final ObjectMapper mapper;
 
   public TaskTemplateController(FlowTaskTemplateService flowTaskTemplateService, Jackson2ObjectMapperBuilder builder) {
     super(flowTaskTemplateService);
+    this.flowTaskTemplateService = flowTaskTemplateService;
     this.mapper = builder.build();
   }
 
-  @Override
-  public AmisResponse<Long> save(SaveItem saveItem) throws Exception {
-    log.info("Save: {}", saveItem);
-    SaveItem.Mapper map = Mappers.getMapper(SaveItem.Mapper.class);
-    log.info("Mapper: {}", map.from(saveItem, mapper));
-    return super.save(saveItem);
-  }
-
-  @Override
-  public AmisCrudResponse list(Query query) throws Exception {
-    AmisCrudResponse list = super.list(query);
-    log.info("List: {}", list);
-    return list;
+  @PostMapping("update_flow_graph")
+  public AmisResponse<?> updateFlowGraph(@RequestBody UpdateGraphItem item) throws JsonProcessingException {
+    flowTaskTemplateService.updateFlowGraph(item.getId(), mapper.writeValueAsString(item.getGraph()));
+    return AmisResponse.responseSuccess();
   }
 
   @Override
@@ -97,14 +90,22 @@ public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemp
     private String name;
     private String description;
     private Map<String, Object> inputSchema;
+    private Map<String, Object> flowGraph;
 
     @org.mapstruct.Mapper
     public static abstract class Mapper {
       public abstract DetailItem from(FlowTaskTemplate template, @Context ObjectMapper mapper) throws Exception;
 
-      public Map<String, Object> mapInputSchema(String inputSchema, @Context ObjectMapper mapper) throws Exception {
-        return mapper.readValue(inputSchema, new TypeReference<>() {});
+      public Map<String, Object> mapJson(String source, @Context ObjectMapper mapper) throws Exception {
+        return mapper.readValue(source, new TypeReference<>() {
+        });
       }
     }
   }
+
+  @Data
+  public static class UpdateGraphItem {
+    private Long id;
+    private Map<String, Object> graph;
+  }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/FlowTaskTemplate.java

@@ -31,6 +31,6 @@ public class FlowTaskTemplate extends SimpleEntity {
   @Column(nullable = false, columnDefinition = "longtext")
   private String inputSchema;
   @Comment("前端流程图数据")
-  @Column(columnDefinition = "longtext")
-  private String flowGraph;
+  @Column(nullable = false, columnDefinition = "longtext")
+  private String flowGraph = "{}";
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/task/FlowTaskTemplateService.java

@@ -5,6 +5,7 @@ import com.lanyuanxiaoyao.service.ai.web.entity.FlowTaskTemplate;
 import com.lanyuanxiaoyao.service.ai.web.repository.FlowTaskTemplateRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
@@ -12,4 +13,11 @@ public class FlowTaskTemplateService extends SimpleServiceSupport<FlowTaskTempla
   public FlowTaskTemplateService(FlowTaskTemplateRepository flowTaskTemplateRepository) {
     super(flowTaskTemplateRepository);
   }
+
+  @Transactional(rollbackFor = Exception.class)
+  public void updateFlowGraph(Long id, String flowGraph) {
+    FlowTaskTemplate template = detailOrThrow(id);
+    template.setFlowGraph(flowGraph);
+    save(template);
+  }
 }

service-web/client/src/components/flow/FlowChecker.test.tsx

@@ -0,0 +1,62 @@
+import {type Connection, type Node} from '@xyflow/react'
+import {expect, test} from 'vitest'
+import {
+  checkAddConnection,
+  hasCycleError,
+  nodeToSelfError,
+  sourceNodeNotFoundError,
+  targetNodeNotFoundError,
+} from './FlowChecker.tsx'
+
+const createNode = (id: string, type: string): Node => {
+  return {
+    data: {},
+    position: {
+      x: 0,
+      y: 0
+    },
+    id,
+    type,
+  }
+}
+
+const createConnection = function (source: string, target: string, sourceHandle: string | null = null, targetHandle: string | null = null): Connection {
+  return {
+    source,
+    target,
+    sourceHandle,
+    targetHandle,
+  }
+}
+
+/* check add connection */
+test(sourceNodeNotFoundError().message, () => {
+  expect(() => checkAddConnection(createConnection('a', 'b'), [], []))
+})
+
+test(targetNodeNotFoundError().message, () => {
+  expect(() => checkAddConnection(createConnection('a', 'b'), [createNode('a', 'normal-node')], []))
+})
+
+test(nodeToSelfError().message, () => {
+  expect(() => {
+    // language=JSON
+    const {
+      nodes,
+      edges
+    } = JSON.parse('{\n  "nodes": [\n    {\n      "id": "P14abHl4uY",\n      "type": "start-node",\n      "position": {\n        "x": 100,\n        "y": 100\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 82\n      }\n    },\n    {\n      "id": "3YDRebKqCX",\n      "type": "end-node",\n      "position": {\n        "x": 773.3027344262372,\n        "y": 101.42648884412338\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "YXJ91nHVaz",\n      "type": "llm-node",\n      "position": {\n        "x": 430.94541183662506,\n        "y": 101.42648884412338\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": true,\n      "dragging": false\n    }\n  ],\n  "edges": [\n    {\n      "source": "P14abHl4uY",\n      "target": "YXJ91nHVaz",\n      "id": "xy-edge__P14abHl4uY-YXJ91nHVaz"\n    },\n    {\n      "source": "YXJ91nHVaz",\n      "target": "3YDRebKqCX",\n      "id": "xy-edge__YXJ91nHVaz-3YDRebKqCX"\n    }\n  ],\n  "data": {}\n}')
+    checkAddConnection(createConnection('YXJ91nHVaz', 'YXJ91nHVaz'), nodes, edges)
+  }).toThrowError(nodeToSelfError())
+})
+
+test(hasCycleError().message, () => {
+  expect(() => {
+    // language=JSON
+    const {
+      nodes,
+      edges,
+    } = JSON.parse('{\n  "nodes": [\n    {\n      "id": "-DKfXm7r3f",\n      "type": "start-node",\n      "position": {\n        "x": -75.45812782717618,\n        "y": 14.410669352596976\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 82\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "2uL3Hw2CAW",\n      "type": "end-node",\n      "position": {\n        "x": 734.7875356349059,\n        "y": -1.2807079327602473\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "yp-yYfKUzC",\n      "type": "llm-node",\n      "position": {\n        "x": 338.2236369686051,\n        "y": -92.5759939566568\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "N4HQPN-NYZ",\n      "type": "llm-node",\n      "position": {\n        "x": 332.51768159211156,\n        "y": 114.26488844123382\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": true,\n      "dragging": false\n    }\n  ],\n  "edges": [\n    {\n      "source": "-DKfXm7r3f",\n      "target": "yp-yYfKUzC",\n      "id": "xy-edge__-DKfXm7r3f-yp-yYfKUzC"\n    },\n    {\n      "source": "yp-yYfKUzC",\n      "target": "2uL3Hw2CAW",\n      "id": "xy-edge__yp-yYfKUzC-2uL3Hw2CAW"\n    },\n    {\n      "source": "-DKfXm7r3f",\n      "target": "N4HQPN-NYZ",\n      "id": "xy-edge__-DKfXm7r3f-N4HQPN-NYZ"\n    },\n    {\n      "source": "N4HQPN-NYZ",\n      "target": "yp-yYfKUzC",\n      "id": "xy-edge__N4HQPN-NYZ-yp-yYfKUzC"\n    }\n  ],\n  "data": {}\n}')
+    // language=JSON
+    checkAddConnection(JSON.parse('{\n  "source": "yp-yYfKUzC",\n  "sourceHandle": null,\n  "target": "N4HQPN-NYZ",\n  "targetHandle": null\n}'), nodes, edges)
+  }).toThrowError(hasCycleError())
+})

service-web/client/src/components/flow/FlowChecker.tsx

@@ -0,0 +1,78 @@
+import {type Connection, type Edge, getOutgoers, type Node} from '@xyflow/react'
+import {find, isEmpty, isEqual, lpad, toStr} from 'licia'
+
+export class CheckError extends Error {
+  readonly id: string
+
+  constructor(
+    id: number,
+    message: string,
+  ) {
+    super(message)
+    this.id = `E${lpad(toStr(id), 6, '0')}`
+  }
+
+  public toString(): string {
+    return `${this.id}: ${this.message}`
+  }
+}
+
+const getNodeById = (id: string, nodes: Node[]) => find(nodes, (n: Node) => isEqual(n.id, id))
+
+// @ts-ignore
+export const checkAddNode: (type: string, nodes: Node[], edges: Edge[]) => void = (type, nodes, edges) => {
+}
+
+export const sourceNodeNotFoundError = () => new CheckError(200, '连线起始节点未找到')
+export const targetNodeNotFoundError = () => new CheckError(201, '连线目标节点未找到')
+export const nodeToSelfError = () => new CheckError(203, '节点不能直连自身')
+export const hasCycleError = () => new CheckError(204, '禁止流程循环')
+
+const hasCycle = (sourceNode: Node, targetNode: Node, nodes: Node[], edges: Edge[], visited = new Set<string>()) => {
+  if (visited.has(targetNode.id)) return false
+  visited.add(targetNode.id)
+  for (const outgoer of getOutgoers(targetNode, nodes, edges)) {
+    if (isEqual(outgoer.id, sourceNode.id)) return true
+    if (hasCycle(sourceNode, outgoer, nodes, edges, visited)) return true
+  }
+}
+
+export const checkAddConnection: (connection: Connection, nodes: Node[], edges: Edge[]) => void = (connection, nodes, edges) => {
+  let sourceNode = getNodeById(connection.source, nodes)
+  if (!sourceNode) {
+    throw sourceNodeNotFoundError()
+  }
+  let targetNode = getNodeById(connection.target, nodes)
+  if (!targetNode) {
+    throw targetNodeNotFoundError()
+  }
+
+  // 禁止流程出现环，必须是有向无环图
+  if (isEqual(sourceNode.id, targetNode.id)) {
+    throw nodeToSelfError()
+  } else if (hasCycle(sourceNode, targetNode, nodes, edges)) {
+    throw hasCycleError()
+  }
+
+  // let newEdges = [...clone(edges), {...connection, id: uuid()}]
+  // let {hasAbnormalEdges} = getParallelInfo(nodes, newEdges)
+  // if (hasAbnormalEdges) {
+  //   throw hasRedundantEdgeError()
+  // }
+}
+
+export const atLeastOneNode = () => new CheckError(300, '至少包含一个节点')
+export const hasUnfinishedNode = (nodeId: string) => new CheckError(301, `存在尚未配置完成的节点: ${nodeId}`)
+
+// @ts-ignore
+export const checkSave: (nodes: Node[], edges: Edge[], data: any) => void = (nodes, edges, data) => {
+  if (isEmpty(nodes)) {
+    throw atLeastOneNode()
+  }
+
+  for (let node of nodes) {
+    if (!data[node.id] || !data[node.id]?.finished) {
+      throw hasUnfinishedNode(node.id)
+    }
+  }
+}

service-web/client/src/components/flow/FlowEditor.tsx

@@ -1,22 +1,30 @@
-import {PlusCircleFilled, SaveFilled} from '@ant-design/icons'
-import {Background, BackgroundVariant, Controls, MiniMap, type NodeProps, ReactFlow} from '@xyflow/react'
-import {useMount} from 'ahooks'
+import {PlusCircleFilled, RollbackOutlined, SaveFilled} from '@ant-design/icons'
+import {
+  Background,
+  BackgroundVariant,
+  Controls,
+  type Edge,
+  MiniMap,
+  type Node,
+  type NodeProps,
+  ReactFlow
+} from '@xyflow/react'
 import type {Schema} from 'amis'
-import {Button, Drawer, Dropdown, message, Space} from 'antd'
+import {Button, Drawer, Dropdown, message, Popconfirm, Space} from 'antd'
 import {arrToMap, find, isEqual, isNil, randomId} from 'licia'
-import {type JSX, type MemoExoticComponent, useState} from 'react'
+import {type JSX, type MemoExoticComponent, useEffect, useState} from 'react'
 import styled from 'styled-components'
 import '@xyflow/react/dist/style.css'
-import {amisRender, commonInfo, horizontalFormOptions} from '../../../util/amis.tsx'
+import {amisRender, commonInfo, horizontalFormOptions} from '../../util/amis.tsx'
 import {checkAddConnection, checkAddNode, checkSave} from './FlowChecker.tsx'
 import CodeNode from './node/CodeNode.tsx'
-import EndNode from './node/EndNode.tsx'
+import OutputNode from './node/OutputNode.tsx'
 import KnowledgeNode from './node/KnowledgeNode.tsx'
 import LlmNode from './node/LlmNode.tsx'
-import StartNode from './node/StartNode.tsx'
 import SwitchNode from './node/SwitchNode.tsx'
 import {useDataStore} from './store/DataStore.ts'
 import {useFlowStore} from './store/FlowStore.ts'
+import {useNavigate} from 'react-router'
 
 const FlowableDiv = styled.div`
     height: 100%;
@@ -55,10 +63,15 @@ const FlowableDiv = styled.div`
     }
 `
 
+export type GraphData = { nodes: Node[], edges: Edge[], data: any }
+
 export type FlowEditorProps = {
+  graphData: GraphData,
+  onGraphDataChange: (graphData: GraphData) => void,
 }
 
-function FlowEditor() {
+function FlowEditor(props: FlowEditorProps) {
+  const navigate = useNavigate()
   const [messageApi, contextHolder] = message.useMessage()
   const [nodeDef] = useState<{
     key: string,
@@ -66,14 +79,9 @@ function FlowEditor() {
     component: MemoExoticComponent<(props: NodeProps) => JSX.Element>
   }[]>([
     {
-      key: 'start-node',
-      name: '开始',
-      component: StartNode,
-    },
-    {
-      key: 'end-node',
-      name: '结束',
-      component: EndNode,
+      key: 'output-node',
+      name: '输出',
+      component: OutputNode,
     },
     {
       key: 'llm-node',
@@ -132,7 +140,13 @@ function FlowEditor() {
                         actionType: 'custom',
                         // @ts-ignore
                         script: (context, action, event) => {
-                          setDataById(id, context.props.data)
+                          setDataById(
+                            id,
+                            {
+                              ...context.props.data,
+                              finished: true,
+                            }
+                          )
                           setOpen(false)
                         },
                       },
@@ -189,14 +203,14 @@ function FlowEditor() {
     editNode,
   }
 
-  useMount(() => {
+  useEffect(() => {
     // language=JSON
-    let initialData = JSON.parse('{"nodes":[{"id":"TCxPixrdkI","type":"start-node","position":{"x":-256,"y":109.5},"data":{},"measured":{"width":256,"height":83},"selected":false,"dragging":false},{"id":"tGs78_ietp","type":"llm-node","position":{"x":108,"y":-2.5},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"OeZdaU7LpY","type":"llm-node","position":{"x":111,"y":196},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"LjfoCYZo-E","type":"knowledge-node","position":{"x":497.62196259607214,"y":-10.792497317791003},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"sQM_22GYB5","type":"end-node","position":{"x":874.3164534765615,"y":151.70316541496913},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"KpMH_xc3ZZ","type":"llm-node","position":{"x":529.6286840434341,"y":150.4721376669937},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"pOrR6EMVbe","type":"switch-node","position":{"x":110.33793030183864,"y":373.9551529987239},"data":{},"measured":{"width":256,"height":157},"selected":false,"dragging":false}],"edges":[{"source":"TCxPixrdkI","sourceHandle":"source","target":"tGs78_ietp","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-tGs78_ietptarget"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"OeZdaU7LpY","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-OeZdaU7LpYtarget"},{"source":"tGs78_ietp","sourceHandle":"source","target":"LjfoCYZo-E","targetHandle":"target","id":"xy-edge__tGs78_ietpsource-LjfoCYZo-Etarget"},{"source":"LjfoCYZo-E","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__LjfoCYZo-Esource-KpMH_xc3ZZtarget"},{"source":"OeZdaU7LpY","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__OeZdaU7LpYsource-KpMH_xc3ZZtarget"},{"source":"KpMH_xc3ZZ","sourceHandle":"source","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__KpMH_xc3ZZsource-sQM_22GYB5target"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"pOrR6EMVbe","id":"xy-edge__TCxPixrdkIsource-pOrR6EMVbe"},{"source":"pOrR6EMVbe","sourceHandle":"3","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__pOrR6EMVbe3-sQM_22GYB5target"},{"source":"pOrR6EMVbe","sourceHandle":"1","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__pOrR6EMVbe1-KpMH_xc3ZZtarget"}],"data":{"tGs78_ietp":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你是个聪明人"},"OeZdaU7LpY":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你也是个聪明人"}}}')
+    // let initialData = JSON.parse('{"nodes":[{"id":"TCxPixrdkI","type":"start-node","position":{"x":-256,"y":109.5},"data":{},"measured":{"width":256,"height":83},"selected":false,"dragging":false},{"id":"tGs78_ietp","type":"llm-node","position":{"x":108,"y":-2.5},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"OeZdaU7LpY","type":"llm-node","position":{"x":111,"y":196},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"LjfoCYZo-E","type":"knowledge-node","position":{"x":497.62196259607214,"y":-10.792497317791003},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"sQM_22GYB5","type":"end-node","position":{"x":874.3164534765615,"y":151.70316541496913},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"KpMH_xc3ZZ","type":"llm-node","position":{"x":529.6286840434341,"y":150.4721376669937},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"pOrR6EMVbe","type":"switch-node","position":{"x":110.33793030183864,"y":373.9551529987239},"data":{},"measured":{"width":256,"height":157},"selected":false,"dragging":false}],"edges":[{"source":"TCxPixrdkI","sourceHandle":"source","target":"tGs78_ietp","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-tGs78_ietptarget"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"OeZdaU7LpY","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-OeZdaU7LpYtarget"},{"source":"tGs78_ietp","sourceHandle":"source","target":"LjfoCYZo-E","targetHandle":"target","id":"xy-edge__tGs78_ietpsource-LjfoCYZo-Etarget"},{"source":"LjfoCYZo-E","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__LjfoCYZo-Esource-KpMH_xc3ZZtarget"},{"source":"OeZdaU7LpY","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__OeZdaU7LpYsource-KpMH_xc3ZZtarget"},{"source":"KpMH_xc3ZZ","sourceHandle":"source","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__KpMH_xc3ZZsource-sQM_22GYB5target"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"pOrR6EMVbe","id":"xy-edge__TCxPixrdkIsource-pOrR6EMVbe"},{"source":"pOrR6EMVbe","sourceHandle":"3","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__pOrR6EMVbe3-sQM_22GYB5target"},{"source":"pOrR6EMVbe","sourceHandle":"1","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__pOrR6EMVbe1-KpMH_xc3ZZtarget"}],"data":{"tGs78_ietp":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你是个聪明人"},"OeZdaU7LpY":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你也是个聪明人"}}}')
     // let initialData: any = {}
-    let initialNodes = initialData?.nodes ?? []
-    let initialEdges = initialData?.edges ?? []
+    let initialNodes = props.graphData?.nodes ?? []
+    let initialEdges = props.graphData?.edges ?? []
 
-    let initialNodeData = initialData?.data ?? {}
+    let initialNodeData = props.graphData?.data ?? {}
     setData(initialNodeData)
 
     for (let node of initialNodes) {
@@ -204,7 +218,7 @@ function FlowEditor() {
     }
     setNodes(initialNodes)
     setEdges(initialEdges)
-  })
+  }, [props.graphData])
 
   return (
     <FlowableDiv>
@@ -237,14 +251,23 @@ function FlowEditor() {
             新增节点
           </Button>
         </Dropdown>
+        <Popconfirm
+          title="返回上一页"
+          description="未保存的流程图将会被丢弃，确认是否返回"
+          onConfirm={() => navigate(-1)}
+        >
+          <Button type="default">
+            <RollbackOutlined/>
+            返回
+          </Button>
+        </Popconfirm>
         <Button type="primary" onClick={() => {
           try {
             if (commonInfo.debug) {
               console.info('Save', JSON.stringify({nodes, edges, data}))
             }
             checkSave(nodes, edges, data)
-            // let saveData = {nodes, edges, data}
-            // console.log(buildEL(nodes, edges))
+            props.onGraphDataChange({nodes, edges, data})
           } catch (e) {
             // @ts-ignore
             messageApi.error(e.toString())

service-web/client/src/components/flow/node/AmisNode.tsx

@@ -4,7 +4,7 @@ import type {Schema} from 'amis'
 import {Card, Dropdown} from 'antd'
 import {isEmpty, isEqual, isNil} from 'licia'
 import {type JSX} from 'react'
-import {horizontalFormOptions} from '../../../../util/amis.tsx'
+import {horizontalFormOptions} from '../../../util/amis.tsx'
 
 export type AmisNodeType = 'normal' | 'start' | 'end'
 

service-web/client/src/components/flow/node/KnowledgeNode.tsx

@@ -1,5 +1,5 @@
 import type {NodeProps} from '@xyflow/react'
-import {commonInfo} from '../../../../util/amis.tsx'
+import {commonInfo} from '../../../util/amis.tsx'
 import AmisNode, {inputsFormColumns, outputsFormColumns} from './AmisNode.tsx'
 import React from 'react'
 

service-web/client/src/components/flow/node/OutputNode.tsx

@@ -2,12 +2,12 @@ import type {NodeProps} from '@xyflow/react'
 import AmisNode, {outputsFormColumns} from './AmisNode.tsx'
 import React from 'react'
 
-const EndNode = (props: NodeProps) => AmisNode({
+const OutputNode = (props: NodeProps) => AmisNode({
   nodeProps: props,
   type: 'end',
-  defaultNodeName: '结束节点',
+  defaultNodeName: '输出节点',
   defaultNodeDescription: '定义输出变量',
   columnSchema: outputsFormColumns(true),
 })
 
-export default React.memo(EndNode)
+export default React.memo(OutputNode)

service-web/client/src/index.tsx

@@ -1,7 +1,7 @@
 import {createRoot} from 'react-dom/client'
 import {createHashRouter, RouterProvider} from 'react-router'
 import './index.scss'
-import './components/Registry.ts'
+import './components/amis/Registry.ts'
 
 import {routes} from './route.tsx'
 

service-web/client/src/pages/ai/flow/FlowChecker.test.tsx

@@ -1,113 +0,0 @@
-import {type Connection, type Node} from '@xyflow/react'
-import {uuid} from 'licia'
-import {expect, test} from 'vitest'
-import {
-  atLeastOneEndNodeError,
-  atLeastOneStartNodeError,
-  checkAddConnection,
-  checkAddNode,
-  checkSave,
-  hasCycleError,
-  hasRedundantEdgeError,
-  multiEndNodeError,
-  multiStartNodeError,
-  nodeToSelfError,
-  sourceNodeNotFoundError,
-  startNodeToEndNodeError,
-  targetNodeNotFoundError,
-} from './FlowChecker.tsx'
-
-const createNode = (id: string, type: string): Node => {
-  return {
-    data: {},
-    position: {
-      x: 0,
-      y: 0
-    },
-    id,
-    type,
-  }
-}
-
-const createStartNode = (id: string): Node => createNode(id, 'start-node')
-const createEndNode = (id: string): Node => createNode(id, 'end-node')
-
-const createConnection = function (source: string, target: string, sourceHandle: string | null = null, targetHandle: string | null = null): Connection {
-  return {
-    source,
-    target,
-    sourceHandle,
-    targetHandle,
-  }
-}
-
-/* check add node */
-
-test(multiStartNodeError().message, () => {
-  expect(() => checkAddNode('start-node', [createStartNode(uuid())], [])).toThrowError(multiStartNodeError())
-})
-
-test(multiEndNodeError().message, () => {
-  expect(() => checkAddNode('end-node', [createEndNode(uuid())], [])).toThrowError(multiEndNodeError())
-})
-
-/* check add connection */
-test(sourceNodeNotFoundError().message, () => {
-  expect(() => checkAddConnection(createConnection('a', 'b'), [], []))
-})
-
-test(targetNodeNotFoundError().message, () => {
-  expect(() => checkAddConnection(createConnection('a', 'b'), [createStartNode('a')], []))
-})
-
-test(startNodeToEndNodeError().message, () => {
-  expect(() => checkAddConnection(
-    createConnection('a', 'b'),
-    [createStartNode('a'), createEndNode('b')],
-    []
-  ))
-})
-
-test(nodeToSelfError().message, () => {
-  expect(() => {
-    // language=JSON
-    const {
-      nodes,
-      edges
-    } = JSON.parse('{\n  "nodes": [\n    {\n      "id": "P14abHl4uY",\n      "type": "start-node",\n      "position": {\n        "x": 100,\n        "y": 100\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 82\n      }\n    },\n    {\n      "id": "3YDRebKqCX",\n      "type": "end-node",\n      "position": {\n        "x": 773.3027344262372,\n        "y": 101.42648884412338\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "YXJ91nHVaz",\n      "type": "llm-node",\n      "position": {\n        "x": 430.94541183662506,\n        "y": 101.42648884412338\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": true,\n      "dragging": false\n    }\n  ],\n  "edges": [\n    {\n      "source": "P14abHl4uY",\n      "target": "YXJ91nHVaz",\n      "id": "xy-edge__P14abHl4uY-YXJ91nHVaz"\n    },\n    {\n      "source": "YXJ91nHVaz",\n      "target": "3YDRebKqCX",\n      "id": "xy-edge__YXJ91nHVaz-3YDRebKqCX"\n    }\n  ],\n  "data": {}\n}')
-    checkAddConnection(createConnection('YXJ91nHVaz', 'YXJ91nHVaz'), nodes, edges)
-  }).toThrowError(nodeToSelfError())
-})
-
-test(hasCycleError().message, () => {
-  expect(() => {
-    // language=JSON
-    const {
-      nodes,
-      edges,
-    } = JSON.parse('{\n  "nodes": [\n    {\n      "id": "-DKfXm7r3f",\n      "type": "start-node",\n      "position": {\n        "x": -75.45812782717618,\n        "y": 14.410669352596976\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 82\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "2uL3Hw2CAW",\n      "type": "end-node",\n      "position": {\n        "x": 734.7875356349059,\n        "y": -1.2807079327602473\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "yp-yYfKUzC",\n      "type": "llm-node",\n      "position": {\n        "x": 338.2236369686051,\n        "y": -92.5759939566568\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "N4HQPN-NYZ",\n      "type": "llm-node",\n      "position": {\n        "x": 332.51768159211156,\n        "y": 114.26488844123382\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 74\n      },\n      "selected": true,\n      "dragging": false\n    }\n  ],\n  "edges": [\n    {\n      "source": "-DKfXm7r3f",\n      "target": "yp-yYfKUzC",\n      "id": "xy-edge__-DKfXm7r3f-yp-yYfKUzC"\n    },\n    {\n      "source": "yp-yYfKUzC",\n      "target": "2uL3Hw2CAW",\n      "id": "xy-edge__yp-yYfKUzC-2uL3Hw2CAW"\n    },\n    {\n      "source": "-DKfXm7r3f",\n      "target": "N4HQPN-NYZ",\n      "id": "xy-edge__-DKfXm7r3f-N4HQPN-NYZ"\n    },\n    {\n      "source": "N4HQPN-NYZ",\n      "target": "yp-yYfKUzC",\n      "id": "xy-edge__N4HQPN-NYZ-yp-yYfKUzC"\n    }\n  ],\n  "data": {}\n}')
-    // language=JSON
-    checkAddConnection(JSON.parse('{\n  "source": "yp-yYfKUzC",\n  "sourceHandle": null,\n  "target": "N4HQPN-NYZ",\n  "targetHandle": null\n}'), nodes, edges)
-  }).toThrowError(hasCycleError())
-})
-
-test(hasRedundantEdgeError().message, () => {
-  expect(() => {
-    // language=JSON
-    const {
-      nodes,
-      edges,
-    } = JSON.parse('{\n  "nodes": [\n    {\n      "id": "TCxPixrdkI",\n      "type": "start-node",\n      "position": {\n        "x": -256,\n        "y": 109.5\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 83\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "tGs78_ietp",\n      "type": "llm-node",\n      "position": {\n        "x": 108,\n        "y": -2.5\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 105\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "OeZdaU7LpY",\n      "type": "llm-node",\n      "position": {\n        "x": 111,\n        "y": 196\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 105\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "LjfoCYZo-E",\n      "type": "knowledge-node",\n      "position": {\n        "x": 497.62196259607214,\n        "y": -10.792497317791003\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 75\n      },\n      "selected": true,\n      "dragging": false\n    },\n    {\n      "id": "sQM_22GYB5",\n      "type": "end-node",\n      "position": {\n        "x": 874.3164534765615,\n        "y": 151.70316541496913\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 75\n      },\n      "selected": false,\n      "dragging": false\n    },\n    {\n      "id": "KpMH_xc3ZZ",\n      "type": "llm-node",\n      "position": {\n        "x": 529.6286840434341,\n        "y": 150.4721376669937\n      },\n      "data": {},\n      "measured": {\n        "width": 256,\n        "height": 75\n      },\n      "selected": false,\n      "dragging": false\n    }\n  ],\n  "edges": [\n    {\n      "source": "TCxPixrdkI",\n      "sourceHandle": "source",\n      "target": "tGs78_ietp",\n      "targetHandle": "target",\n      "id": "xy-edge__TCxPixrdkIsource-tGs78_ietptarget"\n    },\n    {\n      "source": "TCxPixrdkI",\n      "sourceHandle": "source",\n      "target": "OeZdaU7LpY",\n      "targetHandle": "target",\n      "id": "xy-edge__TCxPixrdkIsource-OeZdaU7LpYtarget"\n    },\n    {\n      "source": "tGs78_ietp",\n      "sourceHandle": "source",\n      "target": "LjfoCYZo-E",\n      "targetHandle": "target",\n      "id": "xy-edge__tGs78_ietpsource-LjfoCYZo-Etarget"\n    },\n    {\n      "source": "LjfoCYZo-E",\n      "sourceHandle": "source",\n      "target": "KpMH_xc3ZZ",\n      "targetHandle": "target",\n      "id": "xy-edge__LjfoCYZo-Esource-KpMH_xc3ZZtarget"\n    },\n    {\n      "source": "OeZdaU7LpY",\n      "sourceHandle": "source",\n      "target": "KpMH_xc3ZZ",\n      "targetHandle": "target",\n      "id": "xy-edge__OeZdaU7LpYsource-KpMH_xc3ZZtarget"\n    },\n    {\n      "source": "KpMH_xc3ZZ",\n      "sourceHandle": "source",\n      "target": "sQM_22GYB5",\n      "targetHandle": "target",\n      "id": "xy-edge__KpMH_xc3ZZsource-sQM_22GYB5target"\n    }\n  ],\n  "data": {\n    "tGs78_ietp": {\n      "model": "qwen3",\n      "outputs": {\n        "text": {\n          "type": "string"\n        }\n      },\n      "systemPrompt": "你是个聪明人"\n    },\n    "OeZdaU7LpY": {\n      "model": "qwen3",\n      "outputs": {\n        "text": {\n          "type": "string"\n        }\n      },\n      "systemPrompt": "你也是个聪明人"\n    }\n  }\n}')
-    // language=JSON
-    checkAddConnection(JSON.parse('{\n  "source": "OeZdaU7LpY",\n  "sourceHandle": "source",\n  "target": "LjfoCYZo-E",\n  "targetHandle": "target"\n}'), nodes, edges)
-  }).toThrowError(hasRedundantEdgeError())
-})
-
-/* check save */
-test(atLeastOneStartNodeError().message, () => {
-  expect(() => checkSave([], [], {})).toThrowError(atLeastOneStartNodeError())
-})
-
-test(atLeastOneEndNodeError().message, () => {
-  expect(() => checkSave([createStartNode(uuid())], [], {})).toThrowError(atLeastOneEndNodeError())
-})

service-web/client/src/pages/ai/flow/FlowChecker.tsx

@@ -1,274 +0,0 @@
-import {type Connection, type Edge, getConnectedEdges, getIncomers, getOutgoers, type Node} from '@xyflow/react'
-import {clone, find, findIdx, isEqual, lpad, toStr, uuid} from 'licia'
-
-export class CheckError extends Error {
-  readonly id: string
-
-  constructor(
-    id: number,
-    message: string,
-  ) {
-    super(message)
-    this.id = `E${lpad(toStr(id), 6, '0')}`
-  }
-
-  public toString(): string {
-    return `${this.id}: ${this.message}`
-  }
-}
-
-export const multiStartNodeError = () => new CheckError(100, '只能存在1个开始节点')
-export const multiEndNodeError = () => new CheckError(101, '只能存在1个结束节点')
-
-const getNodeById = (id: string, nodes: Node[]) => find(nodes, (n: Node) => isEqual(n.id, id))
-
-// @ts-ignore
-export const checkAddNode: (type: string, nodes: Node[], edges: Edge[]) => void = (type, nodes, edges) => {
-  if (isEqual(type, 'start-node') && findIdx(nodes, (node: Node) => isEqual(type, node.type)) > -1) {
-    throw multiStartNodeError()
-  }
-  if (isEqual(type, 'end-node') && findIdx(nodes, (node: Node) => isEqual(type, node.type)) > -1) {
-    throw multiEndNodeError()
-  }
-}
-
-export const sourceNodeNotFoundError = () => new CheckError(200, '连线起始节点未找到')
-export const targetNodeNotFoundError = () => new CheckError(201, '连线目标节点未找到')
-export const startNodeToEndNodeError = () => new CheckError(202, '开始节点不能直连结束节点')
-export const nodeToSelfError = () => new CheckError(203, '节点不能直连自身')
-export const hasCycleError = () => new CheckError(204, '禁止流程循环')
-export const nodeNotOnlyToEndNode = () => new CheckError(206, '直连结束节点的节点不允许连接其他节点')
-export const hasRedundantEdgeError = () => new CheckError(207, '禁止出现冗余边')
-
-const hasCycle = (sourceNode: Node, targetNode: Node, nodes: Node[], edges: Edge[], visited = new Set<string>()) => {
-  if (visited.has(targetNode.id)) return false
-  visited.add(targetNode.id)
-  for (const outgoer of getOutgoers(targetNode, nodes, edges)) {
-    if (isEqual(outgoer.id, sourceNode.id)) return true
-    if (hasCycle(sourceNode, outgoer, nodes, edges, visited)) return true
-  }
-}
-
-/* 摘自Dify的流程合法性判断 */
-
-type ParallelInfoItem = {
-  parallelNodeId: string
-  depth: number
-  isBranch?: boolean
-}
-
-type NodeParallelInfo = {
-  parallelNodeId: string
-  edgeHandleId: string
-  depth: number
-}
-
-type NodeHandle = {
-  node: Node
-  handle: string
-}
-
-type NodeStreamInfo = {
-  upstreamNodes: Set<string>
-  downstreamEdges: Set<string>
-}
-
-const groupBy = (array: Record<string, any>[], iteratee: string) => {
-  const result: Record<string, any[]> = {}
-  for (const item of array) {
-    // 获取属性值并转换为字符串键
-    const key = item[iteratee]
-    if (!result[key]) {
-      result[key] = []
-    }
-    result[key].push(item)
-  }
-  return result
-}
-
-// @ts-ignore
-export const getParallelInfo = (nodes: Node[], edges: Edge[], parentNodeId?: string) => {
-  // 等到有子图的时候再考虑
-  /*if (parentNodeId) {
-    const parentNode = nodes.find(node => node.id === parentNodeId)
-    if (!parentNode)
-      throw new Error('Parent node not found')
-
-    startNode = nodes.find(node => node.id === (parentNode.data as (IterationNodeType | LoopNodeType)).start_node_id)
-  }
-  else {
-    startNode = nodes.find(node => isEqual(node.type, 'start_node'))
-  }*/
-  let startNode = nodes.find(node => isEqual(node.type, 'start-node'))
-  if (!startNode)
-    throw new Error('Start node not found')
-
-  const parallelList = [] as ParallelInfoItem[]
-  const nextNodeHandles = [{node: startNode, handle: 'source'}]
-  let hasAbnormalEdges = false
-
-  const traverse = (firstNodeHandle: NodeHandle) => {
-    const nodeEdgesSet = {} as Record<string, Set<string>>
-    const totalEdgesSet = new Set<string>()
-    const nextHandles = [firstNodeHandle]
-    const streamInfo = {} as Record<string, NodeStreamInfo>
-    const parallelListItem = {
-      parallelNodeId: '',
-      depth: 0,
-    } as ParallelInfoItem
-    const nodeParallelInfoMap = {} as Record<string, NodeParallelInfo>
-    nodeParallelInfoMap[firstNodeHandle.node.id] = {
-      parallelNodeId: '',
-      edgeHandleId: '',
-      depth: 0,
-    }
-
-    while (nextHandles.length) {
-      const currentNodeHandle = nextHandles.shift()!
-      const {node: currentNode, handle: currentHandle = 'source'} = currentNodeHandle
-      const currentNodeHandleKey = currentNode.id
-      const connectedEdges = edges.filter(edge => edge.source === currentNode.id && edge.sourceHandle === currentHandle)
-      const connectedEdgesLength = connectedEdges.length
-      const outgoers = nodes.filter(node => connectedEdges.some(edge => edge.target === node.id))
-      const incomers = getIncomers(currentNode, nodes, edges)
-
-      if (!streamInfo[currentNodeHandleKey]) {
-        streamInfo[currentNodeHandleKey] = {
-          upstreamNodes: new Set<string>(),
-          downstreamEdges: new Set<string>(),
-        }
-      }
-
-      if (nodeEdgesSet[currentNodeHandleKey]?.size > 0 && incomers.length > 1) {
-        const newSet = new Set<string>()
-        for (const item of totalEdgesSet) {
-          if (!streamInfo[currentNodeHandleKey].downstreamEdges.has(item))
-            newSet.add(item)
-        }
-        if (isEqual(nodeEdgesSet[currentNodeHandleKey], newSet)) {
-          parallelListItem.depth = nodeParallelInfoMap[currentNode.id].depth
-          nextNodeHandles.push({node: currentNode, handle: currentHandle})
-          break
-        }
-      }
-
-      if (nodeParallelInfoMap[currentNode.id].depth > parallelListItem.depth)
-        parallelListItem.depth = nodeParallelInfoMap[currentNode.id].depth
-
-      outgoers.forEach((outgoer) => {
-        const outgoerConnectedEdges = getConnectedEdges([outgoer], edges).filter(edge => edge.source === outgoer.id)
-        const sourceEdgesGroup = groupBy(outgoerConnectedEdges, 'sourceHandle')
-        const incomers = getIncomers(outgoer, nodes, edges)
-
-        if (outgoers.length > 1 && incomers.length > 1)
-          hasAbnormalEdges = true
-
-        Object.keys(sourceEdgesGroup).forEach((sourceHandle) => {
-          nextHandles.push({node: outgoer, handle: sourceHandle})
-        })
-        if (!outgoerConnectedEdges.length)
-          nextHandles.push({node: outgoer, handle: 'source'})
-
-        const outgoerKey = outgoer.id
-        if (!nodeEdgesSet[outgoerKey])
-          nodeEdgesSet[outgoerKey] = new Set<string>()
-
-        if (nodeEdgesSet[currentNodeHandleKey]) {
-          for (const item of nodeEdgesSet[currentNodeHandleKey])
-            nodeEdgesSet[outgoerKey].add(item)
-        }
-
-        if (!streamInfo[outgoerKey]) {
-          streamInfo[outgoerKey] = {
-            upstreamNodes: new Set<string>(),
-            downstreamEdges: new Set<string>(),
-          }
-        }
-
-        if (!nodeParallelInfoMap[outgoer.id]) {
-          nodeParallelInfoMap[outgoer.id] = {
-            ...nodeParallelInfoMap[currentNode.id],
-          }
-        }
-
-        if (connectedEdgesLength > 1) {
-          const edge = connectedEdges.find(edge => edge.target === outgoer.id)!
-          nodeEdgesSet[outgoerKey].add(edge.id)
-          totalEdgesSet.add(edge.id)
-
-          streamInfo[currentNodeHandleKey].downstreamEdges.add(edge.id)
-          streamInfo[outgoerKey].upstreamNodes.add(currentNodeHandleKey)
-
-          for (const item of streamInfo[currentNodeHandleKey].upstreamNodes)
-            streamInfo[item].downstreamEdges.add(edge.id)
-
-          if (!parallelListItem.parallelNodeId)
-            parallelListItem.parallelNodeId = currentNode.id
-
-          const prevDepth = nodeParallelInfoMap[currentNode.id].depth + 1
-          const currentDepth = nodeParallelInfoMap[outgoer.id].depth
-
-          nodeParallelInfoMap[outgoer.id].depth = Math.max(prevDepth, currentDepth)
-        } else {
-          for (const item of streamInfo[currentNodeHandleKey].upstreamNodes)
-            streamInfo[outgoerKey].upstreamNodes.add(item)
-
-          nodeParallelInfoMap[outgoer.id].depth = nodeParallelInfoMap[currentNode.id].depth
-        }
-      })
-    }
-
-    parallelList.push(parallelListItem)
-  }
-
-  while (nextNodeHandles.length) {
-    const nodeHandle = nextNodeHandles.shift()!
-    traverse(nodeHandle)
-  }
-
-  return {
-    parallelList,
-    hasAbnormalEdges,
-  }
-}
-
-export const checkAddConnection: (connection: Connection, nodes: Node[], edges: Edge[]) => void = (connection, nodes, edges) => {
-  let sourceNode = getNodeById(connection.source, nodes)
-  if (!sourceNode) {
-    throw sourceNodeNotFoundError()
-  }
-  let targetNode = getNodeById(connection.target, nodes)
-  if (!targetNode) {
-    throw targetNodeNotFoundError()
-  }
-  // 禁止短路整个流程
-  if (isEqual('start-node', sourceNode.type) && isEqual('end-node', targetNode.type)) {
-    throw startNodeToEndNodeError()
-  }
-
-  // 禁止流程出现环，必须是有向无环图
-  if (isEqual(sourceNode.id, targetNode.id)) {
-    throw nodeToSelfError()
-  } else if (hasCycle(sourceNode, targetNode, nodes, edges)) {
-    throw hasCycleError()
-  }
-
-  let newEdges = [...clone(edges), {...connection, id: uuid()}]
-  let {hasAbnormalEdges} = getParallelInfo(nodes, newEdges)
-  if (hasAbnormalEdges) {
-    throw hasRedundantEdgeError()
-  }
-}
-
-export const atLeastOneStartNodeError = () => new CheckError(300, '至少存在1个开始节点')
-export const atLeastOneEndNodeError = () => new CheckError(301, '至少存在1个结束节点')
-
-// @ts-ignore
-export const checkSave: (nodes: Node[], edges: Edge[], data: any) => void = (nodes, edges, data) => {
-  if (nodes.filter(n => isEqual('start-node', n.type)).length < 1) {
-    throw atLeastOneStartNodeError()
-  }
-  if (nodes.filter(n => isEqual('end-node', n.type)).length < 1) {
-    throw atLeastOneEndNodeError()
-  }
-}

service-web/client/src/pages/ai/flow/FlowElBuilder.tsx

@@ -1,76 +0,0 @@
-import {type Edge, type Node} from '@xyflow/react'
-
-export const buildEL = (nodes: Node[], edges: Edge[]): string => {
-  const nodeMap: Map<string, Node> = new Map<string, Node>()
-  // 构建邻接列表和内图
-  const adjList = new Map<string, string[]>()
-  const inDegree = new Map<string, number>()
-  for (const node of nodes) {
-    nodeMap.set(node.id, node)
-    adjList.set(node.id, [])
-    inDegree.set(node.id, 0)
-  }
-  for (const edge of edges) {
-    adjList.get(edge.source)!.push(edge.target)
-    inDegree.set(edge.target, inDegree.get(edge.target)! + 1)
-  }
-
-  // Compute levels (longest path from start)
-  const levelMap = new Map<string, number>()
-
-  function computeLevel(nodeId: string): number {
-    if (levelMap.has(nodeId)) return levelMap.get(nodeId)!
-    const preds = edges.filter(e => e.target === nodeId).map(e => e.source)
-    const level = preds.length === 0 ? 0 : Math.max(...preds.map(p => computeLevel(p))) + 1
-    levelMap.set(nodeId, level)
-    return level
-  }
-
-  for (const node of nodes) computeLevel(node.id)
-
-  // Group nodes by level
-  const maxLevel = Math.max(...Array.from(levelMap.values()))
-  const levels: string[][] = Array.from({length: maxLevel + 1}, () => [])
-  for (const node of nodes) levels[levelMap.get(node.id)!].push(node.id)
-
-  const covertNodeFromId = (id: string) => {
-    let node = nodeMap.get(id)!
-    return `node("${node.type}").bind("nodeId", ${node.id})`
-  }
-
-  // Build EL expression
-  const expressions: string[] = []
-  for (let i = 0; i <= maxLevel; i++) {
-    const nodesAtLevel = levels[i]
-    if (nodesAtLevel.length === 0) continue
-
-    // 识别从这个级别开始的串行链
-    const serialChains: string[] = []
-    for (const nodeId of nodesAtLevel) {
-      let chain = [nodeId]
-      let current = nodeId
-      while (adjList.get(current)?.length === 1) {
-        const next = adjList.get(current)![0]
-        if (inDegree.get(next) === 1 && levelMap.get(next) === i + chain.length) {
-          chain.push(next)
-          current = next
-        } else break
-      }
-      if (chain.length > 1) {
-        serialChains.push(`THEN(${chain.map(id => covertNodeFromId(id)).join(',')})`)
-        // Remove processed nodes from their levels
-        for (let j = 1; j < chain.length; j++) {
-          const level = levelMap.get(chain[j])!
-          levels[level] = levels[level].filter(n => n !== chain[j])
-        }
-      } else {
-        serialChains.push(covertNodeFromId(nodeId))
-      }
-    }
-
-    // Combine chains or nodes at this level
-    expressions.push(serialChains.length > 1 ? `WHEN(${serialChains.join(', ')})` : serialChains[0])
-  }
-
-  return `THEN(${expressions.join(',')})`
-}

service-web/client/src/pages/ai/flow/node/StartNode.tsx

@@ -1,68 +0,0 @@
-import type {NodeProps} from '@xyflow/react'
-import {Tag} from 'antd'
-import {each} from 'licia'
-import React, {type JSX} from 'react'
-import {horizontalFormOptions} from '../../../../util/amis.tsx'
-import AmisNode from './AmisNode.tsx'
-
-const typeMap: Record<string, string> = {
-  text: '文本',
-  number: '数字',
-  files: '文件',
-}
-
-const StartNode = (props: NodeProps) => AmisNode({
-  nodeProps: props,
-  type: 'start',
-  defaultNodeName: '开始节点',
-  defaultNodeDescription: '定义输入变量',
-  extraNodeDescription: nodeData => {
-    const variables: JSX.Element[] = []
-    const inputs = (nodeData?.inputs ?? {}) as Record<string, { type: string, description: string }>
-    each(inputs, (value, key) => {
-      variables.push(
-        <div className="mt-1 flex justify-between" key={key}>
-          <span>{key}</span>
-          <Tag className="m-0" color="blue">{typeMap[value.type]}</Tag>
-        </div>,
-      )
-    })
-    return (
-      <div className="mt-2">
-        {...variables}
-      </div>
-    )
-  },
-  columnSchema: [
-    {
-      type: 'input-kvs',
-      name: 'inputs',
-      label: '输入变量',
-      addButtonText: '新增入参',
-      draggable: false,
-      keyItem: {
-        label: '参数名称',
-        ...horizontalFormOptions(),
-      },
-      valueItems: [
-        {
-          ...horizontalFormOptions(),
-          type: 'input-text',
-          name: 'description',
-          label: '参数描述',
-        },
-        {
-          ...horizontalFormOptions(),
-          type: 'select',
-          name: 'type',
-          label: '参数类型',
-          required: true,
-          selectFirst: true,
-          options: Object.keys(typeMap).map(key => ({label: typeMap[key], value: key})),
-        },
-      ],
-    },
-  ],
-})
-
-export default React.memo(StartNode)

service-web/client/src/pages/ai/task/template/FlowTaskTemplate.tsx

@@ -97,7 +97,7 @@ const FlowTaskTemplate: React.FC = () => {
                               actionType: 'custom',
                               // @ts-ignore
                               script: (context, doAction, event) => {
-                                navigate(`/ai/flow_task_template/edit/${context.props.data['id']}`)
+                                navigate(`/ai/flow_task_template/flow/edit/${context.props.data['id']}`)
                               },
                             },
                           ],

service-web/client/src/pages/ai/task/template/FlowTaskTemplateEdit.tsx

@@ -33,10 +33,7 @@ const FlowTaskTemplateEdit: React.FC = () => {
             },
           },
           initApi: preloadTemplateId
-            ? {
-              method: 'GET',
-              url: `${commonInfo.baseAiUrl}/flow_task/template/detail/${preloadTemplateId}`,
-            }
+            ? `get:${commonInfo.baseAiUrl}/flow_task/template/detail/${preloadTemplateId}`
             : undefined,
           wrapWithPanel: false,
           ...horizontalFormOptions(),

service-web/client/src/pages/ai/task/template/FlowTaskTemplateFlowEdit.tsx

@@ -0,0 +1,49 @@
+import React, {useState} from 'react'
+import styled from 'styled-components'
+import {useNavigate, useParams} from 'react-router'
+import {useMount} from 'ahooks'
+import axios from 'axios'
+import {commonInfo} from '../../../../util/amis.tsx'
+import FlowEditor, {type GraphData} from '../../../../components/flow/FlowEditor.tsx'
+
+const FlowTaskTemplateFlowEditDiv = styled.div`
+`
+
+const FlowTaskTemplateFlowEdit: React.FC = () => {
+  const navigate = useNavigate()
+  const {template_id} = useParams()
+  const [graphData, setGraphData] = useState<GraphData>({nodes: [], edges: [], data: {}})
+
+  useMount(async () => {
+    let {data} = await axios.get(
+      `${commonInfo.baseAiUrl}/flow_task/template/detail/${template_id}`,
+      {
+        headers: commonInfo.authorizationHeaders
+      }
+    )
+    setGraphData(data?.data?.flowGraph)
+  })
+
+  return (
+    <FlowTaskTemplateFlowEditDiv className="h-full w-full">
+      <FlowEditor
+        graphData={graphData}
+        onGraphDataChange={async data => {
+          await axios.post(
+            `${commonInfo.baseAiUrl}/flow_task/template/update_flow_graph`,
+            {
+              id: template_id,
+              graph: data
+            },
+            {
+              headers: commonInfo.authorizationHeaders
+            }
+          )
+          navigate(-1)
+        }}
+      />
+    </FlowTaskTemplateFlowEditDiv>
+  )
+}
+
+export default FlowTaskTemplateFlowEdit

service-web/client/src/route.tsx

@@ -18,7 +18,6 @@ import {values} from 'licia'
 import {Navigate, type RouteObject} from 'react-router'
 import Conversation from './pages/ai/Conversation.tsx'
 import Feedback from './pages/ai/feedback/Feedback.tsx'
-import FlowEditor from './pages/ai/flow/FlowEditor.tsx'
 import DataDetail from './pages/ai/knowledge/DataDetail.tsx'
 import DataImport from './pages/ai/knowledge/DataImport.tsx'
 import DataSegment from './pages/ai/knowledge/DataSegment.tsx'
@@ -39,6 +38,7 @@ import Yarn from './pages/overview/Yarn.tsx'
 import YarnCluster from './pages/overview/YarnCluster.tsx'
 import Test from './pages/Test.tsx'
 import {commonInfo} from './util/amis.tsx'
+import FlowTaskTemplateFlowEdit from './pages/ai/task/template/FlowTaskTemplateFlowEdit.tsx'
 
 export const routes: RouteObject[] = [
   {
@@ -133,9 +133,9 @@ export const routes: RouteObject[] = [
             Component: FlowTaskTemplateEdit,
           },
           {
-            path: 'flowable',
-            Component: FlowEditor,
-          },
+            path: 'flow_task_template/flow/edit/:template_id',
+            Component: FlowTaskTemplateFlowEdit,
+          }
         ],
       },
       {
@@ -238,11 +238,6 @@ export const menus = {
           name: '知识库',
           icon: <DatabaseOutlined/>,
         },
-        {
-          path: '/ai/flowable',
-          name: '流程编排',
-          icon: <GatewayOutlined/>,
-        },
         {
           path: '1089caa6-9477-44a5-99f1-a9c179f6cfd3',
           name: '流程任务',

service-web/client/src/util/amis.tsx

@@ -10,8 +10,8 @@ import {isEqual} from 'licia'
 export const commonInfo = {
   debug: isEqual(import.meta.env.MODE, 'development'),
   baseUrl: 'http://132.126.207.130:35690/hudi_services/service_web',
-  baseAiUrl: 'http://132.126.207.130:35690/hudi_services/service_ai_web',
-  // baseAiUrl: 'http://localhost:8080',
+  // baseAiUrl: 'http://132.126.207.130:35690/hudi_services/service_ai_web',
+  baseAiUrl: 'http://localhost:8080',
   authorizationHeaders: {
     'Authorization': 'Basic QXhoRWJzY3dzSkRiWU1IMjpjWXhnM2I0UHRXb1ZENVNqRmF5V3h0blNWc2p6UnNnNA==',
     'Content-Type': 'application/json',