Skip to content

Commit 8f9af86

Browse files
authored
Merge branch 'tool-workflow' into pr@tool-workflow@feat_tool_workflow_node
2 parents 1135c11 + 33a119c commit 8f9af86

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const update_field = () => {
160160
const old_config_fields = props.nodeModel.properties.config?.fields || []
161161
const config_field_list = new_output_list.map((item: any) => {
162162
const old = old_config_fields.find((o: any) => o.value === item.field)
163-
return old ?? { label: item.label, value: item.field }
163+
return old ? JSON.parse(JSON.stringify(old)) : { label: item.label, value: item.field }
164164
})
165165
166166
const input_title = baseNode.properties.user_input_config?.title
@@ -180,11 +180,14 @@ const update_field = () => {
180180
})
181181
182182
set(props.nodeModel.properties.node_data, 'input_field_list', merged_input_list)
183-
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+
})
184187
set(props.nodeModel.properties.node_data, 'input_title', input_title)
185-
set(props.nodeModel.properties.config, 'output_title', output_title)
186188
}
187189
set(props.nodeModel.properties, 'status', ok.data.is_active ? 200 : 500)
190+
props.nodeModel.clear_next_node_field(true)
188191
})
189192
.catch(() => {
190193
set(props.nodeModel.properties, 'status', 500)

0 commit comments

Comments
 (0)