diff --git a/web/app/components/workflow/nodes/tool/default.ts b/web/app/components/workflow/nodes/tool/default.ts index 7e1e369957..847f021418 100644 --- a/web/app/components/workflow/nodes/tool/default.ts +++ b/web/app/components/workflow/nodes/tool/default.ts @@ -1,6 +1,7 @@ import { BlockEnum } from '../../types' import type { NodeDefault } from '../../types' import type { ToolNodeType } from './types' +import { VarType as VarKindType } from '@/app/components/workflow/nodes/tool/types' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/constants' const i18nPrefix = 'workflow.errorMsg' @@ -27,9 +28,18 @@ const nodeDefault: NodeDefault = { toolInputsSchema.filter((field: any) => { return field.required }).forEach((field: any) => { - const value = payload.tool_parameters.find((item: any) => item.variable === field.variable)?.value - if (!errorMessages && (value === undefined || value === null || value === '')) - errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: field.label[language] }) + const targetVar = payload.tool_parameters.find((item: any) => item.variable === field.variable) + if (!targetVar) + return + const { variable_type, value, value_selector } = targetVar + if (variable_type === VarKindType.selector) { + if (!errorMessages && (!value_selector || value_selector.length === 0)) + errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: field.label }) + } + if (variable_type === VarKindType.static) { + if (!errorMessages && (value === undefined || value === null || value === '')) + errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: field.label }) + } }) if (!errorMessages) {