feat(ai-web): 输出节点改为多变量输出

将输入表单放在流程图中一起定义，方便统一参数的处理，不需要单独为输入表单的变量进行合并和操作

service-ai/database/20250702.sql

@@ -45,7 +45,7 @@ create table hudi_collect_build_b12.service_ai_flow_task
     status                enum ('ERROR','FINISHED','RUNNING') not null comment '任务运行状态',
     template_description  varchar(255) comment '任务对应的模板功能、内容说明',
     template_flow_graph   longtext                            not null comment '任务对应的模板前端流程图数据',
-    template_input_schema longtext                            not null comment '任务对应的模板入参Schema',
+    template_input_schema longtext comment '任务对应的模板入参Schema',
     template_name         varchar(255)                        not null comment '任务对应的模板名称',
     primary key (id)
 ) comment ='流程任务记录' charset = utf8mb4;
@@ -57,7 +57,7 @@ create table hudi_collect_build_b12.service_ai_flow_task_template
     modified_time datetime(6) comment '记录更新时间',
     description   varchar(255) comment '模板功能、内容说明',
     flow_graph    longtext     not null comment '前端流程图数据',
-    input_schema  longtext     not null comment '模板入参Schema',
+    input_schema  longtext comment '模板入参Schema',
     name          varchar(255) not null comment '模板名称',
     primary key (id)
 ) comment ='流程任务模板' charset = utf8mb4;

service-ai/pom.xml

@@ -30,6 +30,7 @@
         <curator.version>5.1.0</curator.version>
         <hutool.version>5.8.27</hutool.version>
         <mapstruct.version>1.6.3</mapstruct.version>
+        <liteflow.version>2.13.2</liteflow.version>
     </properties>
 
     <dependencies>
@@ -153,12 +154,27 @@
             <dependency>
                 <groupId>com.yomahub</groupId>
                 <artifactId>liteflow-spring-boot-starter</artifactId>
-                <version>2.13.2</version>
+                <version>${liteflow.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.yomahub</groupId>
                 <artifactId>liteflow-el-builder</artifactId>
-                <version>2.13.2</version>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-graaljs</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-python</artifactId>
+                <version>${liteflow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.yomahub</groupId>
+                <artifactId>liteflow-script-lua</artifactId>
+                <version>${liteflow.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.noear</groupId>

service-ai/service-ai-web/pom.xml

@@ -50,6 +50,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.blinkfox</groupId>
             <artifactId>fenix-spring-boot-starter</artifactId>
@@ -82,6 +86,14 @@
             <groupId>org.noear</groupId>
             <artifactId>solon-ai-dialect-openai</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-graaljs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-python</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.hibernate.orm</groupId>

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/WebApplication.java

@@ -27,6 +27,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 public class WebApplication implements ApplicationRunner {
 
   public static void main(String[] args) {
+    System.setProperty("polyglot.engine.WarnInterpreterOnly", "false");
+
     SpringApplication.run(WebApplication.class, args);
   }
 

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

@@ -1,5 +1,7 @@
 package com.lanyuanxiaoyao.service.ai.web.controller.task;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse;
@@ -9,10 +11,12 @@ import com.lanyuanxiaoyao.service.ai.web.entity.FlowTask;
 import com.lanyuanxiaoyao.service.ai.web.entity.FlowTaskTemplate;
 import com.lanyuanxiaoyao.service.ai.web.service.task.FlowTaskService;
 import com.lanyuanxiaoyao.service.ai.web.service.task.FlowTaskTemplateService;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
+import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,15 +42,27 @@ public class TaskController extends SimpleControllerSupport<FlowTask, TaskContro
   @GetMapping("input_data/{id}")
   public AmisResponse<?> getInputData(@PathVariable("id") Long id) throws JsonProcessingException {
     var task = flowTaskService.detailOrThrow(id);
+    if (ObjectUtil.isEmpty(task.getInput())) {
+      return AmisResponse.responseSuccess();
+    }
     return AmisResponse.responseSuccess(mapper.readValue(task.getInput(), Map.class));
   }
 
   @GetMapping("input_schema/{id}")
   public AmisResponse<?> getInputSchema(@PathVariable("id") Long id) throws JsonProcessingException {
     var task = flowTaskService.detailOrThrow(id);
+    if (ObjectUtil.isEmpty(task.getTemplateInputSchema())) {
+      return AmisResponse.responseSuccess();
+    }
     return AmisResponse.responseSuccess(mapper.readValue(task.getTemplateInputSchema(), Map.class));
   }
 
+  @GetMapping("execute/{id}")
+  public AmisResponse<?> execute(@PathVariable("id") Long id) throws JsonProcessingException, InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
+    flowTaskService.execute(id);
+    return AmisResponse.responseSuccess();
+  }
+
   @Override
   protected SaveItemMapper<FlowTask, SaveItem> saveItemMapper() {
     return item -> {
@@ -56,7 +72,7 @@ public class TaskController extends SimpleControllerSupport<FlowTask, TaskContro
       task.setTemplateDescription(template.getDescription());
       task.setTemplateInputSchema(template.getInputSchema());
       task.setTemplateFlowGraph(template.getFlowGraph());
-      task.setInput(mapper.writeValueAsString(item.getInput()));
+      task.setInput(ObjectUtil.isEmpty(item.getInput()) ? null : mapper.writeValueAsString(item.getInput()));
       return task;
     };
   }
@@ -84,9 +100,13 @@ public class TaskController extends SimpleControllerSupport<FlowTask, TaskContro
   public static class ListItem extends SimpleItem {
     private String templateName;
     private FlowTask.Status status;
+    private Boolean hasInput;
 
-    @org.mapstruct.Mapper
+    @org.mapstruct.Mapper(imports = {
+        StrUtil.class
+    })
     public static abstract class Mapper {
+      @Mapping(target = "hasInput", expression = "java(StrUtil.isNotBlank(task.getInput()))")
       public abstract ListItem from(FlowTask task);
     }
   }
@@ -97,8 +117,11 @@ public class TaskController extends SimpleControllerSupport<FlowTask, TaskContro
     private String error;
     private String result;
 
-    @org.mapstruct.Mapper
+    @org.mapstruct.Mapper(imports = {
+        StrUtil.class
+    })
     public static abstract class Mapper extends ListItem.Mapper {
+      @Mapping(target = "hasInput", expression = "java(StrUtil.isNotBlank(task.getInput()))")
       public abstract DetailItem from(FlowTask task);
     }
   }

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

@@ -1,5 +1,6 @@
 package com.lanyuanxiaoyao.service.ai.web.controller.task;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -38,9 +39,18 @@ public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemp
   @GetMapping("input_schema/{id}")
   public AmisResponse<?> getInputSchema(@PathVariable("id") Long id) throws JsonProcessingException {
     var template = flowTaskTemplateService.detailOrThrow(id);
+    if (ObjectUtil.isEmpty(template.getInputSchema())) {
+      return AmisResponse.responseSuccess();
+    }
     return AmisResponse.responseSuccess(mapper.readValue(template.getInputSchema(), Map.class));
   }
 
+  @GetMapping("flow_graph/{id}")
+  public AmisResponse<?> getFlowGraph(@PathVariable("id") Long id) throws JsonProcessingException {
+    var template = flowTaskTemplateService.detailOrThrow(id);
+    return AmisResponse.responseSuccess(mapper.readValue(template.getFlowGraph(), Map.class));
+  }
+
   @PostMapping("update_flow_graph")
   public AmisResponse<?> updateFlowGraph(@RequestBody UpdateGraphItem item) throws JsonProcessingException {
     flowTaskTemplateService.updateFlowGraph(item.getId(), mapper.writeValueAsString(item.getGraph()));
@@ -49,8 +59,7 @@ public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemp
 
   @Override
   protected SaveItemMapper<FlowTaskTemplate, SaveItem> saveItemMapper() {
-    var map = Mappers.getMapper(SaveItem.Mapper.class);
-    return item -> map.from(item, mapper);
+    return Mappers.getMapper(SaveItem.Mapper.class);
   }
 
   @Override
@@ -69,15 +78,9 @@ public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemp
     private Long id;
     private String name;
     private String description;
-    private Map<String, Object> inputSchema;
 
     @org.mapstruct.Mapper
-    public static abstract class Mapper {
-      public abstract FlowTaskTemplate from(SaveItem saveItem, @Context ObjectMapper mapper) throws Exception;
-
-      protected String mapInputSchema(Map<String, Object> inputSchema, @Context ObjectMapper mapper) throws JsonProcessingException {
-        return mapper.writeValueAsString(inputSchema);
-      }
+    public interface Mapper extends SaveItemMapper<FlowTaskTemplate, SaveItem> {
     }
   }
 
@@ -105,6 +108,9 @@ public class TaskTemplateController extends SimpleControllerSupport<FlowTaskTemp
       public abstract DetailItem from(FlowTaskTemplate template, @Context ObjectMapper mapper) throws Exception;
 
       public Map<String, Object> mapJson(String source, @Context ObjectMapper mapper) throws Exception {
+        if (ObjectUtil.isNull(source)) {
+          return null;
+        }
         return mapper.readValue(source, new TypeReference<>() {
         });
       }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/FlowExecutor.java

@@ -1,5 +1,6 @@
 package com.lanyuanxiaoyao.service.ai.web.engine;
 
+import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowContext;
 import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowGraph;
 import com.lanyuanxiaoyao.service.ai.web.engine.store.FlowStore;
 import java.lang.reflect.InvocationTargetException;
@@ -21,7 +22,11 @@ public class FlowExecutor {
   }
 
   public void execute(FlowGraph graph) throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
-    var runner = new FlowGraphRunner(graph, flowStore, runnerMap);
+    execute(graph, new FlowContext());
+  }
+
+  public void execute(FlowGraph graph, FlowContext context) throws InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
+    var runner = new FlowGraphRunner(graph, context, flowStore, runnerMap);
     runner.run();
   }
 }

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/FlowGraphRunner.java

@@ -1,5 +1,7 @@
 package com.lanyuanxiaoyao.service.ai.web.engine;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowContext;
 import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowEdge;
@@ -20,6 +22,7 @@ import org.eclipse.collections.api.multimap.set.ImmutableSetMultimap;
  */
 public final class FlowGraphRunner {
   private final FlowGraph flowGraph;
+  private final FlowContext flowContext;
   private final FlowStore flowStore;
   private final ImmutableMap<String, Class<? extends FlowNodeRunner>> nodeRunnerClass;
   private final Queue<FlowNode> executionQueue = new LinkedList<>();
@@ -27,8 +30,9 @@ public final class FlowGraphRunner {
   private final ImmutableSetMultimap<String, FlowEdge> nodeOutputMap;
   private final ImmutableMap<String, FlowNode> nodeMap;
 
-  public FlowGraphRunner(FlowGraph flowGraph, FlowStore flowStore, ImmutableMap<String, Class<? extends FlowNodeRunner>> nodeRunnerClass) {
+  public FlowGraphRunner(FlowGraph flowGraph, FlowContext flowContext, FlowStore flowStore, ImmutableMap<String, Class<? extends FlowNodeRunner>> nodeRunnerClass) {
     this.flowGraph = flowGraph;
+    this.flowContext = flowContext;
     this.flowStore = flowStore;
     this.nodeRunnerClass = nodeRunnerClass;
 
@@ -40,13 +44,17 @@ public final class FlowGraphRunner {
   public void run() throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
     flowStore.init(flowGraph);
 
-    var context = new FlowContext();
     for (FlowNode node : flowGraph.nodes()) {
-      executionQueue.offer(node);
+      if (ObjectUtil.isNull(node.parentId())) {
+        executionQueue.offer(node);
+      }
     }
     while (!executionQueue.isEmpty()) {
       var node = executionQueue.poll();
-      process(node, context);
+      if (ObjectUtil.isNull(node)) {
+        continue;
+      }
+      process(node, flowContext);
     }
   }
 
@@ -72,8 +80,17 @@ public final class FlowGraphRunner {
         var runner = runnerClazz.getDeclaredConstructor().newInstance();
         runner.setNodeId(node.id());
         runner.setContext(context);
+
+        // 处理子流程节点的逻辑
+        if (runner instanceof FlowNodeSubflowRunner subflowRunner) {
+          var subflowNodes = flowGraph.nodes().select(n -> StrUtil.equals(n.parentId(), node.id()));
+          var subGraph = new FlowGraph(IdUtil.fastUUID(), subflowNodes, flowGraph.edges());
+          subflowRunner.setSubGraph(subGraph);
+        }
+
         runner.run();
 
+        // 处理选择节点的逻辑
         if (runner instanceof FlowNodeOptionalRunner) {
           var targetPoint = ((FlowNodeOptionalRunner) runner).getTargetPoint();
           for (FlowEdge edge : nodeOutputMap.get(node.id())) {

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/FlowHelper.java

@@ -0,0 +1,58 @@
+package com.lanyuanxiaoyao.service.ai.web.engine;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.template.TemplateEngine;
+import cn.hutool.extra.template.TemplateUtil;
+import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowContext;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Maps;
+import org.eclipse.collections.api.map.ImmutableMap;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250711
+ */
+@Slf4j
+public class FlowHelper {
+  private static final TemplateEngine TEMPLATE_ENGINE = TemplateUtil.createEngine();
+
+  public static ImmutableMap<String, Object> generateInputVariablesMap(String nodeId, FlowContext context) {
+    var variableMap = Maps.mutable.<String, Object>empty();
+    var currentNodeData = context.get(nodeId);
+    if (currentNodeData.containsKey("inputs")) {
+      var inputsMap = (Map<String, Map<String, String>>) currentNodeData.get("inputs");
+      for (String variableName : inputsMap.keySet()) {
+        var expression = inputsMap.get(variableName).get("variable");
+        var targetVariable = generateVariable(expression, context);
+        if (ObjectUtil.isNotNull(targetVariable)) {
+          variableMap.put(variableName, targetVariable);
+        }
+      }
+    }
+    return variableMap.toImmutable();
+  }
+
+  public static Object generateVariable(String expression, FlowContext context) {
+    if (StrUtil.contains(expression, ".")) {
+      var splits = StrUtil.splitTrim(expression, ".", 2);
+      var targetNodeId = splits.get(0);
+      var targetVariableName = splits.get(1);
+      if (!context.getData().containsKey(targetNodeId)) {
+        throw new RuntimeException(StrUtil.format("Target node id not found: {}", targetNodeId));
+      }
+      var targetNodeData = context.getData().get(targetNodeId);
+      if (!targetNodeData.containsKey(targetVariableName)) {
+        throw new RuntimeException(StrUtil.format("Target node variable not found: {}.{}", targetNodeId, targetVariableName));
+      }
+      return targetNodeData.get(targetVariableName);
+    }
+    return null;
+  }
+
+  public static String renderTemplateText(String templateText, Map<?, ?> data) {
+    var template = TEMPLATE_ENGINE.getTemplate(templateText);
+    return template.render(data);
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/FlowNodeRunner.java

@@ -2,6 +2,7 @@ package com.lanyuanxiaoyao.service.ai.web.engine;
 
 import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowContext;
 import lombok.Getter;
+import org.eclipse.collections.api.map.MutableMap;
 
 public abstract class FlowNodeRunner {
   @Getter
@@ -19,6 +20,10 @@ public abstract class FlowNodeRunner {
     this.context = context;
   }
 
+  protected MutableMap<String, Object> getData() {
+    return context.get(nodeId);
+  }
+
   protected <T> T getData(String key) {
     var data = context.get(nodeId);
     return (T) data.get(key);

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/FlowNodeSubflowRunner.java

@@ -0,0 +1,17 @@
+package com.lanyuanxiaoyao.service.ai.web.engine;
+
+import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowGraph;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 包含子流程的流程
+ *
+ * @author lanyuanxiaoyao
+ * @version 20250717
+ */
+public abstract class FlowNodeSubflowRunner extends FlowNodeRunner {
+  @Getter
+  @Setter
+  private FlowGraph subGraph;
+}

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

@@ -1,5 +1,6 @@
 package com.lanyuanxiaoyao.service.ai.web.engine.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.time.LocalDateTime;
 
 /**
@@ -12,7 +13,9 @@ public record FlowEdge(
     String id,
     String source,
     String target,
+    @JsonProperty("sourceHandle")
     String sourcePoint,
+    @JsonProperty("targetHandle")
     String targetPoint
 ) {
   public enum Status {

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

@@ -10,7 +10,8 @@ import java.time.LocalDateTime;
  */
 public record FlowNode(
     String id,
-    String type
+    String type,
+    String parentId
 ) {
   public enum Status {
     INITIAL, RUNNING, FINISHED, SKIPPED

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/node/CodeNode.java

@@ -0,0 +1,37 @@
+package com.lanyuanxiaoyao.service.ai.web.engine.node;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.lanyuanxiaoyao.service.ai.web.configuration.SpringBeanGetter;
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowHelper;
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowNodeRunner;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.code.CodeExecutor;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.code.JavaScriptCodeExecutor;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.code.PythonCodeExecutor;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250717
+ */
+@Slf4j
+public class CodeNode extends FlowNodeRunner {
+  @Override
+  public void run() {
+    var mapper = SpringBeanGetter.getBean(ObjectMapper.class);
+    var inputVariablesMap = FlowHelper.generateInputVariablesMap(getNodeId(), getContext());
+    var type = this.<String>getData("type");
+    var script = this.<String>getData("content");
+    CodeExecutor executor = switch (type) {
+      case "javascript" -> new JavaScriptCodeExecutor(mapper);
+      case "python" -> new PythonCodeExecutor(mapper);
+      default -> null;
+    };
+    if (ObjectUtil.isNull(executor)) {
+      throw new RuntimeException(StrUtil.format("Unsupported type: {}", type));
+    }
+    var result = executor.execute(script, inputVariablesMap);
+    result.forEachKeyValue(this::setData);
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/node/InputNode.java

@@ -0,0 +1,25 @@
+package com.lanyuanxiaoyao.service.ai.web.engine.node;
+
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowNodeRunner;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250711
+ */
+@Slf4j
+public class InputNode extends FlowNodeRunner {
+  public static final String KEY = "flow_inputs";
+
+  @Override
+  public void run() {
+    var inputData = getContext().getData().get(KEY);
+    var inputs = this.<Map<String, Object>>getData("inputs");
+    for (String variable : inputs.keySet()) {
+      if (inputData.containsKey(variable)) {
+        setData(variable, inputData.get(variable));
+      }
+    }
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/node/LlmNode.java

@@ -0,0 +1,31 @@
+package com.lanyuanxiaoyao.service.ai.web.engine.node;
+
+import cn.hutool.core.util.StrUtil;
+import com.lanyuanxiaoyao.service.ai.web.configuration.SpringBeanGetter;
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowHelper;
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowNodeRunner;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.ai.chat.client.ChatClient;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250711
+ */
+@Slf4j
+public class LlmNode extends FlowNodeRunner {
+  @Override
+  public void run() {
+    var variableMap = FlowHelper.generateInputVariablesMap(getNodeId(), getContext());
+    var sourcePrompt = (String) getData("systemPrompt");
+    if (StrUtil.isNotBlank(sourcePrompt)) {
+      var prompt = FlowHelper.renderTemplateText(sourcePrompt, variableMap.toMap());
+      var builder = SpringBeanGetter.getBean("chat", ChatClient.Builder.class);
+      var client = builder.build();
+      var content = client.prompt()
+          .user(prompt)
+          .call()
+          .content();
+      setData("text", content);
+    }
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/node/LoopNode.java

@@ -0,0 +1,18 @@
+package com.lanyuanxiaoyao.service.ai.web.engine.node;
+
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowNodeSubflowRunner;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * 循环节点
+ *
+ * @author lanyuanxiaoyao
+ * @version 20250717
+ */
+@Slf4j
+public class LoopNode extends FlowNodeSubflowRunner {
+  @Override
+  public void run() {
+    log.info("{}", getSubGraph());
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/node/OutputNode.java

@@ -0,0 +1,20 @@
+package com.lanyuanxiaoyao.service.ai.web.engine.node;
+
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowHelper;
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowNodeRunner;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250711
+ */
+@Slf4j
+public class OutputNode extends FlowNodeRunner {
+  private static final String KEY = "flow_outputs";
+
+  @Override
+  public void run() {
+    var variableMap = FlowHelper.generateInputVariablesMap(getNodeId(), getContext());
+    getContext().getData().put(KEY, variableMap.toMap());
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/node/SwitchNode.java

@@ -0,0 +1,87 @@
+package com.lanyuanxiaoyao.service.ai.web.engine.node;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowHelper;
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowNodeOptionalRunner;
+import java.math.BigDecimal;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250717
+ */
+@SuppressWarnings("unchecked")
+@Slf4j
+public class SwitchNode extends FlowNodeOptionalRunner {
+  @Override
+  public String runOptional() {
+    var conditions = this.<List<Map<String, Object>>>getData("conditions");
+    for (Map<String, Object> item : conditions) {
+      var condition = (Map<String, Object>) item.getOrDefault("condition", Map.of());
+      var id = (String) condition.getOrDefault("id", "");
+      var conjunction = (String) condition.getOrDefault("conjunction", "and");
+      var conditionChildren = ((List<Map<String, Object>>) condition.getOrDefault("children", List.<Map<String, Object>>of()));
+      if (
+          StrUtil.equals(conjunction, "and")
+          && conditionChildren.stream().allMatch(this::check)
+      ) {
+        return id;
+      } else if (
+          StrUtil.equals(conjunction, "or")
+          && conditionChildren.stream().anyMatch(this::check)
+      ) {
+        return id;
+      }
+    }
+    return "";
+  }
+
+  private Boolean check(Map<String, Object> condition) {
+    var leftVariable = (String) BeanUtil.getProperty(condition, "left.field");
+    var left = FlowHelper.generateVariable(leftVariable, getContext());
+    var operator = (String) condition.get("op");
+    var right = condition.get("right");
+    if (left instanceof CharSequence || left instanceof Boolean) {
+      String source = StrUtil.toStringOrNull(left);
+      String target = StrUtil.toStringOrNull(right);
+      return switch (operator) {
+        case "equal" -> StrUtil.equals(source, target);
+        case "not_equal" -> !StrUtil.equals(source, target);
+        case "is_empty" -> StrUtil.isBlank(source);
+        case "is_not_empty" -> StrUtil.isNotBlank(source);
+        case "like" -> StrUtil.contains(source, target);
+        case "not_like" -> !StrUtil.contains(source, target);
+        case "starts_with" -> StrUtil.startWith(source, target);
+        case "ends_with" -> StrUtil.endWith(source, target);
+        default -> false;
+      };
+    } else if (left instanceof Number source) {
+      var sourceNumber = new BigDecimal(StrUtil.toString(source));
+      var targetNumber = new BigDecimal(StrUtil.toString(right));
+      return switch (operator) {
+        case "equal" -> NumberUtil.equals(sourceNumber, targetNumber);
+        case "not_equal" -> !NumberUtil.equals(sourceNumber, targetNumber);
+        case "greater" -> NumberUtil.isGreater(sourceNumber, targetNumber);
+        case "greater_equal" -> NumberUtil.isGreaterOrEqual(sourceNumber, targetNumber);
+        case "less" -> NumberUtil.isLess(sourceNumber, targetNumber);
+        case "less_equal" -> NumberUtil.isLessOrEqual(sourceNumber, targetNumber);
+        default -> false;
+      };
+    } else if (left instanceof Collection<?> source) {
+      return switch (operator) {
+        case "is_empty" -> CollectionUtil.isEmpty(source);
+        case "is_not_empty" -> CollectionUtil.isNotEmpty(source);
+        case "contain" -> CollectionUtil.safeContains(source, right);
+        case "not_contain" -> !CollectionUtil.safeContains(source, right);
+        default -> false;
+      };
+    }
+    return false;
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/node/code/CodeExecutor.java

@@ -0,0 +1,11 @@
+package com.lanyuanxiaoyao.service.ai.web.engine.node.code;
+
+import org.eclipse.collections.api.map.ImmutableMap;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250717
+ */
+public interface CodeExecutor {
+  ImmutableMap<String, Object> execute(String script, ImmutableMap<String, Object> inputVariablesMap);
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/node/code/JavaScriptCodeExecutor.java

@@ -0,0 +1,57 @@
+package com.lanyuanxiaoyao.service.ai.web.engine.node.code;
+
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Maps;
+import org.eclipse.collections.api.map.ImmutableMap;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Engine;
+import org.graalvm.polyglot.Source;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250717
+ */
+@Slf4j
+public class JavaScriptCodeExecutor implements CodeExecutor {
+  private final ObjectMapper mapper;
+
+  public JavaScriptCodeExecutor(ObjectMapper mapper) {
+    this.mapper = mapper;
+  }
+
+  @SneakyThrows
+  @Override
+  public ImmutableMap<String, Object> execute(String script, ImmutableMap<String, Object> inputVariablesMap) {
+    if (StrUtil.isBlank(script)) {
+      return Maps.immutable.empty();
+    }
+    try (var engin = Engine.create()) {
+      try (
+          var context = Context.newBuilder()
+              .allowAllAccess(true)
+              .engine(engin)
+              .build()
+      ) {
+        var bindings = context.getBindings("js");
+        bindings.putMember("context", inputVariablesMap);
+        var result = context.eval(
+            Source.create(
+                "js",
+                """
+                    function process() {
+                      %s
+                    }
+                    var result = process();
+                    JSON.stringify(result? result: {})
+                    """.formatted(script)
+            )
+        );
+        return mapper.readValue(result.asString(), new TypeReference<>() {});
+      }
+    }
+  }
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/engine/node/code/PythonCodeExecutor.java

@@ -0,0 +1,50 @@
+package com.lanyuanxiaoyao.service.ai.web.engine.node.code;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.map.ImmutableMap;
+import org.python.core.PySystemState;
+import org.python.util.PythonInterpreter;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250718
+ */
+@Slf4j
+public class PythonCodeExecutor implements CodeExecutor {
+  private final ObjectMapper mapper;
+
+  public PythonCodeExecutor(ObjectMapper mapper) {
+    this.mapper = mapper;
+  }
+
+  @SneakyThrows
+  @Override
+  public ImmutableMap<String, Object> execute(String script, ImmutableMap<String, Object> inputVariablesMap) {
+    try (var systemState = new PySystemState()) {
+      systemState.setdefaultencoding("UTF-8");
+      var interpreter = new PythonInterpreter(null, systemState);
+      script = Arrays.stream(script.split("\n"))
+          .map(line -> "  " + line)
+          .collect(Collectors.joining("\n"));
+      interpreter.set("context", inputVariablesMap);
+      var pythonScript = interpreter.compile(
+          """
+              import json
+              
+              def process():
+              %s
+              
+              result = json.dumps(process())
+              """.formatted(script)
+      );
+      interpreter.exec(pythonScript);
+      var result = interpreter.get("result");
+      return mapper.readValue((String) result.__tojava__(String.class), new TypeReference<>() {});
+    }
+  }
+}

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

@@ -32,7 +32,7 @@ public class FlowTask extends SimpleEntity {
   @Comment("任务对应的模板功能、内容说明")
   private String templateDescription;
   @Comment("任务对应的模板入参Schema")
-  @Column(nullable = false, columnDefinition = "longtext")
+  @Column(columnDefinition = "longtext")
   private String templateInputSchema;
   @Comment("任务对应的模板前端流程图数据")
   @Column(nullable = false, columnDefinition = "longtext")

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

@@ -28,7 +28,7 @@ public class FlowTaskTemplate extends SimpleEntity {
   @Comment("模板功能、内容说明")
   private String description;
   @Comment("模板入参Schema")
-  @Column(nullable = false, columnDefinition = "longtext")
+  @Column(columnDefinition = "longtext")
   private String inputSchema;
   @Comment("前端流程图数据")
   @Column(nullable = false, columnDefinition = "longtext")

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

@@ -0,0 +1,14 @@
+package com.lanyuanxiaoyao.service.ai.web.entity.vo;
+
+import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowEdge;
+import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowNode;
+import lombok.Data;
+import org.eclipse.collections.api.map.MutableMap;
+import org.eclipse.collections.api.set.ImmutableSet;
+
+@Data
+public class FlowGraphVo {
+  private ImmutableSet<FlowNode> nodes;
+  private ImmutableSet<FlowEdge> edges;
+  private MutableMap<String, MutableMap<String, Object>> data;
+}

service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/feedback/FeedbackService.java

@@ -7,9 +7,7 @@ import com.lanyuanxiaoyao.service.ai.web.entity.context.FeedbackContext;
 import com.lanyuanxiaoyao.service.ai.web.repository.FeedbackRepository;
 import com.yomahub.liteflow.core.FlowExecutor;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,7 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
     this.executor = executor;
   }
 
-  @Scheduled(initialDelay = 1, fixedDelay = 1, timeUnit = TimeUnit.MINUTES)
+  // @Scheduled(initialDelay = 1, fixedDelay = 1, timeUnit = TimeUnit.MINUTES)
   public void analysis() {
     List<Feedback> feedbacks = repository.findAll(
         builder -> builder

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

@@ -1,15 +1,66 @@
 package com.lanyuanxiaoyao.service.ai.web.service.task;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
+import com.lanyuanxiaoyao.service.ai.web.engine.FlowExecutor;
+import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowContext;
+import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowGraph;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.CodeNode;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.InputNode;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.LlmNode;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.LoopNode;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.OutputNode;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.SwitchNode;
+import com.lanyuanxiaoyao.service.ai.web.engine.store.InMemoryFlowStore;
 import com.lanyuanxiaoyao.service.ai.web.entity.FlowTask;
+import com.lanyuanxiaoyao.service.ai.web.entity.vo.FlowGraphVo;
 import com.lanyuanxiaoyao.service.ai.web.repository.FlowTaskRepository;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Maps;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.stereotype.Service;
 
 @Slf4j
 @Service
 public class FlowTaskService extends SimpleServiceSupport<FlowTask> {
-  public FlowTaskService(FlowTaskRepository flowTaskRepository) {
+  private final ObjectMapper mapper;
+
+  public FlowTaskService(FlowTaskRepository flowTaskRepository, Jackson2ObjectMapperBuilder builder) {
     super(flowTaskRepository);
+    this.mapper = builder.build();
+  }
+
+  public void execute(Long id) throws JsonProcessingException, InvocationTargetException, NoSuchMethodException, InstantiationException, IllegalAccessException {
+    var flowTask = detailOrThrow(id);
+    var graphVo = mapper.readValue(flowTask.getTemplateFlowGraph(), FlowGraphVo.class);
+    var flowGraph = new FlowGraph(IdUtil.fastUUID(), graphVo.getNodes(), graphVo.getEdges());
+
+    var store = new InMemoryFlowStore();
+    var executor = new FlowExecutor(
+        store,
+        Maps.immutable.ofAll(Map.of(
+            "loop-node", LoopNode.class,
+            "switch-node", SwitchNode.class,
+            "code-node", CodeNode.class,
+            "llm-node", LlmNode.class,
+            "input-node", InputNode.class,
+            "output-node", OutputNode.class
+        ))
+    );
+    FlowContext context = new FlowContext();
+    context.setData(graphVo.getData());
+
+    if (ObjectUtil.isNotEmpty(flowTask.getInput())) {
+      context.getData().put(InputNode.KEY, mapper.readValue(flowTask.getInput(), new TypeReference<>() {
+      }));
+    }
+
+    executor.execute(flowGraph, context);
   }
 }

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

@@ -1,22 +1,45 @@
 package com.lanyuanxiaoyao.service.ai.web.service.task;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.lanyuanxiaoyao.service.ai.web.base.service.SimpleServiceSupport;
 import com.lanyuanxiaoyao.service.ai.web.entity.FlowTaskTemplate;
+import com.lanyuanxiaoyao.service.ai.web.entity.vo.FlowGraphVo;
 import com.lanyuanxiaoyao.service.ai.web.repository.FlowTaskTemplateRepository;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
 public class FlowTaskTemplateService extends SimpleServiceSupport<FlowTaskTemplate> {
-  public FlowTaskTemplateService(FlowTaskTemplateRepository flowTaskTemplateRepository) {
+  private final ObjectMapper mapper;
+
+  public FlowTaskTemplateService(FlowTaskTemplateRepository flowTaskTemplateRepository, Jackson2ObjectMapperBuilder builder) {
     super(flowTaskTemplateRepository);
+    this.mapper = builder.build();
   }
 
   @Transactional(rollbackFor = Exception.class)
-  public void updateFlowGraph(Long id, String flowGraph) {
+  public void updateFlowGraph(Long id, String flowGraph) throws JsonProcessingException {
     var template = detailOrThrow(id);
+
+    var graph = mapper.readValue(flowGraph, FlowGraphVo.class);
+    // 如果发现输入节点，就单独提取出来
+    var inputNode = graph.getNodes()
+        .detectOptional(node -> StrUtil.equals(node.type(), "input-node") && ObjectUtil.isEmpty(node.parentId()))
+        .orElse(null);
+    if (ObjectUtil.isNotNull(inputNode)) {
+      var nodeId = inputNode.id();
+      var nodeData = graph.getData().getOrDefault(nodeId, null);
+      if (ObjectUtil.isNotNull(nodeData) && nodeData.containsKey("inputs")) {
+        template.setInputSchema(mapper.writeValueAsString(nodeData.get("inputs")));
+      }
+    }
+
     template.setFlowGraph(flowGraph);
     save(template);
   }

service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestCodeExecutor.java

@@ -0,0 +1,29 @@
+package com.lanyuanxiaoyao.service.ai.web;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.eclipsecollections.EclipseCollectionsModule;
+import com.lanyuanxiaoyao.service.ai.web.engine.node.code.JavaScriptCodeExecutor;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.collections.api.factory.Maps;
+
+/**
+ * @author lanyuanxiaoyao
+ * @version 20250717
+ */
+@Slf4j
+public class TestCodeExecutor {
+  public static void main(String[] args) {
+    var mapper = new ObjectMapper();
+    mapper.registerModule(new EclipseCollectionsModule());
+    var executor = new JavaScriptCodeExecutor(mapper);
+    var result = executor.execute(
+        """
+            return {'code': 1, 'text': context.get('text')}
+            """,
+        Maps.immutable.of(
+            "text", "hello world"
+        )
+    );
+    log.info("Result: {}", result);
+  }
+}

service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestFlow.java

@@ -35,15 +35,15 @@ public class TestFlow {
     var graph = new FlowGraph(
         "graph-1",
         Sets.immutable.of(
-            new FlowNode("node-1", "plain-node"),
-            new FlowNode("node-2", "plain-node"),
-            new FlowNode("node-4", "plain-node"),
-            new FlowNode("node-6", "plain-node"),
-            new FlowNode("node-7", "plain-node"),
-            new FlowNode("node-5", "plain-node"),
-            new FlowNode("node-8", "option-node"),
-            new FlowNode("node-9", "plain-node"),
-            new FlowNode("node-3", "plain-node")
+            new FlowNode("node-1", "plain-node", null),
+            new FlowNode("node-2", "plain-node", null),
+            new FlowNode("node-4", "plain-node", null),
+            new FlowNode("node-6", "plain-node", null),
+            new FlowNode("node-7", "plain-node", null),
+            new FlowNode("node-5", "plain-node", null),
+            new FlowNode("node-8", "option-node", null),
+            new FlowNode("node-9", "plain-node", null),
+            new FlowNode("node-3", "plain-node", null)
         ),
         Sets.immutable.of(
             new FlowEdge("edge-1", "node-1", "node-2", null, null),

service-web/client/package.json

@@ -16,15 +16,15 @@
     "@echofly/fetch-event-source": "^3.0.2",
     "@fortawesome/fontawesome-free": "^6.7.2",
     "@lightenna/react-mermaid-diagram": "^1.0.21",
-    "@xyflow/react": "^12.8.1",
+    "@xyflow/react": "^12.8.2",
     "ahooks": "^3.9.0",
     "amis": "^6.12.0",
-    "antd": "^5.26.3",
+    "antd": "^5.26.4",
     "axios": "^1.10.0",
     "chart.js": "^4.5.0",
     "echarts-for-react": "^3.0.2",
     "licia": "^1.48.0",
-    "mermaid": "^11.8.0",
+    "mermaid": "^11.8.1",
     "react": "^18.3.1",
     "react-chartjs-2": "^5.3.0",
     "react-dom": "^18.3.1",
@@ -41,7 +41,7 @@
     "globals": "^16.3.0",
     "sass": "^1.89.2",
     "typescript": "~5.8.3",
-    "vite": "^7.0.2",
+    "vite": "^7.0.4",
     "vite-plugin-javascript-obfuscator": "^3.1.0",
     "vitest": "^3.2.4"
   }

service-web/client/pnpm-lock.yaml

@@ -25,10 +25,10 @@ importers:
         version: 6.7.2
       '@lightenna/react-mermaid-diagram':
         specifier: ^1.0.21
-        version: 1.0.21(mermaid@11.8.0)(react@18.3.1)
+        version: 1.0.21(mermaid@11.8.1)(react@18.3.1)
       '@xyflow/react':
-        specifier: ^12.8.1
-        version: 12.8.1(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
+        specifier: ^12.8.2
+        version: 12.8.2(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       ahooks:
         specifier: ^3.9.0
         version: 3.9.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@@ -36,7 +36,7 @@ importers:
         specifier: ^6.12.0
         version: 6.12.0(@types/react@18.3.23)(amis-core@6.12.0(@types/react@18.3.23)(amis-formula@6.12.0)(react-dom@18.3.1(react@18.3.1))(react-is@18.3.1)(react@18.3.1))(amis-ui@6.12.0(@types/react@18.3.23)(amis-core@6.12.0(@types/react@18.3.23)(amis-formula@6.12.0)(react-dom@18.3.1(react@18.3.1))(react-is@18.3.1)(react@18.3.1))(amis-formula@6.12.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(office-viewer@0.3.14(echarts@5.5.1))(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       antd:
-        specifier: ^5.26.3
+        specifier: ^5.26.4
         version: 5.26.4(moment@2.30.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       axios:
         specifier: ^1.10.0
@@ -51,8 +51,8 @@ importers:
         specifier: ^1.48.0
         version: 1.48.0
       mermaid:
-        specifier: ^11.8.0
-        version: 11.8.0
+        specifier: ^11.8.1
+        version: 11.8.1
       react:
         specifier: ^18.3.1
         version: 18.3.1
@@ -86,7 +86,7 @@ importers:
         version: 18.3.7(@types/react@18.3.23)
       '@vitejs/plugin-react-swc':
         specifier: ^3.10.2
-        version: 3.10.2(vite@7.0.2(sass@1.89.2))
+        version: 3.10.2(vite@7.0.4(sass@1.89.2))
       globals:
         specifier: ^16.3.0
         version: 16.3.0
@@ -97,8 +97,8 @@ importers:
         specifier: ~5.8.3
         version: 5.8.3
       vite:
-        specifier: ^7.0.2
-        version: 7.0.2(sass@1.89.2)
+        specifier: ^7.0.4
+        version: 7.0.4(sass@1.89.2)
       vite-plugin-javascript-obfuscator:
         specifier: ^3.1.0
         version: 3.1.0
@@ -518,8 +518,8 @@ packages:
     resolution: {integrity: sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==}
     hasBin: true
 
-  '@mermaid-js/parser@0.6.0':
-    resolution: {integrity: sha512-7DNESgpyZ5WG1SIkrYafVBhWmImtmQuoxOO1lawI3gQYWxBX3v1FW3IyuuRfKJAO06XrZR71W0Kif5VEGGd4VA==}
+  '@mermaid-js/parser@0.6.1':
+    resolution: {integrity: sha512-lCQNpV8R4lgsGcjX5667UiuDLk2micCtjtxR1YKbBXvN5w2v+FeLYoHrTSSrjwXdMcDYvE4ZBPvKT31dfeSmmA==}
 
   '@parcel/watcher-android-arm64@2.5.1':
     resolution: {integrity: sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==}
@@ -1071,14 +1071,14 @@ packages:
   '@vitest/utils@3.2.4':
     resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
 
-  '@xyflow/react@12.8.1':
-    resolution: {integrity: sha512-t5Rame4Gc/540VcOZd28yFe9Xd8lyjKUX+VTiyb1x4ykNXZH5zyDmsu+lj9je2O/jGBVb0pj1Vjcxrxyn+Xk2g==}
+  '@xyflow/react@12.8.2':
+    resolution: {integrity: sha512-VifLpxOy74ck283NQOtBn1e8igmB7xo7ADDKxyBHkKd8IKpyr16TgaYOhzqVwNMdB4NT+m++zfkic530L+gEXw==}
     peerDependencies:
       react: '>=17'
       react-dom: '>=17'
 
-  '@xyflow/system@0.0.65':
-    resolution: {integrity: sha512-AliQPQeurQMoNlOdySnRoDQl9yDSA/1Lqi47Eo0m98lHcfrTdD9jK75H0tiGj+0qRC10SKNUXyMkT0KL0opg4g==}
+  '@xyflow/system@0.0.66':
+    resolution: {integrity: sha512-TTxESDwPsATnuDMUeYYtKe4wt9v8bRO29dgYBhR8HyhSCzipnAdIL/1CDfFd+WqS1srVreo24u6zZeVIDk4r3Q==}
 
   abbrev@1.1.1:
     resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==}
@@ -2324,8 +2324,8 @@ packages:
       '@types/react':
         optional: true
 
-  mermaid@11.8.0:
-    resolution: {integrity: sha512-uAZUwnBiqREZcUrFw3G5iQ5Pj3hTYUP95EZc3ec/nGBzHddJZydzYGE09tGZDBS1VoSoDn0symZ85FmypSTo5g==}
+  mermaid@11.8.1:
+    resolution: {integrity: sha512-VSXJLqP1Sqw5sGr273mhvpPRhXwE6NlmMSqBZQw+yZJoAJkOIPPn/uT3teeCBx60Fkt5zEI3FrH2eVT0jXRDzw==}
 
   micromark-core-commonmark@2.0.3:
     resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
@@ -3485,8 +3485,8 @@ packages:
   vite-plugin-javascript-obfuscator@3.1.0:
     resolution: {integrity: sha512-sf4JFlG1iUPl7bLXHGOy+bKWOQUFyXzJFWa+n2S2xMMvyfM+V9R40HhpZoIF1eAjifArM1SF7fbSFIaTuUIbPA==}
 
-  vite@7.0.2:
-    resolution: {integrity: sha512-hxdyZDY1CM6SNpKI4w4lcUc3Mtkd9ej4ECWVHSMrOdSinVc2zYOAppHeGc/hzmRo3pxM5blMzkuWHOJA/3NiFw==}
+  vite@7.0.4:
+    resolution: {integrity: sha512-SkaSguuS7nnmV7mfJ8l81JGBFV7Gvzp8IzgE8A8t23+AxuNX61Q5H1Tpz5efduSN7NHC8nQXD3sKQKZAu5mNEA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -4157,9 +4157,9 @@ snapshots:
 
   '@kurkle/color@0.3.4': {}
 
-  '@lightenna/react-mermaid-diagram@1.0.21(mermaid@11.8.0)(react@18.3.1)':
+  '@lightenna/react-mermaid-diagram@1.0.21(mermaid@11.8.1)(react@18.3.1)':
     dependencies:
-      mermaid: 11.8.0
+      mermaid: 11.8.1
       react: 18.3.1
 
   '@mapbox/node-pre-gyp@1.0.11':
@@ -4178,7 +4178,7 @@ snapshots:
       - supports-color
     optional: true
 
-  '@mermaid-js/parser@0.6.0':
+  '@mermaid-js/parser@0.6.1':
     dependencies:
       langium: 3.3.1
 
@@ -4620,11 +4620,11 @@ snapshots:
 
   '@ungap/structured-clone@1.3.0': {}
 
-  '@vitejs/plugin-react-swc@3.10.2(vite@7.0.2(sass@1.89.2))':
+  '@vitejs/plugin-react-swc@3.10.2(vite@7.0.4(sass@1.89.2))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-beta.11
       '@swc/core': 1.12.9
-      vite: 7.0.2(sass@1.89.2)
+      vite: 7.0.4(sass@1.89.2)
     transitivePeerDependencies:
       - '@swc/helpers'
 
@@ -4636,13 +4636,13 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@7.0.2(sass@1.89.2))':
+  '@vitest/mocker@3.2.4(vite@7.0.4(sass@1.89.2))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 7.0.2(sass@1.89.2)
+      vite: 7.0.4(sass@1.89.2)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -4670,9 +4670,9 @@ snapshots:
       loupe: 3.1.4
       tinyrainbow: 2.0.0
 
-  '@xyflow/react@12.8.1(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
+  '@xyflow/react@12.8.2(@types/react@18.3.23)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)':
     dependencies:
-      '@xyflow/system': 0.0.65
+      '@xyflow/system': 0.0.66
       classcat: 5.0.5
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
@@ -4681,7 +4681,7 @@ snapshots:
       - '@types/react'
       - immer
 
-  '@xyflow/system@0.0.65':
+  '@xyflow/system@0.0.66':
     dependencies:
       '@types/d3-drag': 3.0.7
       '@types/d3-interpolate': 3.0.4
@@ -6235,11 +6235,11 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.23
 
-  mermaid@11.8.0:
+  mermaid@11.8.1:
     dependencies:
       '@braintree/sanitize-url': 7.1.1
       '@iconify/utils': 2.3.0
-      '@mermaid-js/parser': 0.6.0
+      '@mermaid-js/parser': 0.6.1
       '@types/d3': 7.4.3
       cytoscape: 3.32.0
       cytoscape-cose-bilkent: 4.1.0(cytoscape@3.32.0)
@@ -6744,7 +6744,7 @@ snapshots:
     dependencies:
       '@babel/runtime': 7.27.6
       '@rc-component/mini-decimal': 1.1.0
-      classnames: 2.3.2
+      classnames: 2.5.1
       rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
@@ -6841,7 +6841,7 @@ snapshots:
   rc-progress@3.4.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
     dependencies:
       '@babel/runtime': 7.27.6
-      classnames: 2.3.2
+      classnames: 2.5.1
       rc-util: 5.44.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
       react: 18.3.1
       react-dom: 18.3.1(react@18.3.1)
@@ -7671,7 +7671,7 @@ snapshots:
       debug: 4.4.1
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.0.2(sass@1.89.2)
+      vite: 7.0.4(sass@1.89.2)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -7691,7 +7691,7 @@ snapshots:
       anymatch: 3.1.3
       javascript-obfuscator: 4.1.1
 
-  vite@7.0.2(sass@1.89.2):
+  vite@7.0.4(sass@1.89.2):
     dependencies:
       esbuild: 0.25.5
       fdir: 6.4.6(picomatch@4.0.2)
@@ -7707,7 +7707,7 @@ snapshots:
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.0.2(sass@1.89.2))
+      '@vitest/mocker': 3.2.4(vite@7.0.4(sass@1.89.2))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -7725,7 +7725,7 @@ snapshots:
       tinyglobby: 0.2.14
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 7.0.2(sass@1.89.2)
+      vite: 7.0.4(sass@1.89.2)
       vite-node: 3.2.4(sass@1.89.2)
       why-is-node-running: 2.3.0
     optionalDependencies:

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

@@ -1,5 +1,6 @@
 import {type Connection, type Edge, getOutgoers, type Node} from '@xyflow/react'
-import {find, isEmpty, isEqual, lpad, toStr} from 'licia'
+import {find, has, isEmpty, isEqual, lpad, toStr} from 'licia'
+import {NodeRegistryMap} from './NodeRegistry.tsx'
 
 export class CheckError extends Error {
   readonly id: string
@@ -19,14 +20,28 @@ export class CheckError extends Error {
 
 const getNodeById = (id: string, nodes: Node[]) => find(nodes, (n: Node) => isEqual(n.id, id))
 
+export const typeNotFound = (type: string) => new CheckError(100, `类型 ${type} 不存在`)
+export const addNodeError = (message?: string) => new CheckError(101, message ?? '无法添加节点')
+
 // @ts-ignore
-export const checkAddNode: (type: string, nodes: Node[], edges: Edge[]) => void = (type, nodes, edges) => {
+export const checkAddNode: (type: string, parentId: string | undefined, nodes: Node[], edges: Edge[]) => void = (type, parentId, nodes, edges) => {
+  let nodeDefine = NodeRegistryMap[type]
+  if (!nodeDefine) {
+    throw typeNotFound(type)
+  }
+  for (const checker of nodeDefine.checkers.add) {
+    let checkResult = checker(type, parentId, nodes, edges, undefined)
+    if (checkResult.error) {
+      throw addNodeError(checkResult.message)
+    }
+  }
 }
 
 export const sourceNodeNotFoundError = () => new CheckError(200, '连线起始节点未找到')
 export const targetNodeNotFoundError = () => new CheckError(201, '连线目标节点未找到')
 export const nodeToSelfError = () => new CheckError(203, '节点不能直连自身')
 export const hasCycleError = () => new CheckError(204, '禁止流程循环')
+export const differentParent = () => new CheckError(205, '子流程禁止连接外部节点')
 
 const hasCycle = (sourceNode: Node, targetNode: Node, nodes: Node[], edges: Edge[], visited = new Set<string>()) => {
   if (visited.has(targetNode.id)) return false
@@ -47,6 +62,10 @@ export const checkAddConnection: (connection: Connection, nodes: Node[], edges:
     throw targetNodeNotFoundError()
   }
 
+  if (!isEqual(sourceNode.parentId, targetNode.parentId)) {
+    throw differentParent()
+  }
+
   // 禁止流程出现环，必须是有向无环图
   if (isEqual(sourceNode.id, targetNode.id)) {
     throw nodeToSelfError()
@@ -63,6 +82,8 @@ export const checkAddConnection: (connection: Connection, nodes: Node[], edges:
 
 export const atLeastOneNode = () => new CheckError(300, '至少包含一个节点')
 export const hasUnfinishedNode = (nodeId: string) => new CheckError(301, `存在尚未配置完成的节点: ${nodeId}`)
+export const nodeTypeNotFound = () => new CheckError(302, '节点类型不存在')
+export const saveNodeError = (nodeId: string, reason?: string) => new CheckError(303, reason ?? `节点配置存在错误：${nodeId}`)
 
 // @ts-ignore
 export const checkSave: (nodes: Node[], edges: Edge[], data: any) => void = (nodes, edges, data) => {
@@ -71,8 +92,20 @@ export const checkSave: (nodes: Node[], edges: Edge[], data: any) => void = (nod
   }
 
   for (let node of nodes) {
-    if (!data[node.id] || !data[node.id]?.finished) {
+    if (!has(data, node.id) || !data[node.id]?.finished) {
       throw hasUnfinishedNode(node.id)
     }
+
+    if (!has(node, 'type')) {
+      throw nodeTypeNotFound()
+    }
+    let nodeType = node.type!
+    let nodeDefine = NodeRegistryMap[nodeType]
+    for (let checker of nodeDefine.checkers.save) {
+      let checkResult = checker(node.id, node.parentId, nodes, edges, data)
+      if (checkResult.error) {
+        throw saveNodeError(node.id, checkResult.message)
+      }
+    }
   }
 }

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

@@ -1,36 +1,21 @@
-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, Popconfirm, Space} from 'antd'
-import {arrToMap, find, isEqual, isNil, randomId} from 'licia'
-import {type JSX, type MemoExoticComponent, useEffect, useState} from 'react'
+import {RollbackOutlined, SaveFilled} from '@ant-design/icons'
+import {Background, BackgroundVariant, Controls, MiniMap, Panel, ReactFlow} from '@xyflow/react'
+import {Button, message, Popconfirm, Space} from 'antd'
+import {arrToMap} from 'licia'
+import {useEffect} from 'react'
 import {useNavigate} from 'react-router'
 import styled from 'styled-components'
 import '@xyflow/react/dist/style.css'
-import {useShallow} from 'zustand/react/shallow'
-import {amisRender, commonInfo, horizontalFormOptions} from '../../util/amis.tsx'
-import {checkAddConnection, checkAddNode, checkSave} from './FlowChecker.tsx'
-import CodeNode from './node/CodeNode.tsx'
-import KnowledgeNode from './node/KnowledgeNode.tsx'
-import LlmNode from './node/LlmNode.tsx'
-import OutputNode from './node/OutputNode.tsx'
-import SwitchNode from './node/SwitchNode.tsx'
-import {useContextStore} from './store/ContextStore.ts'
+import {commonInfo} from '../../util/amis.tsx'
+import AddNodeButton from './component/AddNodeButton.tsx'
+import {checkAddConnection, checkSave} from './FlowChecker.tsx'
+import {useNodeDrag} from './Helper.tsx'
+import {NodeRegistryMap} from './NodeRegistry.tsx'
 import {useDataStore} from './store/DataStore.ts'
 import {useFlowStore} from './store/FlowStore.ts'
+import {flowDotColor, type FlowEditorProps} from './types.ts'
 
 const FlowableDiv = styled.div`
-    height: 100%;
-
     .react-flow__node.selectable {
         &:focus {
             box-shadow: 0 0 20px 1px #e8e8e8;
@@ -50,13 +35,6 @@ const FlowableDiv = styled.div`
         }
     }
 
-    .toolbar {
-        position: absolute;
-        right: 20px;
-        top: 20px;
-        z-index: 10;
-    }
-
     .node-card {
         cursor: default;
 
@@ -65,167 +43,19 @@ const FlowableDiv = styled.div`
     }
 `
 
-export type GraphData = { nodes: Node[], edges: Edge[], data: any }
-
-export type FlowEditorProps = {
-  inputSchema: Record<string, Record<string, any>>,
-  graphData: GraphData,
-  onGraphDataChange: (graphData: GraphData) => void,
-}
-
 function FlowEditor(props: FlowEditorProps) {
   const navigate = useNavigate()
-  const [messageApi, contextHolder] = message.useMessage()
-  const [nodeDef] = useState<{
-    key: string,
-    name: string,
-    component: MemoExoticComponent<(props: NodeProps) => JSX.Element>
-  }[]>([
-    {
-      key: 'output-node',
-      name: '输出',
-      component: OutputNode,
-    },
-    {
-      key: 'llm-node',
-      name: '大模型',
-      component: LlmNode,
-    },
-    {
-      key: 'knowledge-node',
-      name: '知识库',
-      component: KnowledgeNode,
-    },
-    {
-      key: 'code-node',
-      name: '代码执行',
-      component: CodeNode,
-    },
-    {
-      key: 'switch-node',
-      name: '条件分支',
-      component: SwitchNode,
-    },
-  ])
-  const [open, setOpen] = useState(false)
 
-  const {data, setData, getDataById, setDataById} = useDataStore(
-    useShallow(state => ({
-      data: state.data,
-      setData: state.setData,
-      getDataById: state.getDataById,
-      setDataById: state.setDataById,
-    })),
-  )
+  const {data, setData} = useDataStore()
   const {
     nodes,
-    addNode,
     setNodes,
     onNodesChange,
     edges,
     setEdges,
     onEdgesChange,
     onConnect,
-  } = useFlowStore(
-    useShallow(state => ({
-      nodes: state.nodes,
-      getNodes: state.getNodes,
-      addNode: state.addNode,
-      removeNode: state.removeNode,
-      setNodes: state.setNodes,
-      onNodesChange: state.onNodesChange,
-      edges: state.edges,
-      getEdges: state.getEdges,
-      setEdges: state.setEdges,
-      onEdgesChange: state.onEdgesChange,
-      onConnect: state.onConnect,
-    })),
-  )
-
-  const {
-    setInputSchema,
-  } = useContextStore()
-
-  const [currentNodeForm, setCurrentNodeForm] = useState<JSX.Element>()
-  const editNode = (id: string, columnSchema?: Schema[]) => {
-    if (!isNil(columnSchema)) {
-      setCurrentNodeForm(
-        amisRender(
-          {
-            type: 'wrapper',
-            size: 'none',
-            body: [
-              {
-                debug: commonInfo.debug,
-                type: 'form',
-                ...horizontalFormOptions(),
-                wrapWithPanel: false,
-                onEvent: {
-                  submitSucc: {
-                    actions: [
-                      {
-                        actionType: 'custom',
-                        // @ts-ignore
-                        script: (context, action, event) => {
-                          setDataById(
-                            id,
-                            {
-                              ...context.props.data,
-                              finished: true,
-                            },
-                          )
-                          setOpen(false)
-                        },
-                      },
-                    ],
-                  },
-                },
-                body: [
-                  ...(columnSchema ?? []),
-                  {
-                    type: 'wrapper',
-                    size: 'none',
-                    className: 'space-x-2 text-right',
-                    body: [
-                      {
-                        type: 'action',
-                        label: '取消',
-                        onEvent: {
-                          click: {
-                            actions: [
-                              {
-                                actionType: 'custom',
-                                // @ts-ignore
-                                script: (context, action, event) => {
-                                  setOpen(false)
-                                },
-                              },
-                            ],
-                          },
-                        },
-                      },
-                      {
-                        type: 'submit',
-                        label: '保存',
-                        level: 'primary',
-                      },
-                    ],
-                  },
-                ],
-              },
-            ],
-          },
-          getDataById(id),
-        ),
-      )
-      setOpen(true)
-    }
-  }
-
-  // 用于透传node操作到主流程
-  const initialNodeHandlers = {
-    editNode,
-  }
+  } = useFlowStore()
 
   useEffect(() => {
     // language=JSON
@@ -236,84 +66,21 @@ function FlowEditor(props: FlowEditorProps) {
 
     let initialNodeData = props.graphData?.data ?? {}
     setData(initialNodeData)
-
-    for (let node of initialNodes) {
-      node.data = initialNodeHandlers
-    }
     setNodes(initialNodes)
     setEdges(initialEdges)
 
-    setInputSchema(props.inputSchema)
   }, [props.graphData])
 
+  const {
+    onNodeDragStart,
+    onNodeDrag,
+    onNodeDragEnd,
+  } = useNodeDrag([props.graphData])
+
   return (
-    <FlowableDiv>
-      {contextHolder}
-      <Space className="toolbar">
-        <Dropdown
-          menu={{
-            items: nodeDef.map(def => ({key: def.key, label: def.name})),
-            onClick: ({key}) => {
-              try {
-                if (commonInfo.debug) {
-                  console.info('Add', key, JSON.stringify({nodes, edges, data}))
-                }
-                checkAddNode(key, nodes, edges)
-                addNode({
-                  id: randomId(10),
-                  type: key,
-                  position: {x: 100, y: 100},
-                  data: initialNodeHandlers,
-                })
-              } catch (e) {
-                // @ts-ignore
-                messageApi.error(e.toString())
-              }
-            },
-          }}
-        >
-          <Button type="default">
-            <PlusCircleFilled/>
-            新增节点
-          </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)
-            props.onGraphDataChange({nodes, edges, data})
-          } catch (e) {
-            // @ts-ignore
-            messageApi.error(e.toString())
-          }
-        }}>
-          <SaveFilled/>
-          保存
-        </Button>
-      </Space>
-      <Drawer
-        title="节点编辑"
-        open={open}
-        closeIcon={false}
-        maskClosable={false}
-        destroyOnHidden
-        size="large"
-      >
-        {currentNodeForm}
-      </Drawer>
+    <FlowableDiv className="h-full w-full">
       <ReactFlow
+        className="rounded-xl"
         nodes={nodes}
         edges={edges}
         onNodesChange={onNodesChange}
@@ -327,18 +94,55 @@ function FlowEditor(props: FlowEditorProps) {
             onConnect(connection)
           } catch (e) {
             // @ts-ignore
-            messageApi.error(e.toString())
+            message.error(e.toString())
           }
         }}
         // @ts-ignore
-        nodeTypes={arrToMap(
-          nodeDef.map(def => def.key),
-          key => find(nodeDef, def => isEqual(key, def.key))!.component)
-        }
+        nodeTypes={arrToMap(Object.keys(NodeRegistryMap), key => NodeRegistryMap[key]!.component)}
+        onNodeDragStart={onNodeDragStart}
+        onNodeDrag={onNodeDrag}
+        onNodeDragStop={onNodeDragEnd}
+        onEdgesDelete={() => console.info('delete')}
+        fitView
       >
+        <Panel position="top-right">
+          <Space className="toolbar">
+            <AddNodeButton/>
+            <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)
+                props.onGraphDataChange({nodes, edges, data})
+              } catch (e) {
+                // @ts-ignore
+                message.error(e.toString())
+              }
+            }}>
+              <SaveFilled/>
+              保存
+            </Button>
+          </Space>
+        </Panel>
         <Controls/>
         <MiniMap/>
-        <Background variant={BackgroundVariant.Cross} gap={20} size={3}/>
+        <Background
+          variant={BackgroundVariant.Cross}
+          gap={20}
+          size={3}
+          color={flowDotColor}
+        />
       </ReactFlow>
     </FlowableDiv>
   )

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

@@ -0,0 +1,206 @@
+import {type Edge, getIncomers, type Node} from '@xyflow/react'
+import type {Option} from 'amis/lib/Schema'
+import {contain, find, has, isEqual, max, min, unique} from 'licia'
+import {type DependencyList, type MouseEvent as ReactMouseEvent, useCallback, useRef} from 'react'
+import Queue from 'yocto-queue'
+import {useFlowStore} from './store/FlowStore.ts'
+import {type OutputVariable, type OutputVariableType} from './types.ts'
+
+export const getAllIncomerNodeById: (id: string, nodes: Node[], edges: Edge[]) => string[] = (id, nodes, edges) => {
+  let queue = new Queue<Node>()
+  queue.enqueue(find(nodes, node => isEqual(node.id, id))!)
+  let result: string[] = []
+  while (queue.size !== 0) {
+    let currentNode = queue.dequeue()!
+    for (const incomer of getIncomers(currentNode, nodes, edges)) {
+      result.push(incomer.id)
+      queue.enqueue(incomer)
+    }
+  }
+  return unique(result, (a, b) => isEqual(a, b))
+}
+
+export const getAllIncomerNodeOutputVariables: (id: string, nodes: Node[], edges: Edge[], data: any) => OutputVariable[] = (id, nodes, edges, data) => {
+  let currentNode = find(nodes, n => isEqual(id, n.id))
+  if (!currentNode) {
+    return []
+  }
+
+  let incomerIds = getAllIncomerNodeById(id, nodes, edges)
+  if (currentNode.parentId) {
+    incomerIds = [
+      ...incomerIds,
+      ...getAllIncomerNodeById(currentNode.parentId, nodes, edges),
+    ]
+  }
+
+  let incomerVariables: OutputVariable[] = []
+  for (const incomerId of incomerIds) {
+    let nodeData = data[incomerId] ?? {}
+    let group = incomerId
+    if (has(nodeData, 'node') && has(nodeData.node, 'name')) {
+      group = `${nodeData.node.name} ${incomerId}`
+    }
+    if (has(nodeData, 'outputs')) {
+      let outputs = nodeData?.outputs ?? {}
+      for (const key of Object.keys(outputs)) {
+        incomerVariables.push({
+          group: group,
+          name: key,
+          type: outputs[key].type,
+          variable: `${incomerId}.${key}`,
+        })
+      }
+    }
+  }
+
+  return [
+    ...(currentNode.parentId ? [
+      {
+        group: '循环入参',
+        name: 'loopIndex (当前迭代索引)',
+        type: 'number',
+        variable: 'loopIndex',
+      } as OutputVariable,
+      {
+        group: '循环入参',
+        name: 'loopItem (当前迭代对象)',
+        type: 'object',
+        variable: 'loopItem',
+      } as OutputVariable,
+    ] : []),
+    ...incomerVariables,
+  ]
+}
+
+export const generateAllIncomerOutputVariablesFormOptions: (id: string, nodes: Node[], edges: Edge[], data: any, targetTypes?: OutputVariableType[]) => Option[] = (id, nodes, edges, data, targetTypes) => {
+  let optionMap: Record<string, Option[]> = {}
+  for (const item of getAllIncomerNodeOutputVariables(id, nodes, edges, data)) {
+    if (targetTypes && !contain(targetTypes, item.type)) {
+      continue
+    }
+    if (!optionMap[item.group]) {
+      optionMap[item.group] = []
+    }
+    optionMap[item.group].push({
+      label: item.name,
+      value: item.variable,
+    })
+  }
+  return Object.keys(optionMap)
+    .map(key => ({
+      label: key,
+      children: optionMap[key],
+    }))
+}
+
+type ConditionOperator = string | { label: string, value: string }
+const textOperators: ConditionOperator[] = ['equal', 'not_equal', 'is_empty', 'is_not_empty', 'like', 'not_like', 'starts_with', 'ends_with']
+const textDefaultOperator: string = 'equal'
+const booleanOperators: ConditionOperator[] = ['equal', 'not_equal']
+const booleanDefaultOperator: string = 'equal'
+const numberOperators: ConditionOperator[] = [
+  'equal',
+  'not_equal',
+  {label: '大于', value: 'greater'},
+  {label: '大于或等于', value: 'greater_equal'},
+  {label: '小于', value: 'less'},
+  {label: '小于或等于', value: 'less_equal'},
+]
+const numberDefaultOperator: string = 'equal'
+const arrayOperators: ConditionOperator[] = ['is_empty', 'is_not_empty']
+const arrayDefaultOperator: string = 'is_empty'
+
+export const generateAllIncomerOutputVariablesConditions: (id: string, nodes: Node[], edges: Edge[], data: any) => Option[] = (id, nodes, edges, data) => {
+  let optionMap: Record<string, Option[]> = {}
+  for (const item of getAllIncomerNodeOutputVariables(id, nodes, edges, data)) {
+    if (!optionMap[item.group]) {
+      optionMap[item.group] = []
+    }
+    optionMap[item.group].push({
+      label: item.name,
+      type: 'custom',
+      name: item.variable,
+      ...(item.type === 'text' ? {
+        value: {
+          type: 'input-text',
+          required: true,
+          clearable: true,
+        },
+        defaultOp: textDefaultOperator,
+        operators: textOperators,
+      } : {}),
+      ...(item.type === 'boolean' ? {
+        value: {
+          type: 'select',
+          required: true,
+          selectFirst: true,
+          options: [
+            {label: '真', value: true},
+            {label: '假', value: false},
+          ],
+        },
+        defaultOp: booleanDefaultOperator,
+        operators: booleanOperators,
+      } : {}),
+      ...(item.type === 'number' ? {
+        value: {
+          type: 'input-number',
+          required: true,
+          clearable: true,
+        },
+        defaultOp: numberDefaultOperator,
+        operators: numberOperators,
+      } : {}),
+      ...((item.type === 'array-text' || item.type === 'array-object') ? {
+        defaultOp: arrayDefaultOperator,
+        operators: arrayOperators,
+      } : {}),
+    })
+  }
+  return Object.keys(optionMap)
+    .map(key => ({
+      label: key,
+      children: optionMap[key],
+    }))
+}
+
+// 处理循环节点的边界问题
+export const useNodeDrag = (deps: DependencyList) => {
+  const currentPosition = useRef({x: 0, y: 0} as { x: number, y: number })
+  const {setNode, getNodeById} = useFlowStore()
+
+  const onNodeDragStart = useCallback(() => {
+  }, deps)
+  const onNodeDrag = useCallback((event: ReactMouseEvent, node: Node) => {
+    event.stopPropagation()
+    if (node.parentId) {
+      let parentNode = getNodeById(node.parentId)
+      if (parentNode) {
+        let newPosition = {
+          x: max(min(node.position.x, (parentNode.measured?.width ?? 0) - (node.measured?.width ?? 0) - 28), 28),
+          y: max(min(node.position.y, (parentNode.measured?.height ?? 0) - (node.measured?.height ?? 0) - 28), 130),
+        }
+        setNode({
+          ...node,
+          position: newPosition,
+        })
+        currentPosition.current = newPosition
+      }
+    }
+  }, deps)
+  const onNodeDragEnd = useCallback((_event: ReactMouseEvent, node: Node) => {
+    if (node.parentId) {
+      setNode({
+        ...node,
+        position: currentPosition.current,
+      })
+    }
+  }, deps)
+
+  return {
+    onNodeDragStart,
+    onNodeDrag,
+    onNodeDragEnd,
+  }
+}

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

@@ -0,0 +1,159 @@
+import {has, isEmpty, isEqual} from 'licia'
+import {getAllIncomerNodeOutputVariables} from './Helper.tsx'
+import CodeNode from './node/CodeNode.tsx'
+import KnowledgeNode from './node/KnowledgeNode.tsx'
+import LlmNode from './node/LlmNode.tsx'
+import LoopNode from './node/LoopNode.tsx'
+import OutputNode from './node/OutputNode.tsx'
+import SwitchNode from './node/SwitchNode.tsx'
+import TemplateNode from './node/TemplateNode.tsx'
+import type {AddNodeChecker, NodeDefine, SaveNodeChecker} from './types.ts'
+import InputNode from './node/InputNode.tsx'
+
+const inputSingleVariableChecker: (field: string) => SaveNodeChecker = field => {
+  return (id, _parentId, nodes, edges, data) => {
+    let nodeData = data[id] ?? {}
+    if (has(nodeData, field)) {
+      let expression = nodeData?.[field] ?? ''
+      if (!isEmpty(expression)) {
+        let outputVariables = new Set(getAllIncomerNodeOutputVariables(id, nodes, edges, data).map(i => i.variable))
+        if (!outputVariables.has(expression)) {
+          return {
+            error: true,
+            message: `节点 ${id} 存在错误：变量 ${expression} 不存在`,
+          }
+        }
+      }
+    }
+    return {error: false}
+  }
+}
+
+const inputMultiVariableChecker: SaveNodeChecker = (id, _parentId, nodes, edges, data) => {
+  let nodeData = data[id] ?? {}
+  if (has(nodeData, 'inputs')) {
+    let inputs = nodeData?.inputs ?? {}
+    if (!isEmpty(inputs)) {
+      let outputVariables = new Set(getAllIncomerNodeOutputVariables(id, nodes, edges, data).map(i => i.variable))
+      for (const key of Object.keys(inputs)) {
+        let variable = inputs[key]?.variable ?? ''
+        if (!outputVariables.has(variable)) {
+          return {
+            error: true,
+            message: `节点 ${id} 存在错误：变量 ${variable} 不存在`,
+          }
+        }
+      }
+    }
+  }
+  return {error: false}
+}
+
+const noMoreThanOneNodeType: AddNodeChecker = (type, parentId, nodes) => {
+  return {
+    error: nodes.filter(n => isEqual(n.parentId, parentId) && isEqual(n.type, type)).length > 0,
+    message: `同一个流程（子流程）中类型为 ${type} 的节点至多有一个`
+  }
+}
+
+export const NodeRegistry: NodeDefine[] = [
+  {
+    key: 'llm-node',
+    group: '普通节点',
+    name: '大模型',
+    icon: <i className="fa fa-message"/>,
+    description: '使用大模型对话',
+    component: LlmNode,
+    checkers: {
+      add: [],
+      save: [inputMultiVariableChecker]
+    },
+  },
+  {
+    key: 'knowledge-node',
+    group: '普通节点',
+    name: '知识库',
+    icon: <i className="fa fa-book-bookmark"/>,
+    description: '',
+    component: KnowledgeNode,
+    checkers: {
+      add: [],
+      save: [inputMultiVariableChecker]
+    },
+  },
+  {
+    key: 'code-node',
+    group: '普通节点',
+    name: '代码执行',
+    icon: <i className="fa fa-code"/>,
+    description: '执行自定义的处理代码',
+    component: CodeNode,
+    checkers: {
+      add: [],
+      save: [inputMultiVariableChecker]
+    },
+  },
+  {
+    key: 'template-node',
+    group: '普通节点',
+    name: '模板替换',
+    icon: <i className="fa fa-pen-nib"/>,
+    description: '使用模板聚合转换变量表示',
+    component: TemplateNode,
+    checkers: {
+      add: [],
+      save: [inputMultiVariableChecker]
+    },
+  },
+  {
+    key: 'switch-node',
+    group: '逻辑节点',
+    name: '分支',
+    icon: <i className="fa fa-code-fork"/>,
+    description: '根据不同的情况前往不同的分支',
+    component: SwitchNode,
+    checkers: {
+      add: [],
+      save: [],
+    },
+  },
+  {
+    key: 'loop-node',
+    group: '逻辑节点',
+    name: '循环',
+    icon: <i className="fa fa-repeat"/>,
+    description: '实现循环执行流程',
+    component: LoopNode,
+    checkers: {
+      add: [],
+      save: [],
+    },
+  },
+  // 特殊节点特殊判断
+  {
+    key: 'input-node',
+    group: '数据节点',
+    name: '输入',
+    icon: <i className="fa fa-file"/>,
+    description: '定义流程输入变量',
+    component: InputNode,
+    checkers: {
+      add: [noMoreThanOneNodeType],
+      save: [],
+    },
+  },
+  {
+    key: 'output-node',
+    group: '数据节点',
+    name: '输出',
+    icon: <i className="fa fa-file"/>,
+    description: '定义流程输出变量',
+    component: OutputNode,
+    checkers: {
+      add: [noMoreThanOneNodeType],
+      save: [inputSingleVariableChecker('output')]
+    },
+  },
+]
+
+export const NodeRegistryMap: Record<string, NodeDefine> = NodeRegistry.reduce((a, v) => ({...a, [v.key]: v}), {})

service-web/client/src/components/flow/component/AddNodeButton.tsx

@@ -0,0 +1,78 @@
+import {PlusCircleFilled} from '@ant-design/icons'
+import {Button, Dropdown, message} from 'antd'
+import type {ButtonProps} from 'antd/lib'
+import {isEqual, randomId, unique} from 'licia'
+import {commonInfo} from '../../../util/amis.tsx'
+import {checkAddNode} from '../FlowChecker.tsx'
+import {NodeRegistry, NodeRegistryMap} from '../NodeRegistry.tsx'
+import {useDataStore} from '../store/DataStore.ts'
+import {useFlowStore} from '../store/FlowStore.ts'
+
+export type AddNodeButtonProps = ButtonProps & {
+  parent?: string
+  onlyIcon?: boolean
+}
+
+const AddNodeButton = (props: AddNodeButtonProps) => {
+  const {data, setDataById} = useDataStore()
+  const {nodes, addNode, edges} = useFlowStore()
+  return (
+    <Dropdown
+      menu={{
+        items: unique(NodeRegistry.map(i => i.group))
+          .map(group => ({
+            type: 'group',
+            label: group,
+            children: NodeRegistry
+              .filter(i => isEqual(group, i.group))
+              // 循环节点里不能再嵌套循环节点
+              .filter(i => !props.parent || (props.parent && !isEqual(i.key, 'loop-node')))
+              .map(i => ({key: i.key, label: i.name, icon: i.icon})),
+          })),
+        onClick: ({key}) => {
+          try {
+            if (commonInfo.debug) {
+              console.info('Add', key, JSON.stringify({nodes, edges, data}))
+            }
+            checkAddNode(key, props.parent, nodes, edges)
+
+            let nodeId = randomId(10, 'qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM')
+            let define = NodeRegistryMap[key]
+
+            setDataById(
+              nodeId,
+              {
+                node: {
+                  name: define.name,
+                  description: define.description,
+                },
+              },
+            )
+
+            addNode({
+              id: nodeId,
+              type: key,
+              position: {x: 50, y: 130},
+              data: {},
+              // 如果是循环节点就将节点加入到循环节点中
+              ...(props.parent ? {
+                parentId: props.parent,
+                extent: 'parent',
+              } : {}),
+            })
+          } catch (e) {
+            // @ts-ignore
+            message.error(e.toString())
+          }
+        },
+      }}
+    >
+      <Button {...props}>
+        <PlusCircleFilled/>
+        {props.onlyIcon ? undefined : '新增节点'}
+      </Button>
+    </Dropdown>
+  )
+}
+
+export default AddNodeButton

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

@@ -1,33 +1,21 @@
 import {CopyFilled, DeleteFilled, EditFilled} from '@ant-design/icons'
-import {Handle, type HandleProps, type Node, type NodeProps, Position, useNodeConnections} from '@xyflow/react'
-import type {Schema} from 'amis'
-import {Button, Card} from 'antd'
-import {has, isEmpty, isEqual, isNil} from 'licia'
-import {type JSX} from 'react'
+import {type Edge, Handle, type Node, type NodeProps, NodeResizeControl, NodeToolbar, Position} from '@xyflow/react'
+import {type ClassName, classnames, type Schema} from 'amis'
+import {Button, Drawer, Space, Tooltip} from 'antd'
+import {type CSSProperties, type JSX, useCallback, useState} from 'react'
 import styled from 'styled-components'
-import {horizontalFormOptions} from '../../../util/amis.tsx'
-import {useContextStore} from '../store/ContextStore.ts'
+import {amisRender, commonInfo, horizontalFormOptions} from '../../../util/amis.tsx'
+import {generateAllIncomerOutputVariablesFormOptions} from '../Helper.tsx'
 import {useDataStore} from '../store/DataStore.ts'
 import {useFlowStore} from '../store/FlowStore.ts'
+import {type FormSchema, OutputVariableTypeMap} from '../types.ts'
 
-export type AmisNodeType = 'normal' | 'start' | 'end'
-
-export function inputsFormColumns(props: ColumnsSchemaProps): Schema[] {
-  let incomers = props.getAllIncomerNodeById(props.nodeId)
-  let groups = []
-  for (const incomer of incomers) {
-    let data = props.getNodeDataById(incomer.id)
-    if (has(data, 'outputs')) {
-      let outputs = data?.outputs ?? []
-      groups.push({
-        label: incomer.id,
-        children: Object.keys(outputs).map(key => ({
-          value: `${incomer.id}.${key}`,
-          label: key,
-        })),
-      })
-    }
-  }
+export function inputsFormColumns(
+  nodeId: string,
+  nodes: Node[],
+  edges: Edge[],
+  data: any,
+): Schema[] {
   return [
     {
       type: 'input-kvs',
@@ -43,34 +31,29 @@ export function inputsFormColumns(props: ColumnsSchemaProps): Schema[] {
         {
           ...horizontalFormOptions(),
           type: 'select',
-          name: 'type',
+          name: 'variable',
           label: '变量',
           required: true,
           selectMode: 'group',
-          options: [
-            {
-              label: '流程参数',
-              children: Object.keys(props.inputSchema).map(key => ({
-                label: props.inputSchema[key]?.label ?? '',
-                value: key,
-              })),
-            },
-            ...groups,
-          ],
+          options: generateAllIncomerOutputVariablesFormOptions(
+            nodeId,
+            nodes,
+            edges,
+            data,
+          ),
         },
       ],
     },
   ]
 }
 
-export function outputsFormColumns(editable: boolean = false, required: boolean = false, preload?: any): Schema[] {
+export function outputsFormColumns(editable: boolean = false, required: boolean = false): Schema[] {
   return [
     {
       disabled: !editable,
       type: 'input-kvs',
       name: 'outputs',
       label: '输出变量',
-      value: preload,
       addButtonText: '新增输出',
       draggable: false,
       keyItem: {
@@ -86,119 +69,105 @@ export function outputsFormColumns(editable: boolean = false, required: boolean
           label: '参数',
           required: true,
           selectFirst: true,
-          options: [
-            {
-              label: '文本',
-              value: 'string',
-            },
-            {
-              label: '数字',
-              value: 'number',
-            },
-            {
-              label: '文本数组',
-              value: 'array-string',
-            },
-            {
-              label: '对象数组',
-              value: 'array-object',
-            },
-          ],
+          options: Object.keys(OutputVariableTypeMap).map(key => ({
+            // @ts-ignore
+            label: OutputVariableTypeMap[key],
+            value: key,
+          })),
         },
       ],
     },
   ]
 }
 
-export const LimitHandler = (props: HandleProps & { limit: number }) => {
-  const connections = useNodeConnections({
-    handleType: props.type,
-  })
-  return (
-    <Handle
-      {...props}
-      isConnectable={connections.length < props.limit}
-    />
-  )
-}
-
-type ColumnsSchemaProps = {
-  // getInputSchema: () => Record<string, Record<string, any>>,
-  inputSchema: Record<string, Record<string, any>>,
-  nodeId: string,
-  nodeData: any,
-  getNodeDataById: (id: string) => any,
-  getAllIncomerNodeById: (id: string) => Node[],
-}
-
 type AmisNodeProps = {
+  className: ClassName,
+  style?: CSSProperties,
   nodeProps: NodeProps
-  type: AmisNodeType
-  defaultNodeName: String
-  defaultNodeDescription?: String
-  extraNodeDescription?: (nodeData: any) => JSX.Element
-  handlers?: (nodeData: any) => JSX.Element
-  columnSchema?: (props: ColumnsSchemaProps) => Schema[]
+  extraNodeDescription?: JSX.Element
+  handler: JSX.Element
+  formSchema?: () => FormSchema,
+  resize?: { minWidth: number, minHeight: number }
 }
 
 const AmisNodeContainerDiv = styled.div`
-    .ant-card {
-        .ant-card-actions {
-            & > li {
-                margin: 0;
-            }
-        }
-    }
 `
 
-const AmisNode: (props: AmisNodeProps) => JSX.Element = ({
-  nodeProps,
-  type,
-  defaultNodeName,
-  defaultNodeDescription,
-  extraNodeDescription,
-  handlers,
-  columnSchema,
-}) => {
-  const {
-    removeNode,
-    getAllIncomerNodeById,
-  } = useFlowStore()
-  const {getDataById} = useDataStore()
-  const {inputSchema} = useContextStore()
+export const StartNodeHandler = () => {
+  return <Handle type="source" position={Position.Right} id="source"/>
+}
 
-  const {id, data} = nodeProps
-  const {editNode} = data
+export const EndNodeHandler = () => {
+  return <Handle type="target" position={Position.Left} id="target"/>
+}
+
+export const NormalNodeHandler = () => {
+  return (
+    <>
+      <StartNodeHandler/>
+      <EndNodeHandler/>
+    </>
+  )
+}
+
+export const nodeClassName = (name: string) => {
+  return `flow-node flow-node-${name}`
+}
+
+const AmisNode: (props: AmisNodeProps) => JSX.Element = ({
+  className,
+  style,
+  nodeProps,
+  extraNodeDescription,
+  handler,
+  formSchema,
+  resize,
+}) => {
+  const {removeNode} = useFlowStore()
+  const {getDataById, setDataById, removeDataById} = useDataStore()
+  const {id} = nodeProps
   // @ts-ignore
   const nodeData = getDataById(id)
-  const nodeName = isEmpty(nodeData?.node?.name) ? defaultNodeName : nodeData.node.name
-  const nodeDescription = isEmpty(nodeData?.node?.description) ? defaultNodeDescription : nodeData.node?.description
-  return (
-    <AmisNodeContainerDiv className="w-64">
-      <Card
-        className="node-card"
-        title={nodeName}
-        extra={<span className="text-gray-300 text-xs">{id}</span>}
-        size="small"
-        actions={[
-          <Button
-            className="text-secondary"
-            disabled
-            type="text"
-            size="small"
-            icon={<CopyFilled/>}
-            block
-          />,
-          <Button
-            className="text-secondary"
-            type="text"
-            size="small"
-            icon={<EditFilled/>}
-            block
-            // @ts-ignore
-            onClick={() => editNode(
-              id,
-              [
+  const nodeName = nodeData?.node?.name ?? ''
+  const nodeDescription = nodeData?.node?.description ?? ''
+
+  const [editDrawerOpen, setEditDrawerOpen] = useState(false)
+  const [editDrawerForm, setEditDrawerForm] = useState<JSX.Element>(<></>)
+  const onOpenEditDrawerClick = useCallback(() => {
+    const schema = formSchema?.()
+    setEditDrawerForm(
+      amisRender(
+        {
+          type: 'wrapper',
+          size: 'none',
+          body: [
+            {
+              debug: commonInfo.debug,
+              type: 'form',
+              ...horizontalFormOptions(),
+              wrapWithPanel: false,
+              onEvent: {
+                submitSucc: {
+                  actions: [
+                    {
+                      actionType: 'custom',
+                      // @ts-ignore
+                      script: (context, action, event) => {
+                        setDataById(
+                          id,
+                          {
+                            ...context.props.data,
+                            finished: true,
+                          },
+                        )
+                        setEditDrawerOpen(false)
+                      },
+                    },
+                  ],
+                },
+                ...(schema?.events ?? {})
+              },
+              body: [
                 {
                   type: 'input-text',
                   name: 'node.name',
@@ -214,41 +183,114 @@ const AmisNode: (props: AmisNodeProps) => JSX.Element = ({
                 {
                   type: 'divider',
                 },
-                ...(
-                  columnSchema?.({
-                    inputSchema,
-                    nodeId: id,
-                    nodeData,
-                    getNodeDataById: getDataById,
-                    getAllIncomerNodeById,
-                  }) ?? []
-                ),
+                ...(schema?.columns ?? []),
+                {
+                  type: 'wrapper',
+                  size: 'none',
+                  className: 'space-x-2 text-right',
+                  body: [
+                    {
+                      type: 'action',
+                      label: '取消',
+                      onEvent: {
+                        click: {
+                          actions: [
+                            {
+                              actionType: 'custom',
+                              // @ts-ignore
+                              script: (context, action, event) => {
+                                setEditDrawerOpen(false)
+                              },
+                            },
+                          ],
+                        },
+                      },
+                    },
+                    {
+                      type: 'submit',
+                      label: '保存',
+                      level: 'primary',
+                    },
+                  ],
+                },
               ],
-            )}
-          />,
-          <Button
-            className="text-secondary"
-            type="text"
-            size="small"
-            icon={<DeleteFilled/>}
-            block
-            onClick={() => removeNode(id)}
-          />,
-        ]}
+            },
+          ],
+        },
+        getDataById(id),
+      ),
+    )
+    setEditDrawerOpen(true)
+  }, [id])
+  const onRemoveClick = useCallback(() => {
+    removeNode(id)
+    removeDataById(id)
+  }, [])
+  return (
+    <AmisNodeContainerDiv className={classnames(className, 'w-64')} style={style}>
+      <Drawer
+        title="节点编辑"
+        open={editDrawerOpen}
+        closeIcon={false}
+        maskClosable={false}
+        destroyOnHidden
+        size="large"
       >
-        <div className="card-description p-2 text-secondary text-sm">
-          {nodeDescription}
-          {extraNodeDescription?.(nodeData)}
+        {editDrawerForm}
+      </Drawer>
+      <NodeToolbar>
+        <Space>
+          <Tooltip title="复制节点">
+            <Button
+              className="text-secondary"
+              disabled
+              type="text"
+              size="small"
+              icon={<CopyFilled/>}
+            />
+          </Tooltip>
+          <Tooltip title="编辑节点">
+            <Button
+              className="text-secondary"
+              type="text"
+              size="small"
+              icon={<EditFilled/>}
+              onClick={() => onOpenEditDrawerClick()}
+            />
+          </Tooltip>
+          <Tooltip title="删除节点">
+            <Button
+              className="text-secondary"
+              type="text"
+              size="small"
+              icon={<DeleteFilled/>}
+              onClick={() => onRemoveClick()}
+            />
+          </Tooltip>
+        </Space>
+      </NodeToolbar>
+      <div className="node-card h-full flex flex-col bg-white rounded-md border border-gray-100 border-solid">
+        <div
+          className="node-card-header items-center flex justify-between p-2 border-t-0 border-l-0 border-r-0 border-b border-gray-100 border-solid">
+          <span className="font-bold">{nodeName}</span>
+          <span className="text-gray-300 text-sm">{id}</span>
         </div>
-      </Card>
-      {isNil(handlers)
-        ? <>
-          {isEqual(type, 'start') || isEqual(type, 'normal')
-            ? <Handle type="source" position={Position.Right} id="source"/> : undefined}
-          {isEqual(type, 'end') || isEqual(type, 'normal')
-            ? <Handle type="target" position={Position.Left} id="target"/> : undefined}
-        </>
-        : handlers?.(nodeData)}
+        <div className="node-card-description flex flex-col flex-1 p-2 text-secondary text-sm">
+          <div className="node-card-description-node">
+            {nodeDescription}
+          </div>
+          <div className="node-card-description-extra flex-1 mt-1">
+            {extraNodeDescription}
+          </div>
+        </div>
+      </div>
+      {resize ? <>
+        <NodeResizeControl
+          minWidth={resize.minWidth}
+          minHeight={resize.minHeight}
+        />
+      </> : undefined}
+      {handler}
     </AmisNodeContainerDiv>
   )
 }

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

@@ -1,52 +1,72 @@
 import type {NodeProps} from '@xyflow/react'
-import AmisNode, {inputsFormColumns, outputsFormColumns} from './AmisNode.tsx'
-import React from 'react'
+import {Tag} from 'antd'
+import React, {useCallback, useMemo} from 'react'
+import {useDataStore} from '../store/DataStore.ts'
+import {useFlowStore} from '../store/FlowStore.ts'
+import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
+import type {FormSchema} from '../types.ts'
 
-const CodeNode = (props: NodeProps) => AmisNode({
-  nodeProps: props,
-  type: 'normal',
-  defaultNodeName: '代码执行',
-  defaultNodeDescription: '执行自定义的处理代码',
-  columnSchema: (props) => [
-    ...inputsFormColumns(props),
-    {
-      type: 'divider',
-    },
-    {
-      type: 'select',
-      name: 'type',
-      label: '代码类型',
-      required: true,
-      options: [
-        {
-          value: 'javascript',
-          label: 'JavaScript',
-        },
-        {
-          value: 'python',
-          label: 'Python',
-        },
-        {
-          value: 'lua',
-          label: 'Lua',
-        },
-      ],
-    },
-    {
-      type: 'editor',
-      required: true,
-      label: '代码内容',
-      name: 'content',
-      language: '${type}',
-      options: {
-        wordWrap: 'bounded',
+const languageMap: Record<string, string> = {
+  'javascript': 'Javascript',
+  'python': 'Python',
+  'Lua': 'lua',
+}
+
+const CodeNode = (props: NodeProps) => {
+  const {getNodes, getEdges} = useFlowStore()
+  const {getData, getDataById} = useDataStore()
+
+  const nodeData = getDataById(props.id)
+
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: [
+      ...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
+      {
+        type: 'divider',
       },
-    },
-    {
-      type: 'divider',
-    },
-    ...outputsFormColumns(true, true, {result: {type: 'string'}}),
-  ],
-})
+      {
+        type: 'select',
+        name: 'type',
+        label: '代码类型',
+        required: true,
+        selectFirst: true,
+        options: Object.keys(languageMap).map(key => ({label: languageMap[key], value: key})),
+      },
+      {
+        type: 'editor',
+        required: true,
+        label: '代码内容',
+        name: 'content',
+        language: '${type}',
+        options: {
+          wordWrap: 'bounded',
+        },
+      },
+      {
+        type: 'divider',
+      },
+      ...outputsFormColumns(true, false),
+    ]
+  }), [props.id])
+
+  const extraNodeDescription = useMemo(() => {
+    return nodeData?.type
+      ? <div className="mt-2 flex justify-between">
+        <span>代码类型</span>
+        <Tag className="m-0" color="blue">{languageMap[nodeData.type]}</Tag>
+      </div>
+      : <></>
+  }, [nodeData])
+
+  return (
+    <AmisNode
+      className={nodeClassName('code')}
+      nodeProps={props}
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
+      handler={<NormalNodeHandler/>}
+    />
+  )
+}
 
 export default React.memo(CodeNode)

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

@@ -0,0 +1,123 @@
+import type {NodeProps} from '@xyflow/react'
+import React, {useCallback} from 'react'
+import AmisNode, {nodeClassName, outputsFormColumns, StartNodeHandler} from './AmisNode.tsx'
+import {horizontalFormOptions} from '../../../util/amis.tsx'
+import {typeMap} from '../../../pages/ai/task/InputSchema.tsx'
+import type {FormSchema, OutputVariableType} from '../types.ts'
+import {isEmpty} from 'licia'
+
+const originTypeMap: Record<string, OutputVariableType> = {
+  text: 'text',
+  textarea: 'text',
+  number: 'number',
+  files: 'array-text',
+}
+
+const InputNode = (props: NodeProps) => {
+  const formSchema: () => FormSchema = useCallback(() => ({
+    events: {
+      change: {
+        actions: [
+          {
+            actionType: 'validate',
+          },
+          {
+            actionType: 'custom',
+            // @ts-ignore
+            script: (context, doAction, event) => {
+              let data = event?.data
+              console.log(data)
+              if (data && isEmpty(data?.validateResult?.error ?? undefined)) {
+                let inputs = data.validateResult?.payload?.inputs ?? {}
+                if (inputs) {
+                  let outputs: Record<string, { type: OutputVariableType }> = {}
+                  for (let key of Object.keys(inputs)) {
+                    outputs[key] = {
+                      type: originTypeMap[inputs[key].type],
+                    }
+                  }
+                  doAction({
+                    actionType: 'setValue',
+                    args: {
+                      value: {
+                        outputs
+                      },
+                    },
+                  })
+                }
+              }
+            },
+          },
+        ]
+      }
+    },
+    columns: [
+      {
+        type: 'input-kvs',
+        name: 'inputs',
+        label: '输入变量',
+        required: true,
+        addButtonText: '新增入参',
+        draggable: false,
+        keyItem: {
+          label: '参数名称',
+          ...horizontalFormOptions(),
+          validations: {
+            isAlphanumeric: true,
+          },
+        },
+        valueItems: [
+          {
+            ...horizontalFormOptions(),
+            type: 'input-text',
+            name: 'label',
+            required: true,
+            label: '中文名称',
+            clearValueOnEmpty: true,
+            clearable: true,
+          },
+          {
+            ...horizontalFormOptions(),
+            type: 'input-text',
+            name: 'description',
+            label: '参数描述',
+            clearValueOnEmpty: true,
+            clearable: true,
+          },
+          {
+            ...horizontalFormOptions(),
+            type: 'select',
+            name: 'type',
+            label: '参数类型',
+            required: true,
+            selectFirst: true,
+            options: Object.keys(typeMap).map(key => ({label: typeMap[key], value: key})),
+          },
+          {
+            ...horizontalFormOptions(),
+            type: 'switch',
+            name: 'required',
+            label: '是否必填',
+            required: true,
+            value: true,
+          },
+        ],
+      },
+      {
+        type: 'divider',
+      },
+      ...outputsFormColumns(false, false),
+    ]
+  }), [props.id])
+
+  return (
+    <AmisNode
+      className={nodeClassName('input')}
+      nodeProps={props}
+      formSchema={formSchema}
+      handler={<StartNodeHandler/>}
+    />
+  )
+}
+
+export default React.memo(InputNode)

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

@@ -1,66 +1,91 @@
 import type {NodeProps} from '@xyflow/react'
+import React, {useCallback, useEffect} from 'react'
 import {commonInfo} from '../../../util/amis.tsx'
-import AmisNode, {inputsFormColumns, outputsFormColumns} from './AmisNode.tsx'
-import React from 'react'
+import {useDataStore} from '../store/DataStore.ts'
+import {useFlowStore} from '../store/FlowStore.ts'
+import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
+import type {FormSchema} from '../types.ts'
 
-const KnowledgeNode = (props: NodeProps) => AmisNode({
-  nodeProps: props,
-  type: 'normal',
-  defaultNodeName: '知识库',
-  defaultNodeDescription: '查询知识库获取外部知识',
-  columnSchema: (props) => [
-    ...inputsFormColumns(props),
-    {
-      type: 'divider',
-    },
-    {
-      type: 'select',
-      name: 'knowledgeId',
-      label: '知识库',
-      required: true,
-      options: [],
-      source: {
-        method: 'get',
-        url: `${commonInfo.baseAiUrl}/knowledge/list`,
-        // @ts-ignore
-        adaptor: (payload, response, api, context) => {
-          return {
-            ...payload,
-            data: {
-              items: payload.data.items.map((item: any) => ({value: item['id'], label: item['name']})),
-            },
-          }
+const KnowledgeNode = (props: NodeProps) => {
+  const {getNodes, getEdges} = useFlowStore()
+  const {getData, mergeDataById} = useDataStore()
+
+  useEffect(() => {
+    mergeDataById(
+      props.id,
+      {
+        outputs: {
+          result: {
+            type: 'array-string',
+          },
         },
       },
-    },
-    {
-      type: 'input-text',
-      name: 'query',
-      label: '查询文本',
-      required: true,
-    },
-    {
-      type: 'input-range',
-      name: 'count',
-      label: '返回数量',
-      required: true,
-      value: 3,
-      max: 10,
-    },
-    {
-      type: 'input-range',
-      name: 'score',
-      label: '匹配阀值',
-      required: true,
-      value: 0.6,
-      max: 1,
-      step: 0.05,
-    },
-    {
-      type: 'divider',
-    },
-    ...outputsFormColumns(false, true, {result: {type: 'array-string'}}),
-  ],
-})
+    )
+  }, [props.id])
+
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: [
+      ...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
+      {
+        type: 'divider',
+      },
+      {
+        type: 'select',
+        name: 'knowledgeId',
+        label: '知识库',
+        required: true,
+        options: [],
+        source: {
+          method: 'get',
+          url: `${commonInfo.baseAiUrl}/knowledge/list`,
+          // @ts-ignore
+          adaptor: (payload, response, api, context) => {
+            return {
+              ...payload,
+              data: {
+                items: payload.data.items.map((item: any) => ({value: item['id'], label: item['name']})),
+              },
+            }
+          },
+        },
+      },
+      {
+        type: 'input-text',
+        name: 'query',
+        label: '查询文本',
+        required: true,
+      },
+      {
+        type: 'input-range',
+        name: 'count',
+        label: '返回数量',
+        required: true,
+        value: 3,
+        max: 10,
+      },
+      {
+        type: 'input-range',
+        name: 'score',
+        label: '匹配阀值',
+        required: true,
+        value: 0.6,
+        max: 1,
+        step: 0.05,
+      },
+      {
+        type: 'divider',
+      },
+      ...outputsFormColumns(false, true),
+    ]
+  }), [props.id])
+  return (
+    <AmisNode
+      className={nodeClassName('knowledge')}
+      nodeProps={props}
+      formSchema={formSchema}
+      handler={<NormalNodeHandler/>}
+    />
+  )
+}
 
 export default React.memo(KnowledgeNode)

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

@@ -1,51 +1,80 @@
 import type {NodeProps} from '@xyflow/react'
 import {Tag} from 'antd'
-import AmisNode, {inputsFormColumns, outputsFormColumns} from './AmisNode.tsx'
-import React from 'react'
+import React, {useCallback, useEffect, useMemo} from 'react'
+import {useDataStore} from '../store/DataStore.ts'
+import {useFlowStore} from '../store/FlowStore.ts'
+import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
+import type {FormSchema} from '../types.ts'
 
 const modelMap: Record<string, string> = {
   qwen3: 'Qwen3',
   deepseek: 'Deepseek',
 }
 
-const LlmNode = (props: NodeProps) => AmisNode({
-  nodeProps: props,
-  type: 'normal',
-  defaultNodeName: '大模型',
-  defaultNodeDescription: '使用大模型对话',
-  extraNodeDescription: nodeData => {
-    const model = nodeData?.model as string | undefined
-    return model
+const LlmNode = (props: NodeProps) => {
+  const {getNodes, getEdges} = useFlowStore()
+  const {getData, mergeDataById, getDataById} = useDataStore()
+
+  const nodeData = getDataById(props.id)
+
+  useEffect(() => {
+    mergeDataById(
+      props.id,
+      {
+        outputs: {
+          text: {
+            type: 'text',
+          },
+        },
+      },
+    )
+  }, [props.id])
+
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: [
+      ...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
+      {
+        type: 'divider',
+      },
+      {
+        type: 'select',
+        name: 'model',
+        label: '大模型',
+        required: true,
+        selectFirst: true,
+        options: Object.keys(modelMap).map(key => ({label: modelMap[key], value: key})),
+      },
+      {
+        type: 'textarea',
+        name: 'systemPrompt',
+        label: '系统提示词',
+        required: true,
+      },
+      {
+        type: 'divider',
+      },
+      ...outputsFormColumns(false, true),
+    ]
+  }), [props.id])
+
+  const extraNodeDescription = useMemo(() => {
+    return nodeData?.model
       ? <div className="mt-2 flex justify-between">
-        <span>大模型</span>
-        <Tag className="m-0" color="blue">{modelMap[model]}</Tag>
+        <span>模型名称</span>
+        <Tag className="m-0" color="blue">{modelMap[nodeData.model]}</Tag>
       </div>
       : <></>
-  },
-  columnSchema: (props) => [
-    ...inputsFormColumns(props),
-    {
-      type: 'divider',
-    },
-    {
-      type: 'select',
-      name: 'model',
-      label: '大模型',
-      required: true,
-      selectFirst: true,
-      options: Object.keys(modelMap).map(key => ({label: modelMap[key], value: key})),
-    },
-    {
-      type: 'textarea',
-      name: 'systemPrompt',
-      label: '系统提示词',
-      required: true,
-    },
-    {
-      type: 'divider',
-    },
-    ...outputsFormColumns(false, true, {text: {type: 'string'}}),
-  ],
-})
+  }, [nodeData])
+
+  return (
+    <AmisNode
+      className={nodeClassName('llm')}
+      nodeProps={props}
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
+      handler={<NormalNodeHandler/>}
+    />
+  )
+}
 
 export default React.memo(LlmNode)

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

@@ -0,0 +1,153 @@
+import {Background, BackgroundVariant, type NodeProps} from '@xyflow/react'
+import {classnames} from 'amis'
+import React, {useCallback, useEffect, useMemo} from 'react'
+import AddNodeButton from '../component/AddNodeButton.tsx'
+import {generateAllIncomerOutputVariablesFormOptions} from '../Helper.tsx'
+import {useDataStore} from '../store/DataStore.ts'
+import {useFlowStore} from '../store/FlowStore.ts'
+import {flowBackgroundColor, flowDotColor, type FormSchema} from '../types.ts'
+import AmisNode, {nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
+
+const LoopNode = (props: NodeProps) => {
+  const {getNodes, getEdges} = useFlowStore()
+  const {getData, mergeDataById} = useDataStore()
+
+  useEffect(() => {
+    mergeDataById(
+      props.id,
+      {
+        failFast: true,
+        parallel: false,
+        type: 'for',
+        count: 1,
+        outputs: {
+          output: {
+            type: 'array-object',
+          },
+        },
+      },
+    )
+  }, [props.id])
+
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: [
+      {
+        type: 'switch',
+        name: 'failFast',
+        label: '快速失败',
+        required: true,
+        description: '执行过程中一旦出现错误，及时中断循环任务的执行',
+      },
+      {
+        disabled: true,
+        type: 'switch',
+        name: 'parallel',
+        label: '并行执行',
+        required: true,
+      },
+      {
+        type: 'select',
+        name: 'type',
+        label: '循环模式',
+        required: true,
+        options: [
+          {
+            label: '次数循环',
+            value: 'for',
+          },
+          {
+            label: '次数循环 (引用变量)',
+            value: 'for-variable',
+          },
+          {
+            label: '对象循环',
+            value: 'for-object',
+          },
+        ],
+      },
+      {
+        visibleOn: '${type === \'for\'}',
+        type: 'input-number',
+        name: 'count',
+        label: '循环次数',
+        required: true,
+        min: 1,
+        precision: 0,
+      },
+      {
+        visibleOn: '${type === \'for-variable\'}',
+        type: 'select',
+        name: 'countVariable',
+        label: '循环次数',
+        required: true,
+        selectMode: 'group',
+        options: generateAllIncomerOutputVariablesFormOptions(
+          props.id,
+          getNodes(),
+          getEdges(),
+          getData(),
+          ['number'],
+        ),
+      },
+      {
+        visibleOn: '${type === \'for-object\'}',
+        type: 'select',
+        name: 'countObject',
+        label: '循环对象',
+        required: true,
+        selectMode: 'group',
+        options: generateAllIncomerOutputVariablesFormOptions(
+          props.id,
+          getNodes(),
+          getEdges(),
+          getData(),
+          ['array-text', 'array-object'],
+        ),
+      },
+      {
+        type: 'divider',
+      },
+      ...outputsFormColumns(false, true),
+    ]
+  }), [props.id])
+
+  const extraNodeDescription = useMemo(() => {
+    return (
+      <div className="nodrag relative w-full h-full" style={{minHeight: '211px'}}>
+        <Background
+          id={`loop-background-${props.id}`}
+          className="rounded-xl"
+          variant={BackgroundVariant.Cross}
+          gap={20}
+          size={3}
+          style={{
+            zIndex: 0,
+          }}
+          color={flowDotColor}
+          bgColor={flowBackgroundColor}
+        />
+        <AddNodeButton className="mt-2 ml-2" parent={props.id} onlyIcon/>
+      </div>
+    )
+  }, [props.id])
+
+  return (
+    <AmisNode
+      className={classnames('w-full', 'h-full', nodeClassName('loop'))}
+      style={{
+        minWidth: '350px',
+        minHeight: '290px',
+      }}
+      nodeProps={props}
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
+      handler={<NormalNodeHandler/>}
+      resize={{
+        minWidth: 350,
+        minHeight: 290,
+      }}
+    />
+  )
+}
+
+export default React.memo(LoopNode)

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

@@ -1,13 +1,26 @@
 import type {NodeProps} from '@xyflow/react'
-import AmisNode, {outputsFormColumns} from './AmisNode.tsx'
-import React from 'react'
+import React, {useCallback} from 'react'
+import {useDataStore} from '../store/DataStore.ts'
+import {useFlowStore} from '../store/FlowStore.ts'
+import type {FormSchema} from '../types.ts'
+import AmisNode, {EndNodeHandler, inputsFormColumns, nodeClassName} from './AmisNode.tsx'
 
-const OutputNode = (props: NodeProps) => AmisNode({
-  nodeProps: props,
-  type: 'end',
-  defaultNodeName: '输出节点',
-  defaultNodeDescription: '定义输出变量',
-  columnSchema: () => outputsFormColumns(true),
-})
+const OutputNode = (props: NodeProps) => {
+  const {getNodes, getEdges} = useFlowStore()
+  const {getData} = useDataStore()
+
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
+  }), [props.id])
+
+  return (
+    <AmisNode
+      className={nodeClassName('output')}
+      nodeProps={props}
+      formSchema={formSchema}
+      handler={<EndNodeHandler/>}
+    />
+  )
+}
 
 export default React.memo(OutputNode)

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

@@ -1,55 +1,97 @@
 import {Handle, type NodeProps, Position} from '@xyflow/react'
+import type {ConditionValue} from 'amis'
 import {Tag} from 'antd'
-import React from 'react'
-import AmisNode from './AmisNode.tsx'
+import {contain, isEqual} from 'licia'
+import React, {useCallback, useMemo} from 'react'
+import {generateAllIncomerOutputVariablesConditions} from '../Helper.tsx'
+import {useDataStore} from '../store/DataStore.ts'
+import {useFlowStore} from '../store/FlowStore.ts'
+import AmisNode, {nodeClassName} from './AmisNode.tsx'
+import type {FormSchema} from '../types.ts'
 
-const cases = [
-  {
-    index: 1,
-  },
-  {
-    index: 2,
-  },
-  {
-    index: 3,
-  },
-]
+const SwitchNode = (props: NodeProps) => {
+  const {getNodes, getEdges, removeEdges} = useFlowStore()
+  const {getData, getDataById} = useDataStore()
 
-const SwitchNode = (props: NodeProps) => AmisNode({
-  nodeProps: props,
-  type: 'normal',
-  defaultNodeName: '分支节点',
-  defaultNodeDescription: '根据不同的情况前往不同的分支',
-  columnSchema: () => [],
+  const nodeData = getDataById(props.id)
   // @ts-ignore
-  extraNodeDescription: nodeData => {
+  const conditions: ConditionValue[] = nodeData?.conditions?.map(c => c.condition) ?? []
+
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: [
+      {
+        type: 'combo',
+        name: 'conditions',
+        label: '分支',
+        multiple: true,
+        required: true,
+        items: [
+          {
+            type: 'condition-builder',
+            name: 'condition',
+            label: '条件',
+            required: true,
+            builderMode: 'simple',
+            showANDOR: true,
+            fields: generateAllIncomerOutputVariablesConditions(
+              props.id,
+              getNodes(),
+              getEdges(),
+              getData(),
+            ),
+          },
+        ],
+      },
+    ]
+  }), [props.id])
+
+  const extraNodeDescription = useMemo(() => {
     return (
       <div className="mt-2">
-        {cases.map(item => (
-          <div key={item.index} className="mt-1">
-            <Tag className="m-0" color="blue">分支 {item.index}</Tag>
+        {conditions.map((item, index) => (
+          <div key={item.id} className="mt-1">
+            <Tag className="m-0" color="blue">分支 {index + 1}</Tag>
           </div>
         ))}
       </div>
     )
-  },
-  // @ts-ignore
-  handlers: nodeData => {
+  }, [nodeData])
+
+  const handler = useMemo(() => {
+    // @ts-ignore
+    const conditions: ConditionValue[] = nodeData?.conditions?.map(c => c.condition) ?? []
+
+    // 移除不该存在的边
+    const conditionIds = conditions.map(c => c.id)
+    const removeEdgeIds = getEdges()
+      .filter(edge => isEqual(edge.source, props.id) && !contain(conditionIds, edge.sourceHandle))
+      .map(edge => edge.id)
+    removeEdges(removeEdgeIds)
     return (
       <>
         <Handle type="target" position={Position.Left}/>
-        {cases.map((item, index) => (
+        {conditions.map((item, index) => (
           <Handle
             type="source"
             position={Position.Right}
-            key={item.index}
-            id={`${item.index}`}
-            style={{top: 85 + (25 * index)}}
+            key={item.id}
+            id={item.id}
+            style={{top: 91 + (26 * index)}}
           />
         ))}
       </>
     )
-  },
-})
+  }, [nodeData])
+
+  return (
+    <AmisNode
+      className={nodeClassName('switch')}
+      nodeProps={props}
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
+      handler={handler}
+    />
+  )
+}
 
 export default React.memo(SwitchNode)

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

@@ -0,0 +1,94 @@
+import type {NodeProps} from '@xyflow/react'
+import {Tag} from 'antd'
+import React, {useCallback, useEffect, useMemo} from 'react'
+import {useDataStore} from '../store/DataStore.ts'
+import {useFlowStore} from '../store/FlowStore.ts'
+import AmisNode, {inputsFormColumns, nodeClassName, NormalNodeHandler, outputsFormColumns} from './AmisNode.tsx'
+import type {FormSchema} from '../types.ts'
+
+const typeMap: Record<string, string> = {
+  default: '默认',
+  json: 'JSON',
+  'template-markdown': 'Markdown',
+  'template-rich-text': '富文本',
+}
+
+const TemplateNode = (props: NodeProps) => {
+  const {getNodes, getEdges} = useFlowStore()
+  const {getData, getDataById, mergeDataById} = useDataStore()
+
+  const nodeData = getDataById(props.id)
+
+  useEffect(() => {
+    mergeDataById(
+      props.id,
+      {
+        outputs: {
+          text: {
+            type: 'text',
+          },
+        },
+      },
+    )
+  }, [props.id])
+
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: [
+      ...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
+      {
+        type: 'divider',
+      },
+      {
+        type: 'select',
+        name: 'type',
+        label: '模板类型',
+        required: true,
+        selectFirst: true,
+        options: Object.keys(typeMap).map(key => ({label: typeMap[key], value: key})),
+      },
+      {
+        visibleOn: 'type === \'template-markdown\'',
+        type: 'editor',
+        required: true,
+        label: '模板内容',
+        name: 'template',
+        language: 'markdown',
+        options: {
+          wordWrap: 'bounded',
+        },
+      },
+      {
+        visibleOn: 'type === \'template-rich-text\'',
+        type: 'input-rich-text',
+        required: true,
+        name: 'template',
+        label: '模板内容',
+        options: {
+          min_height: 500,
+        },
+      },
+      ...outputsFormColumns(false, true),
+    ]
+  }), [props.id])
+
+  const extraNodeDescription = useMemo(() => {
+    return nodeData?.type
+      ? <div className="mt-2 flex justify-between">
+        <span>模板类型</span>
+        <Tag className="m-0" color="blue">{typeMap[nodeData.type]}</Tag>
+      </div>
+      : <></>
+  }, [nodeData])
+
+  return (
+    <AmisNode
+      className={nodeClassName('template')}
+      nodeProps={props}
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
+      handler={<NormalNodeHandler/>}
+    />
+  )
+}
+
+export default React.memo(TemplateNode)

service-web/client/src/components/flow/store/ContextStore.ts

@@ -1,11 +0,0 @@
-import {create} from 'zustand/react'
-
-export type ContextStoreState = {
-  inputSchema: Record<string, Record<string, any>>,
-  setInputSchema: (inputSchema: Record<string, Record<string, any>>) => void,
-}
-
-export const useContextStore = create<ContextStoreState>((set) => ({
-  inputSchema: {},
-  setInputSchema: (inputSchema: Record<string, Record<string, any>>) => set({inputSchema}),
-}))

service-web/client/src/components/flow/store/DataStore.ts

@@ -1,14 +1,14 @@
 import {create} from 'zustand/react'
 
-export type DataStoreState = {
+export const useDataStore = create<{
   data: Record<string, any>,
   getData: () => Record<string, any>,
   setData: (data: Record<string, any>) => void,
   getDataById: (id: string) => any,
   setDataById: (id: string, data: any) => void,
-}
-
-export const useDataStore = create<DataStoreState>((set, get) => ({
+  mergeDataById: (id: string, data: any) => void,
+  removeDataById: (id: string) => void,
+}>((set, get) => ({
   data: {},
   getData: () => get().data,
   setData: (data) => set({
@@ -22,4 +22,21 @@ export const useDataStore = create<DataStoreState>((set, get) => ({
       data: updateData,
     })
   },
+  mergeDataById: (id, data) => {
+    let updateData = get().data
+    updateData[id] = {
+      ...(updateData[id] ?? {}),
+      ...data,
+    }
+    set({
+      data: updateData,
+    })
+  },
+  removeDataById: (id) => {
+    let data = get().data
+    delete data[id]
+    set({
+      data,
+    })
+  },
 }))

service-web/client/src/components/flow/store/FlowStore.ts

@@ -3,35 +3,33 @@ import {
   applyEdgeChanges,
   applyNodeChanges,
   type Edge,
-  getIncomers,
   type Node,
   type OnConnect,
   type OnEdgesChange,
   type OnNodesChange,
 } from '@xyflow/react'
-import {filter, find, isEqual, unique} from 'licia'
-import Queue from 'yocto-queue'
+import {contain, filter, find, isEqual} from 'licia'
 import {create} from 'zustand/react'
 
-export type FlowStoreState = {
+export const useFlowStore = create<{
   nodes: Node[],
   getNodes: () => Node[],
   onNodesChange: OnNodesChange,
   getNodeById: (id: string) => Node | undefined,
-  getAllIncomerNodeById: (id: string) => Node[],
   addNode: (node: Node) => void,
   removeNode: (id: string) => void,
   setNodes: (nodes: Node[]) => void,
+  setNode: (node: Node) => void,
 
   edges: Edge[],
   getEdges: () => Edge[],
   onEdgesChange: OnEdgesChange,
+  removeEdge: (id: string) => void,
+  removeEdges: (ids: string[]) => void,
   setEdges: (edges: Edge[]) => void,
 
   onConnect: OnConnect,
-}
-
-export const useFlowStore = create<FlowStoreState>((set, get) => ({
+}>((set, get) => ({
   nodes: [],
   getNodes: () => get().nodes,
   onNodesChange: changes => {
@@ -40,21 +38,6 @@ export const useFlowStore = create<FlowStoreState>((set, get) => ({
     })
   },
   getNodeById: (id: string) => find(get().nodes, node => isEqual(node.id, id)),
-  getAllIncomerNodeById: (id: string) => {
-    let nodes = get().nodes
-    let edges = get().edges
-    let queue = new Queue<Node>()
-    queue.enqueue(find(nodes, node => isEqual(node.id, id))!)
-    let result: Node[] = []
-    while (queue.size !== 0) {
-      let currentNode = queue.dequeue()!
-      for (const incomer of getIncomers(currentNode, nodes, edges)) {
-        result.push(incomer)
-        queue.enqueue(incomer)
-      }
-    }
-    return unique(result, (a, b) => isEqual(a.id, b.id))
-  },
   addNode: node => set({nodes: get().nodes.concat(node)}),
   removeNode: id => {
     set({
@@ -62,6 +45,16 @@ export const useFlowStore = create<FlowStoreState>((set, get) => ({
     })
   },
   setNodes: nodes => set({nodes}),
+  setNode: node => {
+    set({
+      nodes: get().nodes.map(n => {
+        if (isEqual(node.id, n.id)) {
+          return node
+        }
+        return n
+      }),
+    })
+  },
 
   edges: [],
   getEdges: () => get().edges,
@@ -70,6 +63,16 @@ export const useFlowStore = create<FlowStoreState>((set, get) => ({
       edges: applyEdgeChanges(changes, get().edges),
     })
   },
+  removeEdge: id => {
+    set({
+      edges: filter(get().edges, edge => !isEqual(edge.id, id)),
+    })
+  },
+  removeEdges: ids => {
+    set({
+      edges: filter(get().edges, edge => !contain(ids, edge.id)),
+    })
+  },
   setEdges: edges => set({edges}),
 
   onConnect: connection => {

service-web/client/src/components/flow/types.ts

@@ -0,0 +1,67 @@
+import type {Edge, Node} from '@xyflow/react'
+import type {JSX} from 'react'
+import type {ListenerAction, Schema} from 'amis'
+
+export const flowBackgroundColor = '#fafafa'
+export const flowDotColor = '#dedede'
+
+export type InputFormOptions = {
+  label: string
+  value: string
+}
+
+export type InputFormOptionsGroup = {
+  group: string,
+  variables: InputFormOptions[],
+}
+
+export type NodeError = {
+  error: boolean,
+  message?: string,
+}
+
+export type AddNodeChecker = (type: string, parentId: string | undefined, nodes: Node[], edges: Edge[], data: any) => NodeError
+export type SaveNodeChecker = (id: string, parentId: string | undefined, nodes: Node[], edges: Edge[], data: any) => NodeError
+
+export type GraphData = { nodes: Node[], edges: Edge[], data: any }
+
+export type FlowEditorProps = {
+  graphData: GraphData,
+  onGraphDataChange: (graphData: GraphData) => void,
+}
+
+export type OutputVariableType = 'text' | 'boolean' | 'number' | 'object' | 'array-text' | 'array-object'
+
+export const OutputVariableTypeMap: Record<OutputVariableType, string> = {
+  'text': '文本',
+  'boolean': '布尔值',
+  'number': '数字',
+  'object': '对象',
+  'array-text': '文本数组',
+  'array-object': '对象数组',
+}
+
+export type NodeDefine = {
+  key: string,
+  group: string,
+  name: string,
+  icon: JSX.Element,
+  description: string,
+  component: any,
+  checkers: {
+    add: AddNodeChecker[],
+    save: SaveNodeChecker[],
+  },
+}
+
+export type OutputVariable = {
+  group: string,
+  name: string | undefined,
+  type: OutputVariableType,
+  variable: string,
+}
+
+export type FormSchema = {
+  events?: Record<string, { actions: ListenerAction[] }>
+  columns: Schema[]
+}

service-web/client/src/pages/ai/Conversation.tsx

@@ -42,7 +42,6 @@ function Conversation() {
   const [input, setInput] = useState<string>('')
 
   useUnmount(() => {
-    console.log('Page Unmount')
     abortController.current?.abort()
   })
 

service-web/client/src/pages/ai/task/FlowTask.tsx

@@ -87,6 +87,7 @@ const FlowTask: React.FC = () => {
                   width: 200,
                   buttons: [
                     {
+                      visibleOn: 'hasInput',
                       type: 'action',
                       label: '查看',
                       level: 'link',
@@ -107,20 +108,21 @@ const FlowTask: React.FC = () => {
                                 return {
                                   ...payload,
                                   data: {
-                                    ...generateInputForm(payload.data, undefined, false, true),
+                                    ...generateInputForm(payload.data ?? {}, undefined, false, true),
                                     id: 'db8a4d10-0c47-4e27-b1a4-d0f2e1c15992',
                                     initApi: {
                                       method: 'get',
                                       url: `${commonInfo.baseAiUrl}/flow_task/input_data/\${id}`,
                                       // @ts-ignore
                                       adaptor: (payload, response, api, context) => {
+                                        console.log(payload)
                                         return {
                                           ...payload,
                                           data: {
-                                            inputData: payload.data,
-                                          }
+                                            inputData: payload.data ?? {},
+                                          },
                                         }
-                                      }
+                                      },
                                     },
                                     static: true,
                                   },
@@ -131,6 +133,14 @@ const FlowTask: React.FC = () => {
                         ],
                       },
                     },
+                    {
+                      type: 'action',
+                      label: '执行',
+                      level: 'link',
+                      size: 'sm',
+                      actionType: 'ajax',
+                      api: `get:${commonInfo.baseAiUrl}/flow_task/execute/\${id}`,
+                    },
                     {
                       type: 'action',
                       label: '删除',

service-web/client/src/pages/ai/task/FlowTaskAdd.tsx

@@ -49,7 +49,6 @@ const FlowTaskAdd: React.FC = () => {
                                 actionType: 'custom',
                                 // @ts-ignore
                                 script: (context, doAction, event) => {
-                                  console.log(event)
                                   let selectedIds = (event?.data?.selectedItems ?? []).map((item: any) => item.id)
                                   if (!isEmpty(selectedIds)) {
                                     doAction({
@@ -160,7 +159,7 @@ const FlowTaskAdd: React.FC = () => {
                                 input: '${inputData|default:undefined}',
                               }
                             },
-                            ...generateInputForm(payload.data, undefined, false),
+                            ...generateInputForm(payload.data ?? {}, undefined, false),
                           },
                         }
                       },

service-web/client/src/pages/ai/task/InputSchema.tsx

@@ -3,6 +3,7 @@ import {commonInfo, formInputFileStaticColumns} from '../../../util/amis.tsx'
 
 export const typeMap: Record<string, string> = {
   text: '文本',
+  textarea: '文本段',
   number: '数字',
   files: '文件',
 }
@@ -30,6 +31,12 @@ export const generateInputForm: (inputSchema: Record<string, InputField>, title?
           clearValueOnEmpty: true,
         })
         break
+      case 'textarea':
+        items.push({
+          ...commonMeta,
+          type: 'textarea',
+        })
+        break
       case 'number':
         commonMeta.type = 'input-number'
         break
@@ -42,7 +49,7 @@ export const generateInputForm: (inputSchema: Record<string, InputField>, title?
               type: 'crud',
               api: `${commonInfo.baseAiUrl}/upload/detail?ids=\${JOIN(inputData.${name}, ',')}`,
               columns: formInputFileStaticColumns,
-            }
+            },
           })
         } else {
           items.push({

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

@@ -1,9 +1,8 @@
-import {isEmpty, isEqual} from 'licia'
+import {isEqual} from 'licia'
 import React from 'react'
-import {useParams} from 'react-router'
+import {useNavigate, useParams} from 'react-router'
 import styled from 'styled-components'
 import {amisRender, commonInfo, horizontalFormOptions} from '../../../../util/amis.tsx'
-import {generateInputForm, typeMap} from '../InputSchema.tsx'
 
 const TemplateEditDiv = styled.div`
     .antd-EditorControl {
@@ -12,6 +11,7 @@ const TemplateEditDiv = styled.div`
 `
 
 const FlowTaskTemplateEdit: React.FC = () => {
+  const navigate = useNavigate()
   const {template_id} = useParams()
   const preloadTemplateId = isEqual(template_id, '-1') ? undefined : template_id
   return (
@@ -38,27 +38,13 @@ const FlowTaskTemplateEdit: React.FC = () => {
           wrapWithPanel: false,
           ...horizontalFormOptions(),
           onEvent: {
-            change: {
+            submitSucc: {
               actions: [
-                {
-                  actionType: 'validate',
-                },
                 {
                   actionType: 'custom',
                   // @ts-ignore
                   script: (context, doAction, event) => {
-                    let data = event?.data ?? {}
-                    let inputSchema = data.inputSchema ?? []
-                    if (!isEmpty(inputSchema) && isEmpty(data?.validateResult?.error ?? undefined)) {
-                      doAction({
-                        actionType: 'setValue',
-                        args: {
-                          value: {
-                            inputPreview: generateInputForm(inputSchema, '入参表单预览'),
-                          },
-                        },
-                      })
-                    }
+                    navigate(-1)
                   },
                 },
               ],
@@ -87,71 +73,6 @@ const FlowTaskTemplateEdit: React.FC = () => {
               maxLength: 500,
               showCounter: true,
             },
-            {
-              type: 'group',
-              body: [
-                {
-                  type: 'wrapper',
-                  size: 'none',
-                  body: [
-                    {
-                      type: 'input-kvs',
-                      name: 'inputSchema',
-                      label: '输入变量',
-                      addButtonText: '新增入参',
-                      draggable: false,
-                      keyItem: {
-                        label: '参数名称',
-                        ...horizontalFormOptions(),
-                        validations: {
-                          isAlphanumeric: true,
-                        },
-                      },
-                      valueItems: [
-                        {
-                          ...horizontalFormOptions(),
-                          type: 'input-text',
-                          name: 'label',
-                          required: true,
-                          label: '中文名称',
-                          clearValueOnEmpty: true,
-                          clearable: true,
-                        },
-                        {
-                          ...horizontalFormOptions(),
-                          type: 'input-text',
-                          name: 'description',
-                          label: '参数描述',
-                          clearValueOnEmpty: true,
-                          clearable: true,
-                        },
-                        {
-                          ...horizontalFormOptions(),
-                          type: 'select',
-                          name: 'type',
-                          label: '参数类型',
-                          required: true,
-                          selectFirst: true,
-                          options: Object.keys(typeMap).map(key => ({label: typeMap[key], value: key})),
-                        },
-                        {
-                          ...horizontalFormOptions(),
-                          type: 'switch',
-                          name: 'required',
-                          label: '是否必填',
-                          required: true,
-                          value: true,
-                        },
-                      ],
-                    },
-                  ],
-                },
-                {
-                  type: 'amis',
-                  name: 'inputPreview',
-                },
-              ],
-            },
             {
               type: 'button-toolbar',
               buttons: [

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

@@ -3,7 +3,8 @@ import axios from 'axios'
 import React, {useState} from 'react'
 import {useNavigate, useParams} from 'react-router'
 import styled from 'styled-components'
-import FlowEditor, {type GraphData} from '../../../../components/flow/FlowEditor.tsx'
+import FlowEditor from '../../../../components/flow/FlowEditor.tsx'
+import type {GraphData} from '../../../../components/flow/types.ts'
 import {commonInfo} from '../../../../util/amis.tsx'
 
 const FlowTaskTemplateFlowEditDiv = styled.div`
@@ -12,35 +13,32 @@ const FlowTaskTemplateFlowEditDiv = styled.div`
 const FlowTaskTemplateFlowEdit: React.FC = () => {
   const navigate = useNavigate()
   const {template_id} = useParams()
-  const [inputSchema, setInputSchema] = useState<Record<string, Record<string, any>>>({})
   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
-      }
+        headers: commonInfo.authorizationHeaders,
+      },
     )
-    setInputSchema(data?.data?.inputSchema)
     setGraphData(data?.data?.flowGraph)
   })
 
   return (
     <FlowTaskTemplateFlowEditDiv className="h-full w-full">
       <FlowEditor
-        inputSchema={inputSchema}
         graphData={graphData}
         onGraphDataChange={async data => {
           await axios.post(
             `${commonInfo.baseAiUrl}/flow_task/template/update_flow_graph`,
             {
               id: template_id,
-              graph: data
+              graph: data,
             },
             {
-              headers: commonInfo.authorizationHeaders
-            }
+              headers: commonInfo.authorizationHeaders,
+            },
           )
           navigate(-1)
         }}

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

@@ -1,4 +1,4 @@
-import {addRule, AlertComponent, attachmentAdpator, makeTranslator, render, type Schema, ToastComponent} from 'amis'
+import {AlertComponent, attachmentAdpator, makeTranslator, render, type Schema, ToastComponent} from 'amis'
 
 import 'amis/lib/themes/antd.css'
 import 'amis/lib/helper.css'