mirror of
https://github.com/infiniflow/ragflow.git
synced 2025-12-08 20:42:30 +08:00
### What problem does this PR solve? Feat: The value selected in the Select component only displays the icon #3221 ### Type of change - [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
@ -3003,18 +3003,18 @@ export const ExeSQLOptions = ['mysql', 'postgresql', 'mariadb', 'mssql'].map(
|
||||
export const SwitchElseTo = 'end_cpn_id';
|
||||
|
||||
export const SwitchOperatorOptions = [
|
||||
{ value: '=', label: 'equal' },
|
||||
{ value: '≠', label: 'notEqual' },
|
||||
{ value: '>', label: 'gt' },
|
||||
{ value: '≥', label: 'ge' },
|
||||
{ value: '<', label: 'lt' },
|
||||
{ value: '≤', label: 'le' },
|
||||
{ value: 'contains', label: 'contains' },
|
||||
{ value: 'not contains', label: 'notContains' },
|
||||
{ value: 'start with', label: 'startWith' },
|
||||
{ value: 'end with', label: 'endWith' },
|
||||
{ value: 'empty', label: 'empty' },
|
||||
{ value: 'not empty', label: 'notEmpty' },
|
||||
{ value: '=', label: 'equal', icon: 'equal' },
|
||||
{ value: '≠', label: 'notEqual', icon: 'not-equals' },
|
||||
{ value: '>', label: 'gt', icon: 'Less' },
|
||||
{ value: '≥', label: 'ge', icon: 'Greater-or-equal' },
|
||||
{ value: '<', label: 'lt', icon: 'Less' },
|
||||
{ value: '≤', label: 'le', icon: 'less-or-equal' },
|
||||
{ value: 'contains', label: 'contains', icon: 'Contains' },
|
||||
{ value: 'not contains', label: 'notContains', icon: 'not-contains' },
|
||||
{ value: 'start with', label: 'startWith', icon: 'list-start' },
|
||||
{ value: 'end with', label: 'endWith', icon: 'list-end' },
|
||||
// { value: 'empty', label: 'empty', icon: '' },
|
||||
// { value: 'not empty', label: 'notEmpty', icon: '' },
|
||||
];
|
||||
|
||||
export const SwitchLogicOperatorOptions = ['and', 'or'];
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { FormContainer } from '@/components/form-container';
|
||||
import { IconFont } from '@/components/icon-font';
|
||||
import { BlockButton, Button } from '@/components/ui/button';
|
||||
import { Card, CardContent } from '@/components/ui/card';
|
||||
import {
|
||||
@ -9,8 +10,10 @@ import {
|
||||
FormMessage,
|
||||
} from '@/components/ui/form';
|
||||
import { RAGFlowSelect } from '@/components/ui/select';
|
||||
import { Separator } from '@/components/ui/separator';
|
||||
import { Textarea } from '@/components/ui/textarea';
|
||||
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';
|
||||
@ -49,6 +52,12 @@ function ConditionCards({ name: parentName, node }: ConditionCardsProps) {
|
||||
const switchOperatorOptions = useMemo(() => {
|
||||
return SwitchOperatorOptions.map((x) => ({
|
||||
value: x.value,
|
||||
icon: (
|
||||
<IconFont
|
||||
name={x.icon}
|
||||
className={cn('size-4', { 'rotate-180': x.value === '>' })}
|
||||
></IconFont>
|
||||
),
|
||||
label: t(`flow.switchOperatorOptions.${x.label}`),
|
||||
}));
|
||||
}, [t]);
|
||||
@ -66,7 +75,7 @@ function ConditionCards({ name: parentName, node }: ConditionCardsProps) {
|
||||
return (
|
||||
<div key={field.id} className="flex">
|
||||
<Card className="bg-transparent border-input-border border flex-1">
|
||||
<section className="p-2 bg-background-card flex justify-between">
|
||||
<section className="p-2 bg-background-card flex justify-between items-center">
|
||||
<FormField
|
||||
control={form.control}
|
||||
name={`${name}.${index}.cpn_id`}
|
||||
@ -76,29 +85,34 @@ function ConditionCards({ name: parentName, node }: ConditionCardsProps) {
|
||||
<RAGFlowSelect
|
||||
{...field}
|
||||
options={componentIdOptions}
|
||||
triggerClassName="w-30 text-background-checked"
|
||||
/>
|
||||
</FormControl>
|
||||
<FormMessage />
|
||||
</FormItem>
|
||||
)}
|
||||
/>
|
||||
<FormField
|
||||
control={form.control}
|
||||
name={`${name}.${index}.operator`}
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormControl>
|
||||
<RAGFlowSelect
|
||||
{...field}
|
||||
options={switchOperatorOptions}
|
||||
triggerClassName="w-30"
|
||||
placeholder={t('common.pleaseSelect')}
|
||||
triggerClassName="w-30 text-background-checked bg-transparent border-none"
|
||||
/>
|
||||
</FormControl>
|
||||
<FormMessage />
|
||||
</FormItem>
|
||||
)}
|
||||
/>
|
||||
<div className="flex items-center">
|
||||
<Separator orientation="vertical" className="h-2.5" />
|
||||
<FormField
|
||||
control={form.control}
|
||||
name={`${name}.${index}.operator`}
|
||||
render={({ field }) => (
|
||||
<FormItem>
|
||||
<FormControl>
|
||||
<RAGFlowSelect
|
||||
{...field}
|
||||
options={switchOperatorOptions}
|
||||
onlyShowSelectedIcon
|
||||
triggerClassName="w-30 bg-transparent border-none"
|
||||
/>
|
||||
</FormControl>
|
||||
<FormMessage />
|
||||
</FormItem>
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
<CardContent className="p-4 ">
|
||||
<FormField
|
||||
@ -178,13 +192,6 @@ const SwitchForm = ({ node }: IOperatorForm) => {
|
||||
return conditions?.filter((x) => !!x).map((x) => x?.to) ?? [];
|
||||
};
|
||||
|
||||
const switchOperatorOptions = useMemo(() => {
|
||||
return SwitchOperatorOptions.map((x) => ({
|
||||
value: x.value,
|
||||
label: t(`flow.switchOperatorOptions.${x.label}`),
|
||||
}));
|
||||
}, [t]);
|
||||
|
||||
const switchLogicOperatorOptions = useMemo(() => {
|
||||
return SwitchLogicOperatorOptions.map((x) => ({
|
||||
value: x,
|
||||
|
||||
Reference in New Issue
Block a user