fix: rag variable

web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx

@@ -45,7 +45,6 @@ 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 { useStore as useWorkflowStore } from '@/app/components/workflow/store'
 import { useFetchDynamicOptions } from '@/service/use-plugins'
 import type { Tool } from '@/app/components/tools/types'
 import { VariableIconWithColor } from '@/app/components/workflow/nodes/_base/components/variable/variable-label'
@@ -129,7 +128,6 @@ const VarReferencePicker: FC<Props> = ({
   })
 
   const node = nodes.find(n => n.id === nodeId)
-  const ragPipelineVariables = useWorkflowStore(s => s.ragPipelineVariables)
   const isInIteration = !!(node?.data as any).isInIteration
   const iterationNode = isInIteration ? nodes.find(n => n.id === node?.parentId) : null
 

web/app/components/workflow/nodes/_base/hooks/use-available-var-list.ts

@@ -75,7 +75,10 @@ const useAvailableVarList = (nodeId: string, {
   return {
     availableVars,
     availableNodes,
-    availableNodesWithParent: availableNodes,
+    availableNodesWithParent: [
+      ...availableNodes,
+      ...(isDataSourceNode ? [currNode] : []),
+    ],
   }
 }
 

web/app/components/workflow/nodes/data-source/panel.tsx

@@ -1,8 +1,6 @@
 import type { FC } from 'react'
 import {
-  useCallback,
   useMemo,
-  useState,
 } from 'react'
 import { useTranslation } from 'react-i18next'
 import { memo } from 'react'
@@ -24,10 +22,8 @@ import {
   WEBSITE_CRAWL_OUTPUT,
 } from './constants'
 import { useStore } from '@/app/components/workflow/store'
-import InputVarList from '@/app/components/workflow/nodes/tool/components/input-var-list'
 import { toolParametersToFormSchemas } from '@/app/components/tools/utils/to-form-schema'
-import type { Var } from '@/app/components/workflow/types'
-import { VarType } from '@/app/components/workflow/types'
+import ToolForm from '../tool/components/tool-form'
 
 const Panel: FC<NodePanelProps<DataSourceNodeType>> = ({ id, data }) => {
   const { t } = useTranslation()
@@ -52,18 +48,9 @@ const Panel: FC<NodePanelProps<DataSourceNodeType>> = ({ id, data }) => {
   const formSchemas = useMemo(() => {
     return currentDataSourceItem ? toolParametersToFormSchemas(currentDataSourceItem.parameters) : []
   }, [currentDataSourceItem])
-  const [currVarIndex, setCurrVarIndex] = useState(-1)
-  const currVarType = formSchemas[currVarIndex]?._type
-  const handleOnVarOpen = useCallback((index: number) => {
-    setCurrVarIndex(index)
-  }, [])
 
-  const filterVar = useCallback((varPayload: Var) => {
-    if (currVarType)
-      return varPayload.type === currVarType
-
-    return varPayload.type !== VarType.arrayFile
-  }, [currVarType])
+  const pipelineId = useStore(s => s.pipelineId)
+  const setShowInputFieldPanel = useStore(s => s.setShowInputFieldPanel)
 
   return (
     <div >
@@ -80,16 +67,19 @@ const Panel: FC<NodePanelProps<DataSourceNodeType>> = ({ id, data }) => {
               supportCollapse: true,
             }}
           >
-            <InputVarList
-              readOnly={nodesReadOnly}
-              nodeId={id}
-              schema={formSchemas as any}
-              filterVar={filterVar}
-              value={datasource_parameters}
-              onChange={handleParametersChange}
-              isSupportConstantValue
-              onOpen={handleOnVarOpen}
-            />
+            {formSchemas.length > 0 && (
+              <ToolForm
+                readOnly={nodesReadOnly}
+                nodeId={id}
+                schema={formSchemas as any}
+                value={datasource_parameters}
+                onChange={handleParametersChange}
+                currentProvider={currentDataSource}
+                currentTool={currentDataSourceItem}
+                showManageInputField={!!pipelineId}
+                onManageInputField={() => setShowInputFieldPanel?.(true)}
+              />
+            )}
           </BoxGroupField>
         )
       }