Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions apps/knowledge/serializers/knowledge_workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@ def action(self, instance: Dict, user, with_valid=True):
knowledge_id=self.data.get("knowledge_id"),
state=State.STARTED,
meta=meta).save()
knowledge = QuerySet(Knowledge).filter(id=self.data.get('knowledge_id')).first()
instance['knowledge_base'] = {**(instance.get('knowledge_base') or {}),
'knowledge': {'id': str(knowledge.id), 'name': knowledge.name,
'desc': knowledge.desc,
'workspace_id': knowledge.workspace_id}}
work_flow_manage = KnowledgeWorkflowManage(
Workflow.new_instance(knowledge_workflow.work_flow, WorkflowMode.KNOWLEDGE),
{'knowledge_id': self.data.get("knowledge_id"), 'knowledge_action_id': knowledge_action_id, 'stream': True,
Expand Down Expand Up @@ -169,6 +174,11 @@ def upload_document(self, instance: Dict, user, with_valid=True):
'user_name': user.username}
KnowledgeAction(id=knowledge_action_id, knowledge_id=self.data.get("knowledge_id"), state=State.STARTED,
meta=meta).save()
knowledge = QuerySet(Knowledge).filter(id=self.data.get('knowledge_id')).first()
instance['knowledge_base'] = {**(instance.get('knowledge_base') or {}),
'knowledge': {'id': str(knowledge.id), 'name': knowledge.name,
'desc': knowledge.desc,
'workspace_id': knowledge.workspace_id}}
work_flow_manage = KnowledgeWorkflowManage(
Workflow.new_instance(knowledge_workflow_version.work_flow, WorkflowMode.KNOWLEDGE),
{'knowledge_id': self.data.get("knowledge_id"), 'knowledge_action_id': knowledge_action_id, 'stream': True,
Expand Down
6 changes: 3 additions & 3 deletions ui/src/workflow/common/app-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ class AppNode extends HtmlResize.view {
}
if (this.props.model.type === 'knowledge-base-node') {
let globalFields = []
if (this.props.model.properties.user_input_field_list) {
globalFields = this.props.model.properties.user_input_field_list.map((item: any) => ({
if (this.props.model.properties.config?.globalFields) {
globalFields = this.props.model.properties.config.globalFields.map((item: any) => ({
label: typeof item.label == 'string' ? item.label : item.label.label,
value: item.field,
value: item.value,
}))
}

Expand Down
18 changes: 12 additions & 6 deletions ui/src/workflow/nodes/knowledge-base-node/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,14 @@ const getResourceDetail = inject('getResourceDetail') as any
const props = defineProps<{ nodeModel: any }>()

const UserInputFieldTableFef = ref()

const default_fields = [
{
label: '知识库',
value: 'knowledge',
globeLabel: `{{global.knowledge}}`,
globeValue: `{{context['global'].knowledge}}`,
},
]
const nodeFields = computed(() => {
if (props.nodeModel.properties.user_input_field_list) {
const fields = props.nodeModel.properties.user_input_field_list.map((item: any) => ({
Expand All @@ -54,15 +61,14 @@ const nodeFields = computed(() => {
globeLabel: `{{global.${item.field}}}`,
globeValue: `{{context['global'].${item.field}}}`,
}))
set(props.nodeModel.properties.config, 'globalFields', fields)
return fields
set(props.nodeModel.properties.config, 'globalFields', [...fields, ...default_fields])
return [...fields, ...default_fields]
}
set(props.nodeModel.properties.config, 'globalFields', [])
set(props.nodeModel.properties.config, 'globalFields', [default_fields])
return []
})
const resource = getResourceDetail()

onMounted(() => {})
</script>
<style lang="scss" scoped>
</style>
<style lang="scss" scoped></style>