Feat: Replace the submit form button with ButtonLoading #3221 (#7547)

### What problem does this PR solve?

Feat: Replace the submit form button with ButtonLoading #3221

### Type of change


- [x] New Feature (non-breaking change which adds functionality)
This commit is contained in:
balibabu
2025-05-09 10:17:36 +08:00
committed by GitHub
parent 332e6ffbd4
commit c2c63b07c3
7 changed files with 60 additions and 30 deletions

View File

@ -43,8 +43,8 @@ import {
import RaptorFormFields, {
showRaptorParseConfiguration,
} from '../parse-configuration/raptor-form-fields';
import { ButtonLoading } from '../ui/button';
import { Input } from '../ui/input';
import { LoadingButton } from '../ui/loading-button';
import { RAGFlowSelect } from '../ui/select';
import { DynamicPageRange } from './dynamic-page-range';
import { useFetchParserListOnMount, useShowAutoKeywords } from './hooks';
@ -324,9 +324,9 @@ export function ChunkMethodDialog({
</form>
</Form>
<DialogFooter>
<LoadingButton type="submit" form={FormId} loading={loading}>
<ButtonLoading type="submit" form={FormId} loading={loading}>
{t('common.save')}
</LoadingButton>
</ButtonLoading>
</DialogFooter>
</DialogContent>
</Dialog>

View File

@ -1,4 +1,4 @@
import { Button } from '@/components/ui/button';
import { ButtonLoading } from '@/components/ui/button';
import {
Dialog,
DialogContent,
@ -38,7 +38,11 @@ export function UploaderTabs({ setFiles }: UploaderTabsProps) {
);
}
export function FileUploadDialog({ hideModal, onOk }: IModalProps<File[]>) {
export function FileUploadDialog({
hideModal,
onOk,
loading,
}: IModalProps<File[]>) {
const { t } = useTranslation();
const [files, setFiles] = useState<File[]>([]);
@ -54,14 +58,9 @@ export function FileUploadDialog({ hideModal, onOk }: IModalProps<File[]>) {
</DialogHeader>
<UploaderTabs setFiles={setFiles}></UploaderTabs>
<DialogFooter>
<Button
type="submit"
variant={'tertiary'}
size={'sm'}
onClick={handleOk}
>
<ButtonLoading type="submit" onClick={handleOk} loading={loading}>
{t('common.save')}
</Button>
</ButtonLoading>
</DialogFooter>
</DialogContent>
</Dialog>

View File

@ -5,11 +5,11 @@ import {
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { LoadingButton } from '@/components/ui/loading-button';
import { IModalProps } from '@/interfaces/common';
import { TagRenameId } from '@/pages/add-knowledge/constant';
import { ReactNode } from 'react';
import { useTranslation } from 'react-i18next';
import { ButtonLoading } from '../ui/button';
import { RenameForm } from './rename-form';
export function RenameDialog({
@ -33,9 +33,9 @@ export function RenameDialog({
onOk={onOk}
></RenameForm>
<DialogFooter>
<LoadingButton type="submit" form={TagRenameId} loading={loading}>
<ButtonLoading type="submit" form={TagRenameId} loading={loading}>
{t('common.save')}
</LoadingButton>
</ButtonLoading>
</DialogFooter>
</DialogContent>
</Dialog>

View File

@ -3,6 +3,7 @@ import { cva, type VariantProps } from 'class-variance-authority';
import * as React from 'react';
import { cn } from '@/lib/utils';
import { Loader2 } from 'lucide-react';
const buttonVariants = cva(
'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
@ -57,4 +58,38 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
);
Button.displayName = 'Button';
export const ButtonLoading = React.forwardRef<
HTMLButtonElement,
ButtonProps & { loading?: boolean }
>(
(
{
className,
variant,
size,
asChild = false,
children,
loading = false,
disabled,
...props
},
ref,
) => {
const Comp = asChild ? Slot : 'button';
return (
<Comp
className={cn(buttonVariants({ variant, size, className }))}
ref={ref}
{...props}
disabled={loading || disabled}
>
{loading && <Loader2 className="animate-spin" />}
{children}
</Comp>
);
},
);
ButtonLoading.displayName = 'ButtonLoading';
export { Button, buttonVariants };