浏览代码

Feat: Display the connection lines between multiple conditions of the conditional operator #3221 (#8218)

### What problem does this PR solve?

Feat: Display the connection lines between multiple conditions of the
conditional operator #3221

### Type of change


- [x] New Feature (non-breaking change which adds functionality)
tags/v0.19.1
balibabu 4 个月前
父节点
当前提交
bf7f7c7027
没有帐户链接到提交者的电子邮件
共有 1 个文件被更改,包括 83 次插入36 次删除
  1. 83
    36
      web/src/pages/agent/form/switch-form/index.tsx

+ 83
- 36
web/src/pages/agent/form/switch-form/index.tsx 查看文件

@@ -16,7 +16,7 @@ import { ISwitchForm } from '@/interfaces/database/flow';
import { cn } from '@/lib/utils';
import { zodResolver } from '@hookform/resolvers/zod';
import { X } from 'lucide-react';
import { useMemo } from 'react';
import { useCallback, useMemo } from 'react';
import { useFieldArray, useForm, useFormContext } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
import { z } from 'zod';
@@ -26,10 +26,7 @@ import {
SwitchOperatorOptions,
} from '../../constant';
import { useBuildFormSelectOptions } from '../../form-hooks';
import {
useBuildComponentIdAndBeginOptions,
useBuildVariableOptions,
} from '../../hooks/use-get-begin-query';
import { useBuildComponentIdAndBeginOptions } from '../../hooks/use-get-begin-query';
import { IOperatorForm } from '../../interface';
import { useValues } from './use-values';

@@ -38,30 +35,49 @@ const ItemKey = 'items';

type ConditionCardsProps = {
name: string;
removeParent(index: number): void;
parentIndex: number;
parentLength: number;
} & IOperatorForm;

function ConditionCards({ name: parentName, node }: ConditionCardsProps) {
const form = useFormContext();
function useBuildSwitchOperatorOptions() {
const { t } = useTranslation();

const componentIdOptions = useBuildComponentIdAndBeginOptions(
node?.id,
node?.parentId,
);

const switchOperatorOptions = useMemo(() => {
return SwitchOperatorOptions.map((x) => ({
value: x.value,
icon: (
<IconFont
name={x.icon}
className={cn('size-4', { 'rotate-180': x.value === '>' })}
className={cn('size-4', {
'rotate-180': x.value === '>',
})}
></IconFont>
),
label: t(`flow.switchOperatorOptions.${x.label}`),
}));
}, [t]);

return switchOperatorOptions;
}

function ConditionCards({
name: parentName,
node,
parentIndex,
removeParent,
parentLength,
}: ConditionCardsProps) {
const form = useFormContext();
const { t } = useTranslation();

const componentIdOptions = useBuildComponentIdAndBeginOptions(
node?.id,
node?.parentId,
);

const switchOperatorOptions = useBuildSwitchOperatorOptions();

const name = `${parentName}.${ItemKey}`;

const { fields, remove, append } = useFieldArray({
@@ -69,12 +85,30 @@ function ConditionCards({ name: parentName, node }: ConditionCardsProps) {
control: form.control,
});

const handleRemove = useCallback(
(index: number) => () => {
remove(index);
if (parentIndex !== 0 && index === 0 && parentLength === 1) {
removeParent(parentIndex);
}
},
[parentIndex, parentLength, remove, removeParent],
);

return (
<section className="flex-1 space-y-2.5">
{fields.map((field, index) => {
return (
<div key={field.id} className="flex">
<Card className="bg-transparent border-input-border border flex-1">
<Card
className={cn(
'relative bg-transparent border-input-border border flex-1 ',
{
'before:w-10 before:absolute before:h-[1px] before:bg-input-border before:top-1/2 before:-left-10':
index === 0 || index === fields.length - 1,
},
)}
>
<section className="p-2 bg-background-card flex justify-between items-center">
<FormField
control={form.control}
@@ -129,7 +163,7 @@ function ConditionCards({ name: parentName, node }: ConditionCardsProps) {
/>
</CardContent>
</Card>
<Button variant={'ghost'} onClick={() => remove(index)}>
<Button variant={'ghost'} onClick={handleRemove(index)}>
<X />
</Button>
</div>
@@ -150,6 +184,7 @@ function ConditionCards({ name: parentName, node }: ConditionCardsProps) {
const SwitchForm = ({ node }: IOperatorForm) => {
const { t } = useTranslation();
const values = useValues();
const switchOperatorOptions = useBuildSwitchOperatorOptions();

const FormSchema = z.object({
conditions: z.array(
@@ -199,8 +234,6 @@ const SwitchForm = ({ node }: IOperatorForm) => {
}));
}, [t]);

const componentIdOptions = useBuildVariableOptions(node?.id, node?.parentId);

return (
<Form {...form}>
<form
@@ -212,26 +245,33 @@ const SwitchForm = ({ node }: IOperatorForm) => {
{fields.map((field, index) => {
return (
<FormContainer key={field.id} className="">
<div>IF</div>
<section className="flex items-center gap-2 !mt-2">
<FormField
control={form.control}
name={`${ConditionKey}.${index}.logical_operator`}
render={({ field }) => (
<FormItem>
<FormControl>
<RAGFlowSelect
{...field}
options={switchLogicOperatorOptions}
triggerClassName="w-18"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<div>{index === 0 ? 'IF' : 'ELSEIF'}</div>
<section className="flex gap-2 !mt-2 relative">
<section className="flex flex-col">
<div className="relative w-1 flex-1 before:absolute before:w-[1px] before:bg-input-border before:top-20 before:bottom-0 before:left-10"></div>
<FormField
control={form.control}
name={`${ConditionKey}.${index}.logical_operator`}
render={({ field }) => (
<FormItem>
<FormControl>
<RAGFlowSelect
{...field}
options={switchLogicOperatorOptions}
triggerClassName="w-18"
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<div className="relative w-1 flex-1 before:absolute before:w-[1px] before:bg-input-border before:top-0 before:bottom-36 before:left-10"></div>
</section>
<ConditionCards
name={`${ConditionKey}.${index}`}
removeParent={remove}
parentIndex={index}
parentLength={fields.length}
></ConditionCards>
</section>
</FormContainer>
@@ -239,7 +279,14 @@ const SwitchForm = ({ node }: IOperatorForm) => {
})}
<BlockButton
onClick={() =>
append({ logical_operator: SwitchLogicOperatorOptions[0] })
append({
logical_operator: SwitchLogicOperatorOptions[0],
[ItemKey]: [
{
operator: switchOperatorOptions[0].value,
},
],
})
}
>
add

正在加载...
取消
保存