Merge branch 'feat/rag-pipeline' of https://github.com/langgenius/dify into feat/rag-pipeline

web/app/components/base/form/components/field/variable-or-constant-input.tsx

@@ -1,8 +1,11 @@
+import type { ChangeEvent } from 'react'
 import { useState } from 'react'
 import { RiEditLine } from '@remixicon/react'
 import cn from '@/utils/classnames'
 import SegmentedControl from '@/app/components/base/segmented-control'
 import { VariableX } from '@/app/components/base/icons/src/vender/workflow'
+import Input from '@/app/components/base/input'
+import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
 import type { LabelProps } from '../label'
 import Label from '../label'
 
@@ -22,12 +25,10 @@ const VariableOrConstantInputField = ({
   const options = [
     {
       Icon: VariableX,
-      text: '',
       value: 'variable',
     },
     {
       Icon: RiEditLine,
-      text: '',
       value: 'constant',
     },
   ]
@@ -36,6 +37,14 @@ const VariableOrConstantInputField = ({
     setVariableType(value)
   }
 
+  const handleVariableValueChange = () => {
+    console.log('Variable value changed')
+  }
+
+  const handleConstantValueChange = (e: ChangeEvent<HTMLInputElement>) => {
+    console.log('Constant value changed:', e.target.value)
+  }
+
   return (
     <div className={cn('flex flex-col gap-y-0.5', className)}>
       <Label
@@ -50,6 +59,25 @@ const VariableOrConstantInputField = ({
           onChange={handleVariableOrConstantChange as any}
           options={options as any}
         />
+        {
+          variableType === 'variable' && (
+            <VarReferencePicker
+              className='grow'
+              nodeId=''
+              readonly={false}
+              value={[]}
+              onChange={handleVariableValueChange}
+            />
+          )
+        }
+        {
+          variableType === 'constant' && (
+            <Input
+              className='ml-1'
+              onChange={handleConstantValueChange}
+            />
+          )
+        }
       </div>
     </div>
   )

web/app/components/base/form/components/field/variable-selector.tsx

@@ -0,0 +1,41 @@
+import cn from '@/utils/classnames'
+import VarReferencePicker from '@/app/components/workflow/nodes/_base/components/variable/var-reference-picker'
+import type { LabelProps } from '../label'
+import Label from '../label'
+
+type VariableOrConstantInputFieldProps = {
+  label: string
+  labelOptions?: Omit<LabelProps, 'htmlFor' | 'label'>
+  className?: string
+}
+
+const VariableOrConstantInputField = ({
+  className,
+  label,
+  labelOptions,
+}: VariableOrConstantInputFieldProps) => {
+  const handleVariableValueChange = () => {
+    console.log('Variable value changed')
+  }
+
+  return (
+    <div className={cn('flex flex-col gap-y-0.5', className)}>
+      <Label
+        htmlFor={'variable-or-constant'}
+        label={label}
+        {...(labelOptions ?? {})}
+      />
+      <div className='flex items-center'>
+        <VarReferencePicker
+          className='grow'
+          nodeId=''
+          readonly={false}
+          value={[]}
+          onChange={handleVariableValueChange}
+        />
+      </div>
+    </div>
+  )
+}
+
+export default VariableOrConstantInputField

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

@@ -3,14 +3,25 @@ import { memo } from 'react'
 import type { DataSourceNodeType } from './types'
 import type { NodePanelProps } from '@/app/components/workflow/types'
 import VariableOrConstantInputField from '@/app/components/base/form/components/field/variable-or-constant-input'
+import VariableSelector from '@/app/components/base/form/components/field/variable-selector'
 
 const Panel: FC<NodePanelProps<DataSourceNodeType>> = () => {
   return (
     <div className='mb-2 mt-2 space-y-4 px-4'>
       datasource
-      <VariableOrConstantInputField
+      <div className='space-y-1'>
-        label='Parent maximum chunk length'
+        <VariableSelector
-      />
+          className='py-1'
+          label='Child delimiter'
+          labelOptions={{
+            isRequired: true,
+          }}
+        />
+        <VariableOrConstantInputField
+          className='py-1'
+          label='Parent maximum chunk length'
+        />
+      </div>
     </div>
   )
 }