Browse Source

Feat: Add RAGFlowSelect component #3221 (#5228)

### What problem does this PR solve?

Feat: Add RAGFlowSelect component #3221

### Type of change


- [x] New Feature (non-breaking change which adds functionality)
tags/v0.17.0
balibabu 8 months ago
parent
commit
392f28882f
No account linked to committer's email address

+ 128
- 5
web/src/components/ui/select.tsx View File

@@ -1,10 +1,14 @@
'use client';

import * as SelectPrimitive from '@radix-ui/react-select';
import { Check, ChevronDown, ChevronUp } from 'lucide-react';
import { Check, ChevronDown, ChevronUp, X } from 'lucide-react';
import * as React from 'react';

import { cn } from '@/lib/utils';
import { ControllerRenderProps } from 'react-hook-form';

import { FormControl } from '@/components/ui/form';
import { useCallback, useEffect } from 'react';

const Select = SelectPrimitive.Root;

@@ -14,8 +18,10 @@ const SelectValue = SelectPrimitive.Value;

const SelectTrigger = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Trigger>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
>(({ className, children, ...props }, ref) => (
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger> & {
onReset?: () => void;
}
>(({ className, children, value, onReset, ...props }, ref) => (
<SelectPrimitive.Trigger
ref={ref}
className={cn(
@@ -25,8 +31,17 @@ const SelectTrigger = React.forwardRef<
{...props}
>
{children}
<SelectPrimitive.Icon asChild>
<ChevronDown className="h-4 w-4 opacity-50" />
<SelectPrimitive.Icon
asChild
onPointerDown={(event) => {
event.stopPropagation();
}}
>
{value ? (
<X className="h-4 w-4 opacity-50 cursor-pointer" onClick={onReset} />
) : (
<ChevronDown className="h-4 w-4 opacity-50" />
)}
</SelectPrimitive.Icon>
</SelectPrimitive.Trigger>
));
@@ -158,3 +173,111 @@ export {
SelectTrigger,
SelectValue,
};

export type RAGFlowSelectOptionType = {
label: React.ReactNode;
value: string;
disabled?: boolean;
};

export type RAGFlowSelectGroupOptionType = {
label: React.ReactNode;
options: RAGFlowSelectOptionType[];
};

type RAGFlowSelectProps = Partial<ControllerRenderProps> & {
FormControlComponent?: typeof FormControl;
options?: (RAGFlowSelectOptionType | RAGFlowSelectGroupOptionType)[];
};

/**
*
* Reference:
* https://github.com/shadcn-ui/ui/discussions/638
* https://github.com/radix-ui/primitives/discussions/2645#discussioncomment-8343397
*
* @export
* @param {(Partial<ControllerRenderProps> & {
* FormControlComponent?: typeof FormControl;
* })} {
* value: initialValue,
* onChange,
* FormControlComponent,
* }
* @return {*}
*/
export function RAGFlowSelect({
value: initialValue,
onChange,
FormControlComponent,
options = [],
}: RAGFlowSelectProps) {
const [key, setKey] = React.useState(+new Date());
const [value, setValue] = React.useState<string | undefined>(undefined);

const FormControlWidget = FormControlComponent
? FormControlComponent
: React.Fragment;

const handleChange = useCallback(
(val?: string) => {
setValue(val);
onChange?.(val);
},
[onChange],
);

const handleReset = useCallback(() => {
handleChange(undefined);
setKey(+new Date());
}, [handleChange]);

useEffect(() => {
setValue((preValue) => {
if (preValue !== initialValue) {
return initialValue;
}
return preValue;
});
}, [initialValue]);

return (
<Select onValueChange={handleChange} value={value} key={key}>
<FormControlWidget>
<SelectTrigger
className="bg-colors-background-inverse-weak"
value={value}
onReset={handleReset}
>
<SelectValue placeholder="Select a verified email to display" />
</SelectTrigger>
</FormControlWidget>
<SelectContent>
{options.map((o, idx) => {
if ('value' in o) {
return (
<SelectItem
value={o.value as RAGFlowSelectOptionType['value']}
key={o.value}
disabled={o.disabled}
>
{o.label}
</SelectItem>
);
}

return (
<SelectGroup key={idx}>
<SelectLabel>{o.label}</SelectLabel>
{o.options.map((x) => (
<SelectItem value={x.value} key={x.value} disabled={x.disabled}>
{x.label}
</SelectItem>
))}
</SelectGroup>
);
})}
</SelectContent>
</Select>
);
}

+ 17
- 19
web/src/pages/dataset/testing/testing-form.tsx View File

@@ -14,16 +14,20 @@ import {
FormLabel,
FormMessage,
} from '@/components/ui/form';
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from '@/components/ui/select';
import { RAGFlowSelect } from '@/components/ui/select';
import { FormSlider } from '@/components/ui/slider';
import { Textarea } from '@/components/ui/textarea';

const options = [
{ label: 'xx', value: 'xx' },
{ label: 'ii', value: 'ii' },
];

const groupOptions = [
{ label: 'scsdv', options },
{ label: 'thtyu', options: [{ label: 'jj', value: 'jj' }] },
];

const formSchema = z.object({
username: z.number().min(2, {
message: 'Username must be at least 2 characters.',
@@ -95,18 +99,12 @@ export default function TestingForm() {
render={({ field }) => (
<FormItem>
<FormLabel>Username</FormLabel>
<Select onValueChange={field.onChange} defaultValue={field.value}>
<FormControl>
<SelectTrigger className="bg-colors-background-inverse-weak">
<SelectValue placeholder="Select a verified email to display" />
</SelectTrigger>
</FormControl>
<SelectContent>
<SelectItem value="m@example.com">m@example.com</SelectItem>
<SelectItem value="m@google.com">m@google.com</SelectItem>
<SelectItem value="m@support.com">m@support.com</SelectItem>
</SelectContent>
</Select>
<RAGFlowSelect
value={field.value}
onChange={field.onChange}
FormControlComponent={FormControl}
options={groupOptions}
></RAGFlowSelect>
<FormDescription>
This is your public display name.
</FormDescription>

+ 1
- 1
web/src/pages/flow/canvas/node/node-header.tsx View File

@@ -59,7 +59,7 @@ const NodeHeader = ({
>
<OperatorIcon
name={label as Operator}
color={operatorMap[label as Operator].color}
color={operatorMap[label as Operator]?.color}
></OperatorIcon>
<span className="truncate text-center font-semibold text-sm">
{name}

Loading…
Cancel
Save