From 579bc0f7c53c98b8588edc9df15e0b67ae8f773a Mon Sep 17 00:00:00 2001 From: Mminamiyama Date: Fri, 4 Jul 2025 17:19:06 +0800 Subject: [PATCH] reset code/default.ts to original state --- .../components/workflow/nodes/code/default.ts | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/web/app/components/workflow/nodes/code/default.ts b/web/app/components/workflow/nodes/code/default.ts index 423ccc61fd..5f90c18716 100644 --- a/web/app/components/workflow/nodes/code/default.ts +++ b/web/app/components/workflow/nodes/code/default.ts @@ -1,8 +1,7 @@ import { BlockEnum } from '../../types' -import type { Node, NodeDefault, NodeOutPutVar } from '../../types' +import type { NodeDefault } from '../../types' import { CodeLanguage, type CodeNodeType } from './types' import { ALL_CHAT_AVAILABLE_BLOCKS, ALL_COMPLETION_AVAILABLE_BLOCKS } from '@/app/components/workflow/blocks' -import { isConversationVar, isENV, isSystemVar } from '@/app/components/workflow/nodes/_base/components/variable/utils' const i18nPrefix = 'workflow.errorMsg' @@ -23,7 +22,7 @@ const nodeDefault: NodeDefault = { const nodes = isChatMode ? ALL_CHAT_AVAILABLE_BLOCKS : ALL_COMPLETION_AVAILABLE_BLOCKS return nodes }, - checkValid(payload: CodeNodeType, t: any, moreDataForCheckValid: { node: Node, availableVars: NodeOutPutVar[], availableNodes: Node[] }) { + checkValid(payload: CodeNodeType, t: any) { let errorMessages = '' const { code, variables } = payload if (!errorMessages && variables.filter(v => !v.variable).length > 0) @@ -32,24 +31,7 @@ const nodeDefault: NodeDefault = { errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t(`${i18nPrefix}.fields.variableValue`) }) if (!errorMessages && !code) errorMessages = t(`${i18nPrefix}.fieldRequired`, { field: t(`${i18nPrefix}.fields.code`) }) - if (!errorMessages && moreDataForCheckValid) { - const availableVars = moreDataForCheckValid.availableVars - console.log('=======================节点名称:', moreDataForCheckValid.node.data.title) - console.log('=======================代码参数检查:', variables) - console.log('=======================可用变量:', moreDataForCheckValid.availableVars) - console.log('=======================可用节点:', moreDataForCheckValid.availableNodes) - console.log('=========================================================================================================') - variables.forEach((variable) => { - const isEnv = isENV(variable.value_selector) - const isConvVar = isConversationVar(variable.value_selector) - const isSysVar = isSystemVar(variable.value_selector) - if (!isEnv && !isConvVar && !isSysVar) { - const node = availableVars.find(v => v.nodeId === variable?.value_selector[0]) - if (!node) - errorMessages = t(`${i18nPrefix}.invalidVariable`) - } - }) - } + return { isValid: !errorMessages, errorMessage: errorMessages,