15308555518/ MaxKB
1
0
Fork 0
mirror of https://github.com/1Panel-dev/MaxKB.git synced 2025-12-26 01:33:05 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: Allow variables to be assigned as the end node of the loop node (#4125)

This commit is contained in:
shaohuzhang1 2025-09-26 17:03:45 +08:00 committed by GitHub
parent c073d0c665
commit 9640c7ba9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ui/src/workflow/common/validate.ts
View File

@ -1,4 +1,5 @@
import { WorkflowType } from '@/enums/application'
import { WorkflowType, WorkflowMode } from '@/enums/application'
import { t } from '@/locales'
const end_nodes: Array<string> = [
@ -18,14 +19,39 @@ const end_nodes: Array<string> = [
WorkflowType.LoopNode,
WorkflowType.LoopBreakNode,
]
const loop_end_nodes: Array<string> = [
WorkflowType.AiChat,
WorkflowType.Reply,
WorkflowType.ToolLib,
WorkflowType.ToolLibCustom,
WorkflowType.ImageUnderstandNode,
WorkflowType.Application,
WorkflowType.SpeechToTextNode,
WorkflowType.TextToSpeechNode,
WorkflowType.ImageGenerateNode,
WorkflowType.ImageToVideoGenerateNode,
WorkflowType.TextToVideoGenerateNode,
WorkflowType.ImageGenerateNode,
WorkflowType.LoopBodyNode,
WorkflowType.LoopNode,
WorkflowType.LoopBreakNode,
WorkflowType.VariableAssignNode,
]
const end_nodes_dict = {
[WorkflowMode.Application]: end_nodes,
[WorkflowMode.ApplicationLoop]: loop_end_nodes,
}
export class WorkFlowInstance {
nodes
edges
workFlowNodes: Array<any>
constructor(workflow: { nodes: Array<any>; edges: Array<any> }) {
workflowModel: WorkflowMode
constructor(workflow: { nodes: Array<any>; edges: Array<any> }, workflowModel?: WorkflowMode) {
this.nodes = workflow.nodes
this.edges = workflow.edges
this.workFlowNodes = []
this.workflowModel = workflowModel ? workflowModel : WorkflowMode.Application
}
/**
* 校验开始节点
@ -124,7 +150,8 @@ export class WorkFlowInstance {
const node_list = edge_list
.map((edge) => this.nodes.filter((node) => node.id == edge.targetNodeId))
.reduce((x, y) => [...x, ...y], [])
if (node_list.length == 0 && !end_nodes.includes(node.type)) {
const end = end_nodes_dict[this.workflowModel]
if (node_list.length == 0 && !end.includes(node.type)) {
throw t('views.applicationWorkflow.validate.noNextNode')
}
return node_list
@ -161,7 +188,8 @@ export class WorkFlowInstance {
}
} else {
const edge_list = this.edges.filter((edge) => edge.sourceNodeId == node.id)
if (edge_list.length == 0 && !end_nodes.includes(node.type)) {
const end = end_nodes_dict[this.workflowModel]
if (edge_list.length == 0 && !end.includes(node.type)) {
throw `${node.properties.stepName} ${t('views.applicationWorkflow.validate.cannotEndNode')}`
}
}

2
ui/src/workflow/nodes/loop-body-node/index.vue
View File

@ -19,7 +19,7 @@ const props = defineProps<{ nodeModel: any }>()
const containerRef = ref()
const validate = () => {
const workflow = new WorkFlowInstance(lf.value.getGraphData())
const workflow = new WorkFlowInstance(lf.value.getGraphData(), WorkflowMode.ApplicationLoop)
return Promise.all(lf.value.graphModel.nodes.map((element: any) => element?.validate?.()))
.then(() => {
const loop_node_id = props.nodeModel.properties.loop_node_id