From 0af57ff772e7e38d71ca0276fa23892446332760 Mon Sep 17 00:00:00 2001
From: _Chenbing <39197918+muzilib@users.noreply.github.com>
Date: Thu, 21 Aug 2025 16:57:46 +0800
Subject: [PATCH] fix(dataset, next-chats): Fix data form data acquisition
 logic And Optimize the chat settings interface and add language selection
 (#9629)

### What problem does this PR solve?

fix(dataset): data form data acquisition logic
fix(next-chats): Optimize the chat settings interface and add language
selection

- Replace form.formControl.trigger with form.trigger
- Use form.getValues() instead of form.formState.values
- Add language selection to support multiple languages
- Add default chat settings values
- Add new settings: icon, description, knowledge base ID, etc.

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
- [x] New Feature (non-breaking change which adds functionality)
- [ ] Documentation Update
- [ ] Refactoring
- [ ] Performance Improvement
- [ ] Other (please describe):
---
 .../pages/dataset/setting/general-form.tsx    |  4 +--
 .../chat/app-settings/chat-basic-settings.tsx | 36 +++++++++++++++++++
 .../chat/app-settings/chat-settings.tsx       |  5 +++
 .../app-settings/use-chat-setting-schema.tsx  |  6 ++--
 4 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/web/src/pages/dataset/setting/general-form.tsx b/web/src/pages/dataset/setting/general-form.tsx
index ad5e70b89..db64d0388 100644
--- a/web/src/pages/dataset/setting/general-form.tsx
+++ b/web/src/pages/dataset/setting/general-form.tsx
@@ -187,8 +187,8 @@ export function GeneralForm() {
           disabled={submitLoading}
           onClick={() => {
             (async () => {
-              let isValidate = await form.formControl.trigger('name');
-              const { name, description } = form.formState.values;
+              let isValidate = await form.trigger('name');
+              const { name, description } = form.getValues();
               const avatar = avatarBase64Str;
 
               if (isValidate) {
diff --git a/web/src/pages/next-chats/chat/app-settings/chat-basic-settings.tsx b/web/src/pages/next-chats/chat/app-settings/chat-basic-settings.tsx
index c2df72351..9339a25e1 100644
--- a/web/src/pages/next-chats/chat/app-settings/chat-basic-settings.tsx
+++ b/web/src/pages/next-chats/chat/app-settings/chat-basic-settings.tsx
@@ -14,6 +14,7 @@ import {
 } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
 import { Textarea } from '@/components/ui/textarea';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
 import { useTranslate } from '@/hooks/common-hooks';
 import { useFormContext } from 'react-hook-form';
 
@@ -21,6 +22,17 @@ export default function ChatBasicSetting() {
   const { t } = useTranslate('chat');
   const form = useFormContext();
 
+  const languageOptions = [
+    { value: 'English', label: 'English' },
+    { value: 'Chinese', label: 'Chinese' },
+    { value: 'Spanish', label: 'Spanish' },
+    { value: 'French', label: 'French' },
+    { value: 'German', label: 'German' },
+    { value: 'Japanese', label: 'Japanese' },
+    { value: 'Korean', label: 'Korean' },
+    { value: 'Vietnamese', label: 'Vietnamese' },
+  ];
+
   return (
     <div className="space-y-8">
       <FormField
@@ -55,6 +67,30 @@ export default function ChatBasicSetting() {
           </FormItem>
         )}
       />
+      <FormField
+        control={form.control}
+        name="language"
+        render={({ field }) => (
+          <FormItem>
+            <FormLabel>{t('language')}</FormLabel>
+            <Select onValueChange={field.onChange} defaultValue={field.value}>
+              <FormControl>
+                <SelectTrigger>
+                  <SelectValue placeholder={t('common.languagePlaceholder')} />
+                </SelectTrigger>
+              </FormControl>
+              <SelectContent>
+                {languageOptions.map((option) => (
+                  <SelectItem key={option.value} value={option.value}>
+                    {option.label}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+            <FormMessage />
+          </FormItem>
+        )}
+      />
       <FormField
         control={form.control}
         name="description"
diff --git a/web/src/pages/next-chats/chat/app-settings/chat-settings.tsx b/web/src/pages/next-chats/chat/app-settings/chat-settings.tsx
index 3530a3c4a..87e9bf8b5 100644
--- a/web/src/pages/next-chats/chat/app-settings/chat-settings.tsx
+++ b/web/src/pages/next-chats/chat/app-settings/chat-settings.tsx
@@ -35,13 +35,18 @@ export function ChatSettings({ switchSettingVisible }: ChatSettingsProps) {
     shouldUnregister: true,
     defaultValues: {
       name: '',
+      icon: [],
       language: 'English',
+      description: '',
+      kb_ids: [],
       prompt_config: {
         quote: true,
         keyword: false,
         tts: false,
         use_kg: false,
         refine_multiturn: true,
+        system: '',
+        parameters: [],
       },
       top_n: 8,
       vector_similarity_weight: 0.2,
diff --git a/web/src/pages/next-chats/chat/app-settings/use-chat-setting-schema.tsx b/web/src/pages/next-chats/chat/app-settings/use-chat-setting-schema.tsx
index 17d68c4a5..d92f013ad 100644
--- a/web/src/pages/next-chats/chat/app-settings/use-chat-setting-schema.tsx
+++ b/web/src/pages/next-chats/chat/app-settings/use-chat-setting-schema.tsx
@@ -34,11 +34,11 @@ export function useChatSettingSchema() {
     name: z.string().min(1, { message: t('assistantNameMessage') }),
     icon: z.array(z.instanceof(File)),
     language: z.string().min(1, {
-      message: 'Username must be at least 2 characters.',
+      message: t('languageMessage'),
     }),
-    description: z.string(),
+    description: z.string().optional(),
     kb_ids: z.array(z.string()).min(0, {
-      message: 'Username must be at least 1 characters.',
+      message: t('knowledgeBasesMessage'),
     }),
     prompt_config: promptConfigSchema,
     ...rerankFormSchema,