fix:Optimized the style of the dataset configuration page and added the l… (#8655)

### What problem does this PR solve?

Optimized the style of the dataset configuration page and added the
logic of cancelling submission
[#3221](https://github.com/infiniflow/ragflow/issues/3221)

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
This commit is contained in:
dcc123456
2025-07-04 15:11:30 +08:00
committed by GitHub
parent b382b63f9a
commit 1cf24be04b
8 changed files with 71 additions and 82 deletions

View File

@ -9,7 +9,6 @@ import {
FormMessage,
} from '@/components/ui/form';
import { Input } from '@/components/ui/input';
import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group';
import { useUpdateKnowledge } from '@/hooks/knowledge-hooks';
import { transformFile2Base64 } from '@/utils/file-util';
import { Loader2Icon, Pencil, Upload } from 'lucide-react';
@ -79,43 +78,17 @@ export function GeneralForm() {
</FormItem>
)}
/>
<FormField
control={form.control}
name="description"
render={({ field }) => {
// null initialize empty string
if (typeof field.value === 'object' && !field.value) {
form.setValue('description', ' ');
}
return (
<FormItem className="items-center space-y-0">
<div className="flex">
<FormLabel className="text-sm text-muted-foreground whitespace-nowrap w-1/4">
{t('flow.description')}
</FormLabel>
<FormControl className="w-3/4">
<Input {...field}></Input>
</FormControl>
</div>
<div className="flex pt-1">
<div className="w-1/4"></div>
<FormMessage />
</div>
</FormItem>
);
}}
/>
<FormField
control={form.control}
name="avatar"
render={({ field }) => (
render={() => (
<FormItem className="items-center space-y-0">
<div className="flex">
<FormLabel className="text-sm text-muted-foreground whitespace-nowrap w-1/4">
{t('setting.avatar')}
</FormLabel>
<FormControl className="w-3/4">
<>
<div className="flex justify-start items-end space-x-2">
<div className="relative group">
{!avatarBase64Str ? (
<div className="w-[64px] h-[64px] grid place-content-center border border-dashed rounded-md">
@ -126,7 +99,7 @@ export function GeneralForm() {
</div>
) : (
<div className="w-[64px] h-[64px] relative grid place-content-center">
<Avatar className="w-[64px] h-[64px]">
<Avatar className="w-[64px] h-[64px] rounded-md">
<AvatarImage
className=" block"
src={avatarBase64Str}
@ -160,7 +133,10 @@ export function GeneralForm() {
}}
/>
</div>
</>
<div className="margin-1 text-muted-foreground">
{t('knowledgeConfiguration.photoTip')}
</div>
</div>
</FormControl>
</div>
<div className="flex pt-1">
@ -172,54 +148,48 @@ export function GeneralForm() {
/>
<FormField
control={form.control}
name="permission"
render={({ field }) => (
<FormItem className="flex items-center space-y-0">
<FormLabel
className="text-sm text-muted-foreground whitespace-nowrap w-1/4"
tooltip={t('knowledgeConfiguration.permissionsTip')}
>
{t('knowledgeConfiguration.permissions')}
</FormLabel>
<FormControl className="w-3/4">
<RadioGroup
onValueChange={field.onChange}
value={field.value}
className="flex space-y-1 gap-5"
>
<FormItem className="flex items-center space-x-1 space-y-0">
<FormControl>
<RadioGroupItem value="me" />
</FormControl>
<FormLabel className="font-normal">
{t('knowledgeConfiguration.me')}
</FormLabel>
</FormItem>
<FormItem className="flex items-center space-x-1 space-y-0">
<FormControl>
<RadioGroupItem value="team" />
</FormControl>
<FormLabel className="font-normal">
{t('knowledgeConfiguration.team')}
</FormLabel>
</FormItem>
</RadioGroup>
</FormControl>
<FormMessage />
</FormItem>
)}
name="description"
render={({ field }) => {
// null initialize empty string
if (typeof field.value === 'object' && !field.value) {
form.setValue('description', ' ');
}
return (
<FormItem className="items-center space-y-0">
<div className="flex">
<FormLabel className="text-sm text-muted-foreground whitespace-nowrap w-1/4">
{t('flow.description')}
</FormLabel>
<FormControl className="w-3/4">
<Input {...field}></Input>
</FormControl>
</div>
<div className="flex pt-1">
<div className="w-1/4"></div>
<FormMessage />
</div>
</FormItem>
);
}}
/>
</FormContainer>
<div className="text-right pt-4">
<div className="text-right pt-4 flex justify-end gap-3">
<Button
type="reset"
className="bg-transparent text-color-white hover:bg-transparent border-gray-500 border-[1px]"
onClick={() => {
form.reset();
}}
>
{t('knowledgeConfiguration.cancel')}
</Button>
<Button
type="button"
disabled={submitLoading}
onClick={() => {
// console.log('form.formControl: ', form.formState.values);
(async () => {
let isValidate = await form.formControl.trigger('name');
// console.log(isValidate);
const { name, description, permission } = form.formState.values;
const { name, description } = form.formState.values;
const avatar = avatarBase64Str;
if (isValidate) {
@ -228,7 +198,6 @@ export function GeneralForm() {
parser_id,
name,
description,
permission,
avatar,
});
}
@ -236,7 +205,7 @@ export function GeneralForm() {
}}
>
{submitLoading && <Loader2Icon className="animate-spin" />}
{t('common.submit')}
{t('knowledgeConfiguration.save')}
</Button>
</div>
</>