diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx index e9825cd44a..24de113e0d 100644 --- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx +++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx @@ -13,7 +13,7 @@ import { useReactFlow, useStoreApi } from 'reactflow' import RemoveButton from '../remove-button' import useAvailableVarList from '../../hooks/use-available-var-list' import VarReferencePopup from './var-reference-popup' -import { getNodeInfoById, isConversationVar, isENV, isSystemVar, varTypeToStructType } from './utils' +import { getNodeInfoById, isConversationVar, isENV, isRagVariableVar, isSystemVar, varTypeToStructType } from './utils' import ConstantField from './constant-field' import cn from '@/utils/classnames' import type { Node, NodeOutPutVar, ValueSelector, Var } from '@/app/components/workflow/types' @@ -40,6 +40,7 @@ import Tooltip from '@/app/components/base/tooltip' import { isExceptionVariable } from '@/app/components/workflow/utils' import VarFullPathPanel from './var-full-path-panel' import { noop } from 'lodash-es' +import { InputField } from '@/app/components/base/icons/src/vender/pipeline' const TRIGGER_DEFAULT_WIDTH = 227 @@ -274,14 +275,16 @@ const VarReferencePicker: FC = ({ isConstant: !!isConstant, }) - const { isEnv, isChatVar, isValidVar, isException } = useMemo(() => { + const { isEnv, isChatVar, isRagVar, isValidVar, isException } = useMemo(() => { const isEnv = isENV(value as ValueSelector) const isChatVar = isConversationVar(value as ValueSelector) + const isRagVar = isRagVariableVar(value as ValueSelector) const isValidVar = Boolean(outputVarNode) || isEnv || isChatVar const isException = isExceptionVariable(varName, outputVarNode?.type) return { isEnv, isChatVar, + isRagVar, isValidVar, isException, } @@ -385,7 +388,7 @@ const VarReferencePicker: FC = ({ {hasValue ? ( <> - {isShowNodeName && !isEnv && !isChatVar && ( + {isShowNodeName && !isEnv && !isChatVar && !isRagVar && (
{ if (e.metaKey || e.ctrlKey) { e.stopPropagation() @@ -414,6 +417,7 @@ const VarReferencePicker: FC = ({ {!hasValue && } {isEnv && } {isChatVar && } + {isRagVar && }
{varName}
diff --git a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx index 7ca334bb05..1f72d57da7 100644 --- a/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx +++ b/web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx @@ -125,7 +125,7 @@ const Item: FC = ({ if (!isSupportFileVar && isFile) return - if (isSys || isEnv || isChatVar) { // system variable | environment variable | conversation variable + if (isSys || isEnv || isChatVar || isRagVariable) { // system variable | environment variable | conversation variable onChange([...objPath, ...itemData.variable.split('.')], itemData) } else { @@ -155,7 +155,7 @@ const Item: FC = ({ {isChatVar && } {isLoopVar && } {isRagVariable && } - {!isEnv && !isChatVar && ( + {!isEnv && !isChatVar && !isRagVariable && (
{itemData.variable}
)} {isEnv && ( @@ -164,6 +164,9 @@ const Item: FC = ({ {isChatVar && (
{itemData.variable.replace('conversation.', '')}
)} + {isRagVariable && ( +
{itemData.variable.replace('rag.', '')}
+ )}
{itemData.type}
{