Skip to content

Commit 33a119c

Browse files
committed
fix: Tool workflow node result
1 parent b90a1c9 commit 33a119c

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

ui/src/workflow/common/data.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,10 +1050,6 @@ export const toolWorkflowLibNode = {
10501050
stepName: t('workflow.nodes.toolWorlflowNode.label','工作流工具'),
10511051
config: {
10521052
fields: [
1053-
{
1054-
label: t('common.result'),
1055-
value: 'result',
1056-
},
10571053
],
10581054
},
10591055
},

ui/src/workflow/nodes/tool-workflow-lib-node/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ class ToolWorkflowLibNode extends AppNode {
44
constructor(props: any) {
55
super(props, ToolWorkflowLibNodeVue)
66
}
7+
getConfig(props: any) {
8+
return props.model.properties.config
9+
}
710
}
811
export default {
912
type: 'tool-workflow-lib-node',

ui/src/workflow/nodes/tool-workflow-lib-node/index.vue

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -150,26 +150,21 @@ const update_field = () => {
150150
loadSharedApi({ type: 'tool', systemType: apiType.value })
151151
.getToolById(props.nodeModel.properties.node_data.tool_lib_id)
152152
.then((ok: any) => {
153-
console.log('ssss', ok.data)
154-
155153
const workflowNodes = ok.data?.work_flow?.nodes || []
156154
const baseNode = workflowNodes.find((n: any) => n.type === 'tool-base-node')
157155
158156
if (baseNode) {
159157
const new_input_list = baseNode.properties.user_input_field_list || []
160158
const new_output_list = baseNode.properties.user_output_field_list || []
161159
162-
let config_field_list: any[] = []
163-
if (new_output_list.length > 0) {
164-
config_field_list = new_output_list.map((item: any) => ({
165-
label: item.label,
166-
value: item.field,
167-
}))
168-
}
160+
const old_config_fields = props.nodeModel.properties.config?.fields || []
161+
const config_field_list = new_output_list.map((item: any) => {
162+
const old = old_config_fields.find((o: any) => o.value === item.field)
163+
return old ? JSON.parse(JSON.stringify(old)) : { label: item.label, value: item.field }
164+
})
169165
170166
const input_title = baseNode.properties.user_input_config?.title
171167
const output_title = baseNode.properties.user_output_config?.title
172-
173168
const old_input_list = props.nodeModel.properties.node_data.input_field_list || []
174169
const merged_input_list = new_input_list.map((item: any) => {
175170
const find_field = old_input_list.find((old_item: any) => old_item.field === item.field)
@@ -185,11 +180,14 @@ const update_field = () => {
185180
})
186181
187182
set(props.nodeModel.properties.node_data, 'input_field_list', merged_input_list)
188-
set(props.nodeModel.properties.config, 'fields', config_field_list)
183+
set(props.nodeModel.properties, 'config', {
184+
fields: config_field_list,
185+
output_title: output_title,
186+
})
189187
set(props.nodeModel.properties.node_data, 'input_title', input_title)
190-
set(props.nodeModel.properties.config, 'output_title', output_title)
191188
}
192189
set(props.nodeModel.properties, 'status', ok.data.is_active ? 200 : 500)
190+
props.nodeModel.clear_next_node_field(true)
193191
})
194192
.catch(() => {
195193
set(props.nodeModel.properties, 'status', 500)

0 commit comments

Comments
 (0)