mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-12-08 20:42:30 +08:00
Fix: Fixed the issue that the global variables of the code operator cannot be selected #3221 (#8605)
### What problem does this PR solve? Fix: Fixed the issue that the global variables of the code operator cannot be selected #3221 ### Type of change - [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
@ -1,59 +0,0 @@
|
|||||||
import { BlockButton } from '@/components/ui/button';
|
|
||||||
import { RAGFlowNodeType } from '@/interfaces/database/flow';
|
|
||||||
import { MinusCircleOutlined } from '@ant-design/icons';
|
|
||||||
import { Form, Input, Select } from 'antd';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { useBuildVariableOptions } from '../../hooks/use-get-begin-query';
|
|
||||||
import { FormCollapse } from '../components/dynamic-input-variable';
|
|
||||||
|
|
||||||
type DynamicInputVariableProps = {
|
|
||||||
name?: string;
|
|
||||||
node?: RAGFlowNodeType;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const DynamicInputVariable = ({
|
|
||||||
name = 'arguments',
|
|
||||||
node,
|
|
||||||
}: DynamicInputVariableProps) => {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
const valueOptions = useBuildVariableOptions(node?.id, node?.parentId);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<FormCollapse title={t('flow.inputVariables')}>
|
|
||||||
<Form.List name={name}>
|
|
||||||
{(fields, { add, remove }) => (
|
|
||||||
<>
|
|
||||||
{fields.map(({ key, name, ...restField }) => (
|
|
||||||
<div key={key} className="flex items-center gap-2 pb-4">
|
|
||||||
<Form.Item
|
|
||||||
{...restField}
|
|
||||||
name={[name, 'name']}
|
|
||||||
className="m-0 flex-1"
|
|
||||||
>
|
|
||||||
<Input />
|
|
||||||
</Form.Item>
|
|
||||||
<Form.Item
|
|
||||||
{...restField}
|
|
||||||
name={[name, 'component_id']}
|
|
||||||
className="m-0 flex-1"
|
|
||||||
>
|
|
||||||
<Select
|
|
||||||
placeholder={t('common.pleaseSelect')}
|
|
||||||
options={valueOptions}
|
|
||||||
></Select>
|
|
||||||
</Form.Item>
|
|
||||||
<MinusCircleOutlined onClick={() => remove(name)} />
|
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
<Form.Item>
|
|
||||||
<BlockButton onClick={() => add()}>
|
|
||||||
{t('flow.addVariable')}
|
|
||||||
</BlockButton>
|
|
||||||
</Form.Item>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</Form.List>
|
|
||||||
</FormCollapse>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1,6 +1,7 @@
|
|||||||
'use client';
|
'use client';
|
||||||
|
|
||||||
import { FormContainer } from '@/components/form-container';
|
import { FormContainer } from '@/components/form-container';
|
||||||
|
import { SelectWithSearch } from '@/components/originui/select-with-search';
|
||||||
import { BlockButton, Button } from '@/components/ui/button';
|
import { BlockButton, Button } from '@/components/ui/button';
|
||||||
import {
|
import {
|
||||||
FormControl,
|
FormControl,
|
||||||
@ -9,14 +10,13 @@ import {
|
|||||||
FormMessage,
|
FormMessage,
|
||||||
} from '@/components/ui/form';
|
} from '@/components/ui/form';
|
||||||
import { BlurInput } from '@/components/ui/input';
|
import { BlurInput } from '@/components/ui/input';
|
||||||
import { RAGFlowSelect } from '@/components/ui/select';
|
|
||||||
import { Separator } from '@/components/ui/separator';
|
import { Separator } from '@/components/ui/separator';
|
||||||
import { RAGFlowNodeType } from '@/interfaces/database/flow';
|
import { RAGFlowNodeType } from '@/interfaces/database/flow';
|
||||||
import { X } from 'lucide-react';
|
import { X } from 'lucide-react';
|
||||||
import { ReactNode } from 'react';
|
import { ReactNode } from 'react';
|
||||||
import { useFieldArray, useFormContext } from 'react-hook-form';
|
import { useFieldArray, useFormContext } from 'react-hook-form';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { useBuildVariableOptions } from '../../hooks/use-get-begin-query';
|
import { useBuildQueryVariableOptions } from '../../hooks/use-get-begin-query';
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
node?: RAGFlowNodeType;
|
node?: RAGFlowNodeType;
|
||||||
@ -32,7 +32,7 @@ export const TypeOptions = [
|
|||||||
'Object',
|
'Object',
|
||||||
].map((x) => ({ label: x, value: x }));
|
].map((x) => ({ label: x, value: x }));
|
||||||
|
|
||||||
export function DynamicVariableForm({ node, name = 'arguments' }: IProps) {
|
export function DynamicVariableForm({ name = 'arguments' }: IProps) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const form = useFormContext();
|
const form = useFormContext();
|
||||||
|
|
||||||
@ -41,19 +41,19 @@ export function DynamicVariableForm({ node, name = 'arguments' }: IProps) {
|
|||||||
control: form.control,
|
control: form.control,
|
||||||
});
|
});
|
||||||
|
|
||||||
const valueOptions = useBuildVariableOptions(node?.id, node?.parentId);
|
const nextOptions = useBuildQueryVariableOptions();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-5">
|
<div className="space-y-5">
|
||||||
{fields.map((field, index) => {
|
{fields.map((field, index) => {
|
||||||
const typeField = `${name}.${index}.name`;
|
const typeField = `${name}.${index}.name`;
|
||||||
return (
|
return (
|
||||||
<div key={field.id} className="flex items-center gap-2">
|
<div key={field.id} className="flex w-full items-center gap-2">
|
||||||
<FormField
|
<FormField
|
||||||
control={form.control}
|
control={form.control}
|
||||||
name={typeField}
|
name={typeField}
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<FormItem className="w-2/5">
|
<FormItem className="flex-1 overflow-hidden">
|
||||||
<FormControl>
|
<FormControl>
|
||||||
<BlurInput
|
<BlurInput
|
||||||
{...field}
|
{...field}
|
||||||
@ -69,15 +69,12 @@ export function DynamicVariableForm({ node, name = 'arguments' }: IProps) {
|
|||||||
control={form.control}
|
control={form.control}
|
||||||
name={`${name}.${index}.component_id`}
|
name={`${name}.${index}.component_id`}
|
||||||
render={({ field }) => (
|
render={({ field }) => (
|
||||||
<FormItem className="flex-1">
|
<FormItem className="flex-1 overflow-hidden">
|
||||||
<FormControl>
|
<FormControl>
|
||||||
<RAGFlowSelect
|
<SelectWithSearch
|
||||||
placeholder={t('common.pleaseSelect')}
|
options={nextOptions}
|
||||||
options={
|
|
||||||
name === 'arguments' ? valueOptions : TypeOptions
|
|
||||||
}
|
|
||||||
{...field}
|
{...field}
|
||||||
></RAGFlowSelect>
|
></SelectWithSearch>
|
||||||
</FormControl>
|
</FormControl>
|
||||||
<FormMessage />
|
<FormMessage />
|
||||||
</FormItem>
|
</FormItem>
|
||||||
|
|||||||
@ -9,8 +9,8 @@ export function useWatchFormChange(id?: string, form?: UseFormReturn) {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
// Manually triggered form updates are synchronized to the canvas
|
// Manually triggered form updates are synchronized to the canvas
|
||||||
if (id && form?.formState.isDirty) {
|
if (id) {
|
||||||
values = form?.getValues();
|
values = form?.getValues() || {};
|
||||||
let nextValues: any = values;
|
let nextValues: any = values;
|
||||||
|
|
||||||
updateNodeForm(id, nextValues);
|
updateNodeForm(id, nextValues);
|
||||||
|
|||||||
Reference in New Issue
Block a user