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/service-ai-web/pom.xml

@@ -86,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;
@@ -14,6 +16,7 @@ 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;
@@ -39,12 +42,18 @@ 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));
   }
 
@@ -63,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;
     };
   }
@@ -91,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);
     }
   }
@@ -104,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/FlowGraphRunner.java

@@ -1,5 +1,6 @@
 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;
@@ -44,7 +45,9 @@ public final class FlowGraphRunner {
     flowStore.init(flowGraph);
 
     for (FlowNode node : flowGraph.nodes()) {
-      executionQueue.offer(node);
+      if (ObjectUtil.isNull(node.parentId())) {
+        executionQueue.offer(node);
+      }
     }
     while (!executionQueue.isEmpty()) {
       var node = executionQueue.poll();
@@ -77,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

@@ -6,6 +6,7 @@ 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;
 
@@ -13,6 +14,7 @@ import org.eclipse.collections.api.map.ImmutableMap;
  * @author lanyuanxiaoyao
  * @version 20250711
  */
+@Slf4j
 public class FlowHelper {
   private static final TemplateEngine TEMPLATE_ENGINE = TemplateUtil.createEngine();
 
@@ -45,11 +47,6 @@ public class FlowHelper {
         throw new RuntimeException(StrUtil.format("Target node variable not found: {}.{}", targetNodeId, targetVariableName));
       }
       return targetNodeData.get(targetVariableName);
-    } else if (context.getInput().containsKey(expression)) {
-      if (!context.getInput().containsKey(expression)) {
-        throw new RuntimeException(StrUtil.format("Target variable not found in input {}", expression));
-      }
-      return context.getInput().get(expression);
     }
     return null;
   }

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/FlowContext.java

@@ -2,12 +2,10 @@ package com.lanyuanxiaoyao.service.ai.web.engine.entity;
 
 import lombok.Data;
 import org.eclipse.collections.api.factory.Maps;
-import org.eclipse.collections.api.map.ImmutableMap;
 import org.eclipse.collections.api.map.MutableMap;
 
 @Data
 public class FlowContext {
-  private ImmutableMap<String, Object> input = Maps.immutable.empty();
   private MutableMap<String, MutableMap<String, Object>> data = Maps.mutable.<String, MutableMap<String, Object>>empty().asSynchronized();
 
   public MutableMap<String, Object> get(String key) {

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

@@ -16,7 +16,6 @@ public class LlmNode extends FlowNodeRunner {
   @Override
   public void run() {
     var variableMap = FlowHelper.generateInputVariablesMap(getNodeId(), getContext());
-    log.info("Variable map: {}", variableMap);
     var sourcePrompt = (String) getData("systemPrompt");
     if (StrUtil.isNotBlank(sourcePrompt)) {
       var prompt = FlowHelper.renderTemplateText(sourcePrompt, variableMap.toMap());

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

@@ -10,10 +10,11 @@ import lombok.extern.slf4j.Slf4j;
  */
 @Slf4j
 public class OutputNode extends FlowNodeRunner {
+  private static final String KEY = "flow_outputs";
+
   @Override
   public void run() {
-    String expression = getData("output");
-    var targetVariable = FlowHelper.generateVariable(expression, getContext());
-    log.info("Target: {}", targetVariable);
+    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,26 +1,28 @@
 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.FlowEdge;
 import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowGraph;
-import com.lanyuanxiaoyao.service.ai.web.engine.entity.FlowNode;
+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 lombok.Data;
+import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.collections.api.factory.Maps;
-import org.eclipse.collections.api.map.MutableMap;
-import org.eclipse.collections.api.set.ImmutableSet;
 import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.stereotype.Service;
 
@@ -42,21 +44,23 @@ public class FlowTaskService extends SimpleServiceSupport<FlowTask> {
     var store = new InMemoryFlowStore();
     var executor = new FlowExecutor(
         store,
-        Maps.immutable.of(
-            "output-node", OutputNode.class,
-            "llm-node", LlmNode.class
-        )
+        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.setInput(mapper.readValue(flowTask.getInput(), new TypeReference<>() {}));
     context.setData(graphVo.getData());
+
+    if (ObjectUtil.isNotEmpty(flowTask.getInput())) {
+      context.getData().put(InputNode.KEY, mapper.readValue(flowTask.getInput(), new TypeReference<>() {
+      }));
+    }
+
     executor.execute(flowGraph, context);
   }
-
-  @Data
-  public static final 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/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/src/components/flow/FlowChecker.tsx

@@ -20,8 +20,21 @@ 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, '连线起始节点未找到')
@@ -70,18 +83,17 @@ 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 nodeError = (nodeId: string, reason?: string) => new CheckError(303, reason ?? `节点配置存在错误：${nodeId}`)
+export const saveNodeError = (nodeId: string, reason?: string) => new CheckError(303, reason ?? `节点配置存在错误：${nodeId}`)
 
 // @ts-ignore
-export const checkSave: (inputSchema: Record<string, Record<string, any>>, nodes: Node[], edges: Edge[], data: any) => void = (inputSchema, nodes, edges, data) => {
+export const checkSave: (nodes: Node[], edges: Edge[], data: any) => void = (nodes, edges, data) => {
   if (isEmpty(nodes)) {
     throw atLeastOneNode()
   }
 
   for (let node of nodes) {
-    let nodeId = node.id
-    if (!has(data, nodeId) || !data[nodeId]?.finished) {
-      throw hasUnfinishedNode(nodeId)
+    if (!has(data, node.id) || !data[node.id]?.finished) {
+      throw hasUnfinishedNode(node.id)
     }
 
     if (!has(node, 'type')) {
@@ -89,10 +101,10 @@ export const checkSave: (inputSchema: Record<string, Record<string, any>>, nodes
     }
     let nodeType = node.type!
     let nodeDefine = NodeRegistryMap[nodeType]
-    for (let checker of nodeDefine.checkers) {
-      let checkResult = checker(nodeId, inputSchema, nodes, edges, data)
+    for (let checker of nodeDefine.checkers.save) {
+      let checkResult = checker(node.id, node.parentId, nodes, edges, data)
       if (checkResult.error) {
-        throw nodeError(nodeId, checkResult.message)
+        throw saveNodeError(node.id, checkResult.message)
       }
     }
   }

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

@@ -1,16 +1,16 @@
-import {PlusCircleFilled, RollbackOutlined, SaveFilled} from '@ant-design/icons'
+import {RollbackOutlined, SaveFilled} from '@ant-design/icons'
 import {Background, BackgroundVariant, Controls, MiniMap, Panel, ReactFlow} from '@xyflow/react'
-import {Button, Dropdown, message, Popconfirm, Space} from 'antd'
-import {arrToMap, isEqual, randomId, unique} from 'licia'
+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 {commonInfo} from '../../util/amis.tsx'
-import {checkAddConnection, checkAddNode, checkSave} from './FlowChecker.tsx'
+import AddNodeButton from './component/AddNodeButton.tsx'
+import {checkAddConnection, checkSave} from './FlowChecker.tsx'
 import {useNodeDrag} from './Helper.tsx'
-import {NodeRegistry, NodeRegistryMap} from './NodeRegistry.tsx'
-import {useContextStore} from './store/ContextStore.ts'
+import {NodeRegistryMap} from './NodeRegistry.tsx'
 import {useDataStore} from './store/DataStore.ts'
 import {useFlowStore} from './store/FlowStore.ts'
 import {flowDotColor, type FlowEditorProps} from './types.ts'
@@ -45,12 +45,10 @@ const FlowableDiv = styled.div`
 
 function FlowEditor(props: FlowEditorProps) {
   const navigate = useNavigate()
-  const [messageApi, contextHolder] = message.useMessage()
 
-  const {data, setData, setDataById} = useDataStore()
+  const {data, setData} = useDataStore()
   const {
     nodes,
-    addNode,
     setNodes,
     onNodesChange,
     edges,
@@ -59,8 +57,6 @@ function FlowEditor(props: FlowEditorProps) {
     onConnect,
   } = useFlowStore()
 
-  const {inputSchema, setInputSchema} = useContextStore()
-
   useEffect(() => {
     // language=JSON
     // let initialData = JSON.parse('{"nodes":[{"id":"TCxPixrdkI","type":"start-node","position":{"x":-256,"y":109.5},"data":{},"measured":{"width":256,"height":83},"selected":false,"dragging":false},{"id":"tGs78_ietp","type":"llm-node","position":{"x":108,"y":-2.5},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"OeZdaU7LpY","type":"llm-node","position":{"x":111,"y":196},"data":{},"measured":{"width":256,"height":105},"selected":false,"dragging":false},{"id":"LjfoCYZo-E","type":"knowledge-node","position":{"x":497.62196259607214,"y":-10.792497317791003},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"sQM_22GYB5","type":"end-node","position":{"x":874.3164534765615,"y":151.70316541496913},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"KpMH_xc3ZZ","type":"llm-node","position":{"x":529.6286840434341,"y":150.4721376669937},"data":{},"measured":{"width":256,"height":75},"selected":false,"dragging":false},{"id":"pOrR6EMVbe","type":"switch-node","position":{"x":110.33793030183864,"y":373.9551529987239},"data":{},"measured":{"width":256,"height":157},"selected":false,"dragging":false}],"edges":[{"source":"TCxPixrdkI","sourceHandle":"source","target":"tGs78_ietp","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-tGs78_ietptarget"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"OeZdaU7LpY","targetHandle":"target","id":"xy-edge__TCxPixrdkIsource-OeZdaU7LpYtarget"},{"source":"tGs78_ietp","sourceHandle":"source","target":"LjfoCYZo-E","targetHandle":"target","id":"xy-edge__tGs78_ietpsource-LjfoCYZo-Etarget"},{"source":"LjfoCYZo-E","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__LjfoCYZo-Esource-KpMH_xc3ZZtarget"},{"source":"OeZdaU7LpY","sourceHandle":"source","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__OeZdaU7LpYsource-KpMH_xc3ZZtarget"},{"source":"KpMH_xc3ZZ","sourceHandle":"source","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__KpMH_xc3ZZsource-sQM_22GYB5target"},{"source":"TCxPixrdkI","sourceHandle":"source","target":"pOrR6EMVbe","id":"xy-edge__TCxPixrdkIsource-pOrR6EMVbe"},{"source":"pOrR6EMVbe","sourceHandle":"3","target":"sQM_22GYB5","targetHandle":"target","id":"xy-edge__pOrR6EMVbe3-sQM_22GYB5target"},{"source":"pOrR6EMVbe","sourceHandle":"1","target":"KpMH_xc3ZZ","targetHandle":"target","id":"xy-edge__pOrR6EMVbe1-KpMH_xc3ZZtarget"}],"data":{"tGs78_ietp":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你是个聪明人"},"OeZdaU7LpY":{"model":"qwen3","outputs":{"text":{"type":"string"}},"systemPrompt":"你也是个聪明人"}}}')
@@ -73,7 +69,6 @@ function FlowEditor(props: FlowEditorProps) {
     setNodes(initialNodes)
     setEdges(initialEdges)
 
-    setInputSchema(props.inputSchema)
   }, [props.graphData])
 
   const {
@@ -84,7 +79,6 @@ function FlowEditor(props: FlowEditorProps) {
 
   return (
     <FlowableDiv className="h-full w-full">
-      {contextHolder}
       <ReactFlow
         className="rounded-xl"
         nodes={nodes}
@@ -100,7 +94,7 @@ function FlowEditor(props: FlowEditorProps) {
             onConnect(connection)
           } catch (e) {
             // @ts-ignore
-            messageApi.error(e.toString())
+            message.error(e.toString())
           }
         }}
         // @ts-ignore
@@ -108,56 +102,12 @@ function FlowEditor(props: FlowEditorProps) {
         onNodeDragStart={onNodeDragStart}
         onNodeDrag={onNodeDrag}
         onNodeDragStop={onNodeDragEnd}
+        onEdgesDelete={() => console.info('delete')}
+        fitView
       >
         <Panel position="top-right">
           <Space className="toolbar">
-            <Dropdown
-              menu={{
-                items: unique(NodeRegistry.map(i => i.group))
-                  .map(group => ({
-                    type: 'group',
-                    label: group,
-                    children: NodeRegistry.filter(i => isEqual(group, i.group))
-                      .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, 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: 100, y: 100},
-                      data: {},
-                    })
-                  } catch (e) {
-                    // @ts-ignore
-                    messageApi.error(e.toString())
-                  }
-                },
-              }}
-            >
-              <Button type="default">
-                <PlusCircleFilled/>
-                新增节点
-              </Button>
-            </Dropdown>
+            <AddNodeButton/>
             <Popconfirm
               title="返回上一页"
               description="未保存的流程图将会被丢弃，确认是否返回"
@@ -173,11 +123,11 @@ function FlowEditor(props: FlowEditorProps) {
                 if (commonInfo.debug) {
                   console.info('Save', JSON.stringify({nodes, edges, data}))
                 }
-                checkSave(inputSchema, nodes, edges, data)
+                checkSave(nodes, edges, data)
                 props.onGraphDataChange({nodes, edges, data})
               } catch (e) {
                 // @ts-ignore
-                messageApi.error(e.toString())
+                message.error(e.toString())
               }
             }}>
               <SaveFilled/>

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

@@ -1,10 +1,10 @@
 import {type Edge, getIncomers, type Node} from '@xyflow/react'
 import type {Option} from 'amis/lib/Schema'
-import {find, has, isEmpty, isEqual, max, min, unique} from 'licia'
+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 {InputFormOptions, InputFormOptionsGroup} from './types.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>()
@@ -20,35 +20,21 @@ export const getAllIncomerNodeById: (id: string, nodes: Node[], edges: Edge[]) =
   return unique(result, (a, b) => isEqual(a, b))
 }
 
-export const getAllIncomerNodeOutputVariables: (id: string, nodes: Node[], edges: Edge[], data: any) => {
-  id: string,
-  variable: string
-}[] = (id, nodes, edges, data) => {
-  let incomerIds = getAllIncomerNodeById(id, nodes, edges)
-  let incomerVariables: { id: string, variable: string }[] = []
-  for (const incomerId of incomerIds) {
-    let nodeData = data[incomerId] ?? {}
-    if (has(nodeData, 'outputs')) {
-      let outputs = nodeData?.outputs ?? []
-      for (const output of Object.keys(outputs)) {
-        incomerVariables.push({
-          id: incomerId,
-          variable: output,
-        })
-      }
-    }
+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 []
   }
-  return incomerVariables
-}
-
-export const generateAllIncomerOutputVariablesFormOptions: (id: string, inputSchema: Record<string, Record<string, any>>, nodes: Node[], edges: Edge[], data: any) => Option[] = (id, inputSchema, nodes, edges, data) => {
-  let inputSchemaVariables: InputFormOptions[] = Object.keys(inputSchema).map(key => ({
-    label: `${key} (${inputSchema[key]?.label ?? ''})`,
-    value: key,
-  }))
 
   let incomerIds = getAllIncomerNodeById(id, nodes, edges)
-  let incomerVariables: InputFormOptionsGroup[] = []
+  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
@@ -56,33 +42,127 @@ export const generateAllIncomerOutputVariablesFormOptions: (id: string, inputSch
       group = `${nodeData.node.name} ${incomerId}`
     }
     if (has(nodeData, 'outputs')) {
-      let outputs = nodeData?.outputs ?? []
-      incomerVariables.push({
-        group: group,
-        variables: Object.keys(outputs).map(key => ({
-          value: `${incomerId}.${key}`,
-          label: key,
-        })),
-      })
+      let outputs = nodeData?.outputs ?? {}
+      for (const key of Object.keys(outputs)) {
+        incomerVariables.push({
+          group: group,
+          name: key,
+          type: outputs[key].type,
+          variable: `${incomerId}.${key}`,
+        })
+      }
     }
   }
 
-  let inputVariables = [
-    ...(isEmpty(inputSchemaVariables) ? [] : [
+  return [
+    ...(currentNode.parentId ? [
       {
-        group: '流程入参',
-        variables: inputSchemaVariables,
-      },
-    ]),
+        group: '循环入参',
+        name: 'loopIndex (当前迭代索引)',
+        type: 'number',
+        variable: 'loopIndex',
+      } as OutputVariable,
+      {
+        group: '循环入参',
+        name: 'loopItem (当前迭代对象)',
+        type: 'object',
+        variable: 'loopItem',
+      } as OutputVariable,
+    ] : []),
     ...incomerVariables,
   ]
+}
 
-  return [
-    ...inputVariables.map(item => ({
-      label: item.group,
-      children: item.variables,
-    })),
-  ]
+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],
+    }))
 }
 
 // 处理循环节点的边界问题
@@ -99,7 +179,7 @@ export const useNodeDrag = (deps: DependencyList) => {
       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), 90),
+          y: max(min(node.position.y, (parentNode.measured?.height ?? 0) - (node.measured?.height ?? 0) - 28), 130),
         }
         setNode({
           ...node,

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

@@ -1,4 +1,4 @@
-import {has, isEmpty} from 'licia'
+import {has, isEmpty, isEqual} from 'licia'
 import {getAllIncomerNodeOutputVariables} from './Helper.tsx'
 import CodeNode from './node/CodeNode.tsx'
 import KnowledgeNode from './node/KnowledgeNode.tsx'
@@ -7,18 +7,16 @@ 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 {NodeChecker, NodeDefine} from './types.ts'
+import type {AddNodeChecker, NodeDefine, SaveNodeChecker} from './types.ts'
+import InputNode from './node/InputNode.tsx'
 
-const inputSingleVariableChecker: (field: string) => NodeChecker = field => {
-  return (id, inputSchema, nodes, edges, data) => {
+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.id}.${i.variable}`),
-          ...Object.keys(inputSchema),
-        ])
+        let outputVariables = new Set(getAllIncomerNodeOutputVariables(id, nodes, edges, data).map(i => i.variable))
         if (!outputVariables.has(expression)) {
           return {
             error: true,
@@ -31,15 +29,12 @@ const inputSingleVariableChecker: (field: string) => NodeChecker = field => {
   }
 }
 
-const inputMultiVariableChecker: NodeChecker = (id, inputSchema, nodes, edges, data) => {
+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.id}.${i.variable}`),
-        ...Object.keys(inputSchema),
-      ])
+      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)) {
@@ -54,6 +49,13 @@ const inputMultiVariableChecker: NodeChecker = (id, inputSchema, nodes, edges, d
   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',
@@ -62,7 +64,10 @@ export const NodeRegistry: NodeDefine[] = [
     icon: <i className="fa fa-message"/>,
     description: '使用大模型对话',
     component: LlmNode,
-    checkers: [inputMultiVariableChecker],
+    checkers: {
+      add: [],
+      save: [inputMultiVariableChecker]
+    },
   },
   {
     key: 'knowledge-node',
@@ -71,7 +76,10 @@ export const NodeRegistry: NodeDefine[] = [
     icon: <i className="fa fa-book-bookmark"/>,
     description: '',
     component: KnowledgeNode,
-    checkers: [inputMultiVariableChecker],
+    checkers: {
+      add: [],
+      save: [inputMultiVariableChecker]
+    },
   },
   {
     key: 'code-node',
@@ -80,7 +88,10 @@ export const NodeRegistry: NodeDefine[] = [
     icon: <i className="fa fa-code"/>,
     description: '执行自定义的处理代码',
     component: CodeNode,
-    checkers: [inputMultiVariableChecker],
+    checkers: {
+      add: [],
+      save: [inputMultiVariableChecker]
+    },
   },
   {
     key: 'template-node',
@@ -89,7 +100,10 @@ export const NodeRegistry: NodeDefine[] = [
     icon: <i className="fa fa-pen-nib"/>,
     description: '使用模板聚合转换变量表示',
     component: TemplateNode,
-    checkers: [inputMultiVariableChecker],
+    checkers: {
+      add: [],
+      save: [inputMultiVariableChecker]
+    },
   },
   {
     key: 'switch-node',
@@ -98,7 +112,10 @@ export const NodeRegistry: NodeDefine[] = [
     icon: <i className="fa fa-code-fork"/>,
     description: '根据不同的情况前往不同的分支',
     component: SwitchNode,
-    checkers: [],
+    checkers: {
+      add: [],
+      save: [],
+    },
   },
   {
     key: 'loop-node',
@@ -107,16 +124,35 @@ export const NodeRegistry: NodeDefine[] = [
     icon: <i className="fa fa-repeat"/>,
     description: '实现循环执行流程',
     component: LoopNode,
-    checkers: [],
+    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: '输出节点',
+    group: '数据节点',
     name: '输出',
     icon: <i className="fa fa-file"/>,
-    description: '定义输出变量',
+    description: '定义流程输出变量',
     component: OutputNode,
-    checkers: [inputSingleVariableChecker('output')],
+    checkers: {
+      add: [noMoreThanOneNodeType],
+      save: [inputSingleVariableChecker('output')]
+    },
   },
 ]
 

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

@@ -8,10 +8,10 @@ import {amisRender, commonInfo, horizontalFormOptions} from '../../../util/amis.
 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 function inputsFormColumns(
   nodeId: string,
-  inputSchema: Record<string, Record<string, any>>,
   nodes: Node[],
   edges: Edge[],
   data: any,
@@ -37,7 +37,6 @@ export function inputsFormColumns(
           selectMode: 'group',
           options: generateAllIncomerOutputVariablesFormOptions(
             nodeId,
-            inputSchema,
             nodes,
             edges,
             data,
@@ -70,24 +69,11 @@ 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,
+          })),
         },
       ],
     },
@@ -100,7 +86,7 @@ type AmisNodeProps = {
   nodeProps: NodeProps
   extraNodeDescription?: JSX.Element
   handler: JSX.Element
-  columnSchema?: () => Schema[]
+  formSchema?: () => FormSchema,
   resize?: { minWidth: number, minHeight: number }
 }
 
@@ -134,7 +120,7 @@ const AmisNode: (props: AmisNodeProps) => JSX.Element = ({
   nodeProps,
   extraNodeDescription,
   handler,
-  columnSchema,
+  formSchema,
   resize,
 }) => {
   const {removeNode} = useFlowStore()
@@ -148,6 +134,7 @@ const AmisNode: (props: AmisNodeProps) => JSX.Element = ({
   const [editDrawerOpen, setEditDrawerOpen] = useState(false)
   const [editDrawerForm, setEditDrawerForm] = useState<JSX.Element>(<></>)
   const onOpenEditDrawerClick = useCallback(() => {
+    const schema = formSchema?.()
     setEditDrawerForm(
       amisRender(
         {
@@ -178,6 +165,7 @@ const AmisNode: (props: AmisNodeProps) => JSX.Element = ({
                     },
                   ],
                 },
+                ...(schema?.events ?? {})
               },
               body: [
                 {
@@ -195,7 +183,7 @@ const AmisNode: (props: AmisNodeProps) => JSX.Element = ({
                 {
                   type: 'divider',
                 },
-                ...(columnSchema?.() ?? []),
+                ...(schema?.columns ?? []),
                 {
                   type: 'wrapper',
                   size: 'none',
@@ -233,7 +221,7 @@ const AmisNode: (props: AmisNodeProps) => JSX.Element = ({
       ),
     )
     setEditDrawerOpen(true)
-  }, [nodeData])
+  }, [id])
   const onRemoveClick = useCallback(() => {
     removeNode(id)
     removeDataById(id)

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

@@ -1,10 +1,10 @@
 import type {NodeProps} from '@xyflow/react'
 import {Tag} from 'antd'
-import React, {useCallback, useEffect} from 'react'
-import {useContextStore} from '../store/ContextStore.ts'
+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 languageMap: Record<string, string> = {
   'javascript': 'Javascript',
@@ -14,65 +14,56 @@ const languageMap: Record<string, string> = {
 
 const CodeNode = (props: NodeProps) => {
   const {getNodes, getEdges} = useFlowStore()
-  const {getData, mergeDataById, getDataById} = useDataStore()
-  const {getInputSchema} = useContextStore()
+  const {getData, getDataById} = useDataStore()
 
   const nodeData = getDataById(props.id)
 
-  useEffect(() => {
-    mergeDataById(
-      props.id,
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: [
+      ...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
       {
-        outputs: {
-          result: {
-            type: 'string',
-          },
+        type: 'divider',
+      },
+      {
+        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',
         },
       },
-    )
-  }, [props.id])
-
-  const columnsSchema = useCallback(() => [
-    ...inputsFormColumns(props.id, getInputSchema(), getNodes(), getEdges(), getData()),
-    {
-      type: 'divider',
-    },
-    {
-      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',
       },
-    },
-    {
-      type: 'divider',
-    },
-    ...outputsFormColumns(true, true),
-  ], [props.id])
+      ...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={
-        nodeData?.type
-          ? <div className="mt-2 flex justify-between">
-            <span>代码类型</span>
-            <Tag className="m-0" color="blue">{languageMap[nodeData.type]}</Tag>
-          </div>
-          : <></>
-      }
-      columnSchema={columnsSchema}
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
       handler={<NormalNodeHandler/>}
     />
   )

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,15 +1,14 @@
 import type {NodeProps} from '@xyflow/react'
 import React, {useCallback, useEffect} from 'react'
 import {commonInfo} from '../../../util/amis.tsx'
-import {useContextStore} from '../store/ContextStore.ts'
 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) => {
   const {getNodes, getEdges} = useFlowStore()
   const {getData, mergeDataById} = useDataStore()
-  const {getInputSchema} = useContextStore()
 
   useEffect(() => {
     mergeDataById(
@@ -24,64 +23,66 @@ const KnowledgeNode = (props: NodeProps) => {
     )
   }, [props.id])
 
-  const columnsSchema = useCallback(() => [
-    ...inputsFormColumns(props.id, getInputSchema(), 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']})),
-            },
-          }
+  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])
+      {
+        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}
-      columnSchema={columnsSchema}
+      formSchema={formSchema}
       handler={<NormalNodeHandler/>}
     />
   )

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

@@ -1,10 +1,10 @@
 import type {NodeProps} from '@xyflow/react'
 import {Tag} from 'antd'
-import React, {useCallback, useEffect} from 'react'
-import {useContextStore} from '../store/ContextStore.ts'
+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',
@@ -14,7 +14,6 @@ const modelMap: Record<string, string> = {
 const LlmNode = (props: NodeProps) => {
   const {getNodes, getEdges} = useFlowStore()
   const {getData, mergeDataById, getDataById} = useDataStore()
-  const {getInputSchema} = useContextStore()
 
   const nodeData = getDataById(props.id)
 
@@ -24,50 +23,55 @@ const LlmNode = (props: NodeProps) => {
       {
         outputs: {
           text: {
-            type: 'string',
+            type: 'text',
           },
         },
       },
     )
   }, [props.id])
 
-  const columnsSchema = useCallback(() => [
-    ...inputsFormColumns(props.id, getInputSchema(), 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 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[nodeData.model]}</Tag>
+      </div>
+      : <></>
+  }, [nodeData])
+
   return (
     <AmisNode
       className={nodeClassName('llm')}
       nodeProps={props}
-      extraNodeDescription={
-        nodeData?.model
-          ? <div className="mt-2 flex justify-between">
-            <span>模型名称</span>
-            <Tag className="m-0" color="blue">{modelMap[nodeData.model]}</Tag>
-          </div>
-          : <></>
-      }
-      columnSchema={columnsSchema}
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
       handler={<NormalNodeHandler/>}
     />
   )

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

@@ -1,43 +1,150 @@
 import {Background, BackgroundVariant, type NodeProps} from '@xyflow/react'
 import {classnames} from 'amis'
-import React from 'react'
-import {flowBackgroundColor, flowDotColor} from '../types.ts'
-import AmisNode, {nodeClassName, NormalNodeHandler} from './AmisNode.tsx'
+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: '256px',
-        minHeight: '110px'
+        minWidth: '350px',
+        minHeight: '290px',
       }}
       nodeProps={props}
-      extraNodeDescription={
-        <div
-          className="nodrag relative h-full w-full"
-          style={{
-            minHeight: '8rem',
-          }}
-        >
-          <Background
-            id={`loop-background-${props.id}`}
-            className="rounded-xl"
-            variant={BackgroundVariant.Cross}
-            gap={20}
-            size={3}
-            style={{
-              zIndex: 0,
-            }}
-            color={flowDotColor}
-            bgColor={flowBackgroundColor}
-          />
-        </div>
-      }
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
       handler={<NormalNodeHandler/>}
       resize={{
-        minWidth: 256,
-        minHeight: 208,
+        minWidth: 350,
+        minHeight: 290,
       }}
     />
   )

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

@@ -1,41 +1,23 @@
 import type {NodeProps} from '@xyflow/react'
 import React, {useCallback} from 'react'
-import {generateAllIncomerOutputVariablesFormOptions} from '../Helper.tsx'
-import {useContextStore} from '../store/ContextStore.ts'
 import {useDataStore} from '../store/DataStore.ts'
 import {useFlowStore} from '../store/FlowStore.ts'
-import AmisNode, {EndNodeHandler, nodeClassName} from './AmisNode.tsx'
+import type {FormSchema} from '../types.ts'
+import AmisNode, {EndNodeHandler, inputsFormColumns, nodeClassName} from './AmisNode.tsx'
 
 const OutputNode = (props: NodeProps) => {
   const {getNodes, getEdges} = useFlowStore()
   const {getData} = useDataStore()
-  const {getInputSchema} = useContextStore()
 
-  const columnsSchema = useCallback(
-    () => [
-      {
-        type: 'select',
-        name: 'output',
-        label: '输出变量',
-        required: true,
-        selectMode: 'group',
-        options: generateAllIncomerOutputVariablesFormOptions(
-          props.id,
-          getInputSchema(),
-          getNodes(),
-          getEdges(),
-          getData(),
-        ),
-      },
-    ],
-    [props.id],
-  )
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
+  }), [props.id])
 
   return (
     <AmisNode
       className={nodeClassName('output')}
       nodeProps={props}
-      columnSchema={columnsSchema}
+      formSchema={formSchema}
       handler={<EndNodeHandler/>}
     />
   )

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

@@ -1,48 +1,95 @@
 import {Handle, type NodeProps, Position} from '@xyflow/react'
+import type {ConditionValue} from 'amis'
 import {Tag} from 'antd'
-import React from 'react'
+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'
-
-const cases = [
-  {
-    index: 1,
-  },
-  {
-    index: 2,
-  },
-  {
-    index: 3,
-  },
-]
+import type {FormSchema} from '../types.ts'
 
 const SwitchNode = (props: NodeProps) => {
+  const {getNodes, getEdges, removeEdges} = useFlowStore()
+  const {getData, getDataById} = useDataStore()
+
+  const nodeData = getDataById(props.id)
+  // @ts-ignore
+  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">
+        {conditions.map((item, index) => (
+          <div key={item.id} className="mt-1">
+            <Tag className="m-0" color="blue">分支 {index + 1}</Tag>
+          </div>
+        ))}
+      </div>
+    )
+  }, [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}/>
+        {conditions.map((item, index) => (
+          <Handle
+            type="source"
+            position={Position.Right}
+            key={item.id}
+            id={item.id}
+            style={{top: 91 + (26 * index)}}
+          />
+        ))}
+      </>
+    )
+  }, [nodeData])
+
   return (
     <AmisNode
       className={nodeClassName('switch')}
       nodeProps={props}
-      extraNodeDescription={
-        <div className="mt-2">
-          {cases.map(item => (
-            <div key={item.index} className="mt-1">
-              <Tag className="m-0" color="blue">分支 {item.index}</Tag>
-            </div>
-          ))}
-        </div>
-      }
-      handler={
-        <>
-          <Handle type="target" position={Position.Left}/>
-          {cases.map((item, index) => (
-            <Handle
-              type="source"
-              position={Position.Right}
-              key={item.index}
-              id={`${item.index}`}
-              style={{top: 85 + (25 * index)}}
-            />
-          ))}
-        </>
-      }
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
+      handler={handler}
     />
   )
 }

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

@@ -1,10 +1,10 @@
 import type {NodeProps} from '@xyflow/react'
 import {Tag} from 'antd'
-import React, {useCallback, useEffect} from 'react'
-import {useContextStore} from '../store/ContextStore.ts'
+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: '默认',
@@ -16,7 +16,6 @@ const typeMap: Record<string, string> = {
 const TemplateNode = (props: NodeProps) => {
   const {getNodes, getEdges} = useFlowStore()
   const {getData, getDataById, mergeDataById} = useDataStore()
-  const {getInputSchema} = useContextStore()
 
   const nodeData = getDataById(props.id)
 
@@ -26,16 +25,16 @@ const TemplateNode = (props: NodeProps) => {
       {
         outputs: {
           text: {
-            type: 'string',
+            type: 'text',
           },
         },
       },
     )
   }, [props.id])
 
-  const columnsSchema = useCallback(
-    () => [
-      ...inputsFormColumns(props.id, getInputSchema(), getNodes(), getEdges(), getData()),
+  const formSchema: () => FormSchema = useCallback(() => ({
+    columns: [
+      ...inputsFormColumns(props.id, getNodes(), getEdges(), getData()),
       {
         type: 'divider',
       },
@@ -69,23 +68,24 @@ const TemplateNode = (props: NodeProps) => {
         },
       },
       ...outputsFormColumns(false, true),
-    ],
-    [props.id],
-  )
+    ]
+  }), [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={
-        nodeData?.type
-          ? <div className="mt-2 flex justify-between">
-            <span>模板类型</span>
-            <Tag className="m-0" color="blue">{typeMap[nodeData.type]}</Tag>
-          </div>
-          : <></>
-      }
-      columnSchema={columnsSchema}
+      extraNodeDescription={extraNodeDescription}
+      formSchema={formSchema}
       handler={<NormalNodeHandler/>}
     />
   )

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

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

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

@@ -8,7 +8,7 @@ import {
   type OnEdgesChange,
   type OnNodesChange,
 } from '@xyflow/react'
-import {filter, find, isEqual} from 'licia'
+import {contain, filter, find, isEqual} from 'licia'
 import {create} from 'zustand/react'
 
 export const useFlowStore = create<{
@@ -24,6 +24,8 @@ export const useFlowStore = create<{
   edges: Edge[],
   getEdges: () => Edge[],
   onEdgesChange: OnEdgesChange,
+  removeEdge: (id: string) => void,
+  removeEdges: (ids: string[]) => void,
   setEdges: (edges: Edge[]) => void,
 
   onConnect: OnConnect,
@@ -61,6 +63,16 @@ export const useFlowStore = create<{
       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

@@ -1,8 +1,9 @@
 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 const flowBackgroundColor = '#fafafa'
+export const flowDotColor = '#dedede'
 
 export type InputFormOptions = {
   label: string
@@ -19,16 +20,27 @@ export type NodeError = {
   message?: string,
 }
 
-export type NodeChecker = (id: string, inputSchema: Record<string, Record<string, any>>, nodes: Node[], edges: Edge[], data: any) => NodeError
+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 = {
-  inputSchema: Record<string, Record<string, any>>,
   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,
@@ -36,5 +48,20 @@ export type NodeDefine = {
   icon: JSX.Element,
   description: string,
   component: any,
-  checkers: NodeChecker[],
-}
+  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,17 +108,18 @@ 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 ?? {},
                                           },
                                         }
                                       },

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/template/FlowTaskTemplateEdit.tsx

@@ -1,9 +1,8 @@
-import {isEmpty, isEqual} from 'licia'
+import {isEqual} from 'licia'
 import React from 'react'
 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 {
@@ -39,31 +38,6 @@ const FlowTaskTemplateEdit: React.FC = () => {
           wrapWithPanel: false,
           ...horizontalFormOptions(),
           onEvent: {
-            change: {
-              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, '入参表单预览'),
-                          },
-                        },
-                      })
-                    }
-                  },
-                },
-              ],
-            },
             submitSucc: {
               actions: [
                 {
@@ -73,8 +47,8 @@ const FlowTaskTemplateEdit: React.FC = () => {
                     navigate(-1)
                   },
                 },
-              ]
-            }
+              ],
+            },
           },
           body: [
             {
@@ -99,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)
         }}