From e9d85b007c9022b48981b8a7deccce04e4380955 Mon Sep 17 00:00:00 2001 From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com> Date: Tue, 9 Apr 2024 15:56:01 +0800 Subject: [PATCH] Pr@main@fix bugs (#38) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 文件上传限制文件大小 * fix: 浮窗模式的LOGO更新 * fix: 上传文档大小扩大到100MB * fix: 创建完知识库，点击设置页面没有保存按钮 * fix: 修复提示问题 --- apps/application/template/embed.js | 12 ++++++++---- apps/common/handle/impl/doc_split_handle.py | 10 +++++----- .../serializers/document_serializers.py | 4 ++-- ui/src/api/document.ts | 11 ++++++----- ui/src/views/dataset/CreateDataset.vue | 3 ++- ui/src/views/dataset/DatasetSetting.vue | 4 +--- .../dataset/component/UploadComponent.vue | 18 ++++++++++++++++-- 7 files changed, 40 insertions(+), 22 deletions(-) diff --git a/apps/application/template/embed.js b/apps/application/template/embed.js index 047f94b90..d9ae3f6cd 100644 --- a/apps/application/template/embed.js +++ b/apps/application/template/embed.js @@ -19,13 +19,16 @@ const guideHtml=` ` const chatButtonHtml= -`
+`
- - - + + + + + + @@ -43,6 +46,7 @@ const chatButtonHtml= +
` diff --git a/apps/common/handle/impl/doc_split_handle.py b/apps/common/handle/impl/doc_split_handle.py index d3d5ee6c7..4bb70896c 100644 --- a/apps/common/handle/impl/doc_split_handle.py +++ b/apps/common/handle/impl/doc_split_handle.py @@ -24,12 +24,12 @@ default_pattern_list = [re.compile('(?<=^)# .*|(?<=\\n)# .*'), re.compile('(? 1024 * 1024 * 10: - raise AppApiException(500, "上传文件最大不能超过10m") + if f.size > 1024 * 1024 * 100: + raise AppApiException(500, "上传文件最大不能超过100MB") @staticmethod def get_request_params_api(): diff --git a/ui/src/api/document.ts b/ui/src/api/document.ts index 3531426b1..618b357f3 100644 --- a/ui/src/api/document.ts +++ b/ui/src/api/document.ts @@ -75,11 +75,12 @@ const getAllDocument: (dataset_id: string, loading?: Ref) => Promise Promise> = ( - dataset_id, - data -) => { - return post(`${prefix}/${dataset_id}/document/_bach`, data) +const postDocument: ( + dataset_id: string, + data: any, + loading?: Ref +) => Promise> = (dataset_id, data, loading) => { + return post(`${prefix}/${dataset_id}/document/_bach`, data, {}, loading) } /** diff --git a/ui/src/views/dataset/CreateDataset.vue b/ui/src/views/dataset/CreateDataset.vue index 06cb28a18..beacabfd0 100644 --- a/ui/src/views/dataset/CreateDataset.vue +++ b/ui/src/views/dataset/CreateDataset.vue @@ -64,6 +64,7 @@ import useStore from '@/stores' const { dataset, document } = useStore() const baseInfo = computed(() => dataset.baseInfo) const webInfo = computed(() => dataset.webInfo) +const documentsFiles = computed(() => dataset.documentsFiles) const router = useRouter() const route = useRoute() @@ -141,7 +142,7 @@ function submit() { } } function back() { - if (baseInfo.value || webInfo.value || StepSecondRef.value?.paragraphList?.length > 0) { + if (baseInfo.value || webInfo.value || documentsFiles.value?.length > 0) { MsgConfirm(`提示`, `当前的更改尚未保存，确认退出吗?`, { confirmButtonText: '确认', type: 'warning' diff --git a/ui/src/views/dataset/DatasetSetting.vue b/ui/src/views/dataset/DatasetSetting.vue index e1d004ebe..153eb5d42 100644 --- a/ui/src/views/dataset/DatasetSetting.vue +++ b/ui/src/views/dataset/DatasetSetting.vue @@ -73,9 +73,7 @@
- - 保存 - + 保存
diff --git a/ui/src/views/dataset/component/UploadComponent.vue b/ui/src/views/dataset/component/UploadComponent.vue index aadac6b3c..ff4d95611 100644 --- a/ui/src/views/dataset/component/UploadComponent.vue +++ b/ui/src/views/dataset/component/UploadComponent.vue @@ -19,6 +19,7 @@ accept=".txt, .md, .csv, .log, .doc, .docx, .pdf" :limit="50" :on-exceed="onExceed" + :on-change="filehandleChange" >
@@ -27,7 +28,9 @@ 选择文件上传

-

支持格式：TXT、Markdown、PDF、DOC、DOCX，每次最多上传50个文件，每个文件不超过 10MB

+

+ 支持格式：TXT、Markdown、PDF、DOC、DOCX，每次最多上传50个文件，每个文件不超过 10MB +

若使用【高级分段】建议上传前规范文件的分段标识

@@ -57,7 +60,7 @@