diff --git a/web/src/components/list-filter-bar/filter-popover.tsx b/web/src/components/list-filter-bar/filter-popover.tsx index 056f2e115..de5bfb2ca 100644 --- a/web/src/components/list-filter-bar/filter-popover.tsx +++ b/web/src/components/list-filter-bar/filter-popover.tsx @@ -72,7 +72,7 @@ function CheckboxFormMultiple({
form.reset()} > {filters.map((x) => ( @@ -81,9 +81,11 @@ function CheckboxFormMultiple({ control={form.control} name={x.field} render={() => ( - -
- {x.label} + +
+ + {x.label} +
{x.list.map((item) => ( { return ( -
+
- - {item.label} - + {item.label} {item.count}
@@ -126,7 +126,7 @@ function CheckboxFormMultiple({ )} /> ))} -
+
); }); @@ -40,8 +54,10 @@ export default function ListFilterBar({ onChange, filters, className, + icon, }: PropsWithChildren> & { className?: string; + icon?: ReactNode; }) { const filterCount = useMemo(() => { return typeof value === 'object' && value !== null @@ -52,9 +68,16 @@ export default function ListFilterBar({ }, [value]); return ( -
- {leftPanel || title} -
+
+
+ {typeof icon === 'string' ? ( + + ) : ( + icon + )} + {leftPanel || title} +
+
{showFilter && ( @@ -64,6 +87,7 @@ export default function ListFilterBar({ {children}
diff --git a/web/src/components/ui/button.tsx b/web/src/components/ui/button.tsx index 962c1eb1d..860da6170 100644 --- a/web/src/components/ui/button.tsx +++ b/web/src/components/ui/button.tsx @@ -13,7 +13,7 @@ const buttonVariants = cva( destructive: 'bg-destructive text-destructive-foreground hover:bg-destructive/90', outline: - 'border border-colors-outline-sentiment-primary bg-background hover:bg-accent hover:text-accent-foreground', + 'border border-text-sub-title-invert bg-transparent hover:bg-accent hover:text-accent-foreground', secondary: 'bg-secondary text-secondary-foreground hover:bg-secondary/80', ghost: 'hover:bg-accent hover:text-accent-foreground', @@ -23,8 +23,8 @@ const buttonVariants = cva( icon: 'bg-colors-background-inverse-standard text-foreground hover:bg-colors-background-inverse-standard/80', }, size: { - default: 'h-10 px-4 py-2', - sm: 'h-9 rounded-md px-3', + default: 'h-8 px-2.5 py-1.5 ', + sm: 'h-6 rounded-sm px-2', lg: 'h-11 rounded-md px-8', icon: 'h-10 w-10', auto: 'h-full px-1', diff --git a/web/src/components/ui/input.tsx b/web/src/components/ui/input.tsx index 0f558fb84..309d3848e 100644 --- a/web/src/components/ui/input.tsx +++ b/web/src/components/ui/input.tsx @@ -12,7 +12,7 @@ const Input = React.forwardRef( { suffix?: React.ReactNode; } -const ExpandedInput = ({ suffix, prefix, ...props }: ExpandedInputProps) => { +const ExpandedInput = ({ + suffix, + prefix, + className, + ...props +}: ExpandedInputProps) => { return (
{ {prefix} { }; const SearchInput = (props: InputProps) => { - return } {...props}>; + return ( + } + {...props} + > + ); }; export { ExpandedInput, Input, SearchInput }; diff --git a/web/src/components/ui/pagination.tsx b/web/src/components/ui/pagination.tsx index 757ffaccc..aa71efee8 100644 --- a/web/src/components/ui/pagination.tsx +++ b/web/src/components/ui/pagination.tsx @@ -48,6 +48,7 @@ const PaginationLink = ({ - Previous ); PaginationPrevious.displayName = 'PaginationPrevious'; @@ -85,7 +85,6 @@ const PaginationNext = ({ className={cn('gap-1 pr-2.5', className)} {...props} > - Next ); diff --git a/web/src/components/ui/ragflow-pagination.tsx b/web/src/components/ui/ragflow-pagination.tsx index e232a7211..264df10f1 100644 --- a/web/src/components/ui/ragflow-pagination.tsx +++ b/web/src/components/ui/ragflow-pagination.tsx @@ -98,7 +98,7 @@ export function RAGFlowPagination({ }, [pageSize]); return ( -
+
Total {total} @@ -108,9 +108,14 @@ export function RAGFlowPagination({ {pages.map((x) => ( - {x} + + {x} + ))} @@ -126,6 +131,7 @@ export function RAGFlowPagination({ options={sizeChangerOptions} value={currentPageSize} onChange={handlePageSizeChange} + triggerClassName="bg-background-header-bar" > )}
diff --git a/web/src/components/ui/select.tsx b/web/src/components/ui/select.tsx index 3241c7a06..834371529 100644 --- a/web/src/components/ui/select.tsx +++ b/web/src/components/ui/select.tsx @@ -26,7 +26,7 @@ const SelectTrigger = React.forwardRef< span]:line-clamp-1', + 'flex h-8 w-full items-center justify-between rounded-md border border-input bg-colors-background-inverse-weak px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1', className, )} {...props} @@ -192,6 +192,7 @@ export type RAGFlowSelectProps = Partial & { allowClear?: boolean; placeholder?: React.ReactNode; contentProps?: React.ComponentPropsWithoutRef; + triggerClassName?: string; } & SelectPrimitive.SelectProps; /** @@ -223,6 +224,7 @@ export const RAGFlowSelect = forwardRef< placeholder, contentProps = {}, defaultValue, + triggerClassName, }, ref, ) { @@ -259,11 +261,11 @@ export const RAGFlowSelect = forwardRef<