diff --git a/src/components/FlowEditor/nodeEditors/components/ConditionsTable.tsx b/src/components/FlowEditor/nodeEditors/components/ConditionsTable.tsx index b6422b4..276819b 100644 --- a/src/components/FlowEditor/nodeEditors/components/ConditionsTable.tsx +++ b/src/components/FlowEditor/nodeEditors/components/ConditionsTable.tsx @@ -138,7 +138,6 @@ const ConditionsTable: React.FC = ({ ]; const convertData = (originData) => { - console.log('apiOutsList:', apiOutsList); const apiOutIds = apiOutsList; const conditions = originData.map(item => { let expression = ''; diff --git a/src/hooks/useFlowCallbacks.ts b/src/hooks/useFlowCallbacks.ts index ec036c6..eca0cd5 100644 --- a/src/hooks/useFlowCallbacks.ts +++ b/src/hooks/useFlowCallbacks.ts @@ -367,7 +367,11 @@ export const useFlowCallbacks = ( }, component: { type: 'LOOP_END', - customDef: '', + customDef: JSON.stringify({ + apiOutIds: ['continue', 'break'], + conditions: [], + loopStartNodeId: loopStartNode.id + }), loopStartNodeId: loopStartNode.id // 这里的参数是为了提供在组件内部处理数据是使用,最后这个字段要序列化后放进customDef } } @@ -510,6 +514,8 @@ export const useFlowCallbacks = ( // 删除节点函数 const deleteNode = useCallback((node: Node) => { + console.log('node:', node); + setNodes((nds: Node[]) => nds.filter((n) => n.id !== node.id)); setEdges((eds: Edge[]) => eds.filter((e) => e.source !== node.id && e.target !== node.id)); diff --git a/src/utils/convertFlowData.ts b/src/utils/convertFlowData.ts index 4ab6371..f0aeb9c 100644 --- a/src/utils/convertFlowData.ts +++ b/src/utils/convertFlowData.ts @@ -142,7 +142,7 @@ export const convertFlowData = (flowData: any, useDefault = true) => { registerNodeType('LOOP', LoopNode, '循环'); } } - + // 构造节点数据 const node: any = { id: nodeConfig.nodeId, @@ -280,10 +280,11 @@ export const revertFlowData = (nodes: any[], edges: any[]) => { // 处理 dataIns(输入数据) if (parameters.dataIns && parameters.dataIns.length > 0) { nodeConfig.dataIns = parameters.dataIns.map((input: any) => ({ - id: input.name, + id: input.name || input.id, desc: input.desc, dataType: input.dataType, - defaultValue: input.defaultValue + defaultValue: input.defaultValue, + arrayType: input.arrayType || null })); } @@ -293,7 +294,8 @@ export const revertFlowData = (nodes: any[], edges: any[]) => { id: output.name, desc: output.desc, dataType: output.dataType, - defaultValue: output.defaultValue + defaultValue: output.defaultValue, + arrayType: output.arrayType || null })); }