fix: The name of the loop body is not fixed (#4167)
parent
37e506fc98
commit
f59648b817
|
|
@ -12,19 +12,7 @@ import { nodeDict } from '@/workflow/common/data'
|
||||||
import { isActive, connect, disconnect } from './teleport'
|
import { isActive, connect, disconnect } from './teleport'
|
||||||
import { t } from '@/locales'
|
import { t } from '@/locales'
|
||||||
import { type Dict } from '@/api/type/common'
|
import { type Dict } from '@/api/type/common'
|
||||||
const getNodeName = (nodes: Array<any>, baseName: string) => {
|
|
||||||
let index = 0
|
|
||||||
let name = baseName
|
|
||||||
while (true) {
|
|
||||||
if (index > 0) {
|
|
||||||
name = baseName + index
|
|
||||||
}
|
|
||||||
if (!nodes.some((node: any) => node.properties.stepName === name.trim())) {
|
|
||||||
return name
|
|
||||||
}
|
|
||||||
index++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
class AppNode extends HtmlResize.view {
|
class AppNode extends HtmlResize.view {
|
||||||
isMounted
|
isMounted
|
||||||
r?: any
|
r?: any
|
||||||
|
|
@ -45,7 +33,7 @@ class AppNode extends HtmlResize.view {
|
||||||
if (props.model.properties.noRender) {
|
if (props.model.properties.noRender) {
|
||||||
delete props.model.properties.noRender
|
delete props.model.properties.noRender
|
||||||
} else {
|
} else {
|
||||||
props.model.properties.stepName = getNodeName(
|
props.model.properties.stepName = this.getNodeName(
|
||||||
props.graphModel.nodes.filter((node: any) => node.id !== props.model.id),
|
props.graphModel.nodes.filter((node: any) => node.id !== props.model.id),
|
||||||
props.model.properties.stepName,
|
props.model.properties.stepName,
|
||||||
)
|
)
|
||||||
|
|
@ -56,6 +44,19 @@ class AppNode extends HtmlResize.view {
|
||||||
props.model.height = props.model.properties.height
|
props.model.height = props.model.properties.height
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
getNodeName(nodes: Array<any>, baseName: string) {
|
||||||
|
let index = 0
|
||||||
|
let name = baseName
|
||||||
|
while (true) {
|
||||||
|
if (index > 0) {
|
||||||
|
name = baseName + index
|
||||||
|
}
|
||||||
|
if (!nodes.some((node: any) => node.properties.stepName === name.trim())) {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
index++
|
||||||
|
}
|
||||||
|
}
|
||||||
get_node_field_list() {
|
get_node_field_list() {
|
||||||
const result = []
|
const result = []
|
||||||
if (this.props.model.type === 'start-node') {
|
if (this.props.model.type === 'start-node') {
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,13 @@
|
||||||
import { WorkflowMode } from './../../../enums/application'
|
|
||||||
import LoopNode from './index.vue'
|
import LoopNode from './index.vue'
|
||||||
|
import { t } from '@/locales'
|
||||||
import { AppNode, AppNodeModel } from '@/workflow/common/app-node'
|
import { AppNode, AppNodeModel } from '@/workflow/common/app-node'
|
||||||
class LoopBodyNodeView extends AppNode {
|
class LoopBodyNodeView extends AppNode {
|
||||||
constructor(props: any) {
|
constructor(props: any) {
|
||||||
super(props, LoopNode)
|
super(props, LoopNode)
|
||||||
}
|
}
|
||||||
|
getNodeName() {
|
||||||
|
return t('views.applicationWorkflow.nodes.loopBodyNode.label')
|
||||||
|
}
|
||||||
get_up_node_field_list(contain_self: boolean, use_cache: boolean) {
|
get_up_node_field_list(contain_self: boolean, use_cache: boolean) {
|
||||||
const loop_node_id = this.props.model.properties.loop_node_id
|
const loop_node_id = this.props.model.properties.loop_node_id
|
||||||
const loop_node = this.props.graphModel.getNodeModelById(loop_node_id)
|
const loop_node = this.props.graphModel.getNodeModelById(loop_node_id)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue