loop support reference parent variable

labring · Oct 25, 2024 · 6379645 · 6379645
1 parent a5a71cd
commit 6379645
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/packages/service/core/workflow/dispatch/loop/runLoop.ts b/packages/service/core/workflow/dispatch/loop/runLoop.ts
@@ -32,8 +32,6 @@ export const dispatchLoop = async (props: Props): Promise<Response> => {
     return Promise.reject('Input array length cannot be greater than 50');
   }
 
-  const runNodes = runtimeNodes.filter((node) => childrenNodeIdList.includes(node.nodeId));
-
   const outputValueArr = [];
   const loopDetail: ChatHistoryItemResType[] = [];
   let assistantResponses: AIChatItemValueItemType[] = [];
@@ -43,7 +41,7 @@ export const dispatchLoop = async (props: Props): Promise<Response> => {
   for await (const item of loopInputArray) {
     const response = await dispatchWorkFlow({
       ...props,
-      runtimeNodes: runNodes.map((node) =>
+      runtimeNodes: runtimeNodes.map((node) =>
         node.flowNodeType === FlowNodeTypeEnum.loopStart
           ? {
               ...node,

diff --git a/projects/app/src/web/core/workflow/utils.ts b/projects/app/src/web/core/workflow/utils.ts
@@ -193,10 +193,11 @@ export const computedNodeInputReference = ({
   if (!node) {
     return;
   }
+  const parentId = node.parentNodeId;
   let sourceNodes: FlowNodeItemType[] = [];
   // 根据 edge 获取所有的 source 节点（source节点会继续向前递归获取）
   const findSourceNode = (nodeId: string) => {
-    const targetEdges = edges.filter((item) => item.target === nodeId);
+    const targetEdges = edges.filter((item) => item.target === nodeId || item.target === parentId);
     targetEdges.forEach((edge) => {
       const sourceNode = nodes.find((item) => item.nodeId === edge.source);
       if (!sourceNode) return;