From 30f36c7b29c8d38c53bff591487ee5765c159059 Mon Sep 17 00:00:00 2001 From: shaohuzhang1 Date: Thu, 13 Jun 2024 09:32:20 +0800 Subject: [PATCH] =?UTF-8?q?=20feat:=20=E5=B7=A5=E4=BD=9C=E7=BC=96=E6=8E=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/src/workflow/index.vue | 4 ++-- ui/src/workflow/nodes/condition-node/index.ts | 10 ++++----- .../workflow/nodes/condition-node/index.vue | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ui/src/workflow/index.vue b/ui/src/workflow/index.vue index 74aee0b8a..881d2541e 100644 --- a/ui/src/workflow/index.vue +++ b/ui/src/workflow/index.vue @@ -97,7 +97,7 @@ const graphData = { { conditions: [], id: '6750', type: 'ELSE', condition: 'and' } ] }, - barnch_condition_list: [ + branch_condition_list: [ { index: 0, height: 115.778, id: '5675' }, { index: 1, height: 115.778, id: '9947' }, { index: 2, height: 115.778, id: '5048' }, @@ -227,7 +227,7 @@ const graphData = { { conditions: [], id: '8871', type: 'ELSE', condition: 'and' } ] }, - barnch_condition_list: [ + branch_condition_list: [ { index: 0, height: 115.778, id: '3014' }, { index: 1, height: 115.778, id: '4658' }, { index: 2, height: 40, id: '8871' } diff --git a/ui/src/workflow/nodes/condition-node/index.ts b/ui/src/workflow/nodes/condition-node/index.ts index bcb21b91f..f11e5b3c7 100644 --- a/ui/src/workflow/nodes/condition-node/index.ts +++ b/ui/src/workflow/nodes/condition-node/index.ts @@ -32,7 +32,7 @@ class ConditionModel extends AppNodeModel { y, width, height, - properties: { barnch_condition_list } + properties: { branch_condition_list } } = this if (this.height === undefined) { this.height = 200 @@ -46,10 +46,10 @@ class ConditionModel extends AppNodeModel { type: 'left' }) - if (barnch_condition_list) { - for (let index = 0; index < barnch_condition_list.length; index++) { - const element = barnch_condition_list[index] - const h = get_up_index_height(barnch_condition_list, index) + if (branch_condition_list) { + for (let index = 0; index < branch_condition_list.length; index++) { + const element = branch_condition_list[index] + const h = get_up_index_height(branch_condition_list, index) anchors.push({ x: x + width / 2 - 10, y: y - height / 2 + 75 + h + element.height / 2, diff --git a/ui/src/workflow/nodes/condition-node/index.vue b/ui/src/workflow/nodes/condition-node/index.vue index 92863ec72..41d935d49 100644 --- a/ui/src/workflow/nodes/condition-node/index.vue +++ b/ui/src/workflow/nodes/condition-node/index.vue @@ -144,18 +144,18 @@ const form = { } const resizeCondition = (wh: any, row: any, index: number) => { - const barnch_condition_list = cloneDeep( - props.nodeModel.properties.barnch_condition_list - ? props.nodeModel.properties.barnch_condition_list + const branch_condition_list = cloneDeep( + props.nodeModel.properties.branch_condition_list + ? props.nodeModel.properties.branch_condition_list : [] ) - const new_barnch_condition_list = barnch_condition_list.map((item: any) => { + const new_branch_condition_list = branch_condition_list.map((item: any) => { if (item.id === row.id) { return { ...item, height: wh.height, index: index } } return item }) - set(props.nodeModel.properties, 'barnch_condition_list', new_barnch_condition_list) + set(props.nodeModel.properties, 'branch_condition_list', new_branch_condition_list) refreshBranchAnchor(props.nodeModel.properties.node_data.branch, true) } const form_data = computed({ @@ -198,14 +198,14 @@ function addBranch() { set(props.nodeModel.properties.node_data, 'branch', list) } function refreshBranchAnchor(list: Array, is_add: boolean) { - const barnch_condition_list = cloneDeep( - props.nodeModel.properties.barnch_condition_list - ? props.nodeModel.properties.barnch_condition_list + const branch_condition_list = cloneDeep( + props.nodeModel.properties.branch_condition_list + ? props.nodeModel.properties.branch_condition_list : [] ) - const new_barnch_condition_list = list + const new_branch_condition_list = list .map((item, index) => { - const find = barnch_condition_list.find((b) => b.id === item.id) + const find = branch_condition_list.find((b: any) => b.id === item.id) if (find) { return { index: index, height: find.height, id: item.id } } else { @@ -216,7 +216,7 @@ function refreshBranchAnchor(list: Array, is_add: boolean) { }) .filter((item) => item) - set(props.nodeModel.properties, 'barnch_condition_list', new_barnch_condition_list) + set(props.nodeModel.properties, 'branch_condition_list', new_branch_condition_list) props.nodeModel.refreshBranch() }