From 1cf24be04b1cf31dab1025a2238c16f1e8dca1a9 Mon Sep 17 00:00:00 2001 From: dcc123456 <1243304602@qq.com> Date: Fri, 4 Jul 2025 15:11:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:Optimized=20the=20style=20of=20the=20datase?= =?UTF-8?q?t=20configuration=20page=20and=20added=20the=20l=E2=80=A6=20(#8?= =?UTF-8?q?655)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ### 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) --- web/src/locales/en.ts | 1 + web/src/locales/zh-traditional.ts | 1 + web/src/locales/zh.ts | 1 + web/src/pages/dataset/dataset/index.tsx | 15 ++- .../dataset/dataset/use-select-filters.ts | 3 +- .../dataset/setting/chunk-method-form.tsx | 15 ++- .../pages/dataset/setting/general-form.tsx | 115 +++++++----------- web/src/pages/dataset/setting/index.tsx | 2 +- 8 files changed, 71 insertions(+), 82 deletions(-) diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts index 399898c6c..9397b73d6 100644 --- a/web/src/locales/en.ts +++ b/web/src/locales/en.ts @@ -207,6 +207,7 @@ export default { 'Update your knowledge base configuration here, particularly the chunking method.', name: 'Knowledge base name', photo: 'Knowledge base photo', + photoTip: 'You can upload a file with 4 MB', description: 'Description', language: 'Document language', languageMessage: 'Please input your language!', diff --git a/web/src/locales/zh-traditional.ts b/web/src/locales/zh-traditional.ts index da38bdef3..1d2662a26 100644 --- a/web/src/locales/zh-traditional.ts +++ b/web/src/locales/zh-traditional.ts @@ -205,6 +205,7 @@ export default { titleDescription: '在這裡更新您的知識庫詳細信息，尤其是切片方法。', name: '知識庫名稱', photo: '知識庫圖片', + photoTip: '你可以上傳4MB的文件', description: '描述', language: '文件語言', languageMessage: '請輸入語言', diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.ts index c9ebfdb42..eca66c4e4 100644 --- a/web/src/locales/zh.ts +++ b/web/src/locales/zh.ts @@ -205,6 +205,7 @@ export default { titleDescription: '在这里更新您的知识库详细信息，尤其是切片方法。', name: '知识库名称', photo: '知识库图片', + photoTip: '你可以上传4MB的文件', description: '描述', language: '文档语言', languageMessage: '请输入语言', diff --git a/web/src/pages/dataset/dataset/index.tsx b/web/src/pages/dataset/dataset/index.tsx index 41d5050fd..8ceeea173 100644 --- a/web/src/pages/dataset/dataset/index.tsx +++ b/web/src/pages/dataset/dataset/index.tsx @@ -12,7 +12,9 @@ import { } from '@/components/ui/dropdown-menu'; import { useRowSelection } from '@/hooks/logic-hooks/use-row-selection'; import { useFetchDocumentList } from '@/hooks/use-document-request'; +import { IDocumentInfo } from '@/interfaces/database/document'; import { Upload } from 'lucide-react'; +import { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { DatasetTable } from './dataset-table'; import { useBulkOperateDataset } from './use-bulk-operate-dataset'; @@ -40,7 +42,16 @@ export default function Dataset() { handleFilterSubmit, loading, } = useFetchDocumentList(); - const { filters } = useSelectDatasetFilters(); + const { filters, documents: filteredDocuments } = useSelectDatasetFilters(); + const [datasetInfo, setDatasetInfo] = useState(documents); + + useMemo(() => { + setDatasetInfo(documents); + }, [documents]); + + useMemo(() => { + setDatasetInfo(filteredDocuments); + }, [filteredDocuments]); const { createLoading, @@ -100,7 +111,7 @@ export default function Dataset() { )} { return [ { field: 'type', label: 'File Type', list: fileTypes }, @@ -27,5 +26,5 @@ export function useSelectDatasetFilters() { ]; }, [fileStatus, fileTypes]); - return { fileTypes, fileStatus, filters }; + return { fileTypes, fileStatus, filters, documents }; } diff --git a/web/src/pages/dataset/setting/chunk-method-form.tsx b/web/src/pages/dataset/setting/chunk-method-form.tsx index 1f9ccb229..1e5e59c2d 100644 --- a/web/src/pages/dataset/setting/chunk-method-form.tsx +++ b/web/src/pages/dataset/setting/chunk-method-form.tsx @@ -70,15 +70,22 @@ export function ChunkMethodForm() {
-
+
+
diff --git a/web/src/pages/dataset/setting/general-form.tsx b/web/src/pages/dataset/setting/general-form.tsx index e546402bd..69dd82079 100644 --- a/web/src/pages/dataset/setting/general-form.tsx +++ b/web/src/pages/dataset/setting/general-form.tsx @@ -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() { )} /> - { - // null initialize empty string - if (typeof field.value === 'object' && !field.value) { - form.setValue('description', ' '); - } - return ( - -
- - {t('flow.description')} - - - - -
-
-
- -
- - ); - }} - /> ( + render={() => (
{t('setting.avatar')} - <> +
{!avatarBase64Str ? (
@@ -126,7 +99,7 @@ export function GeneralForm() {
) : (
- +
- +
+ {t('knowledgeConfiguration.photoTip')} +
+
@@ -172,54 +148,48 @@ export function GeneralForm() { /> ( - - - {t('knowledgeConfiguration.permissions')} - - - - - - - - - {t('knowledgeConfiguration.me')} - - - - - - - - {t('knowledgeConfiguration.team')} - - - - - - - )} + name="description" + render={({ field }) => { + // null initialize empty string + if (typeof field.value === 'object' && !field.value) { + form.setValue('description', ' '); + } + return ( + +
+ + {t('flow.description')} + + + + +
+
+
+ +
+ + ); + }} /> -
+
+
diff --git a/web/src/pages/dataset/setting/index.tsx b/web/src/pages/dataset/setting/index.tsx index 515ca214a..7c460bd75 100644 --- a/web/src/pages/dataset/setting/index.tsx +++ b/web/src/pages/dataset/setting/index.tsx @@ -102,7 +102,7 @@ export default function DatasetSettings() { setCurrentTab(val); }} > - +