Refactor image dataset handling by improving internationalization strings, enhancing error messages, and streamlining the preview URL generation process.

ctrlz526 · ctrlz526 · commit 87d0338b940d · 2025-05-23T11:03:12.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -44,8 +44,4 @@ files/helm/fastgpt/fastgpt-0.1.0.tgz
 files/helm/fastgpt/charts/*.tgz
 
 tmp/
-coverage
-deploy/docker/aiproxy_pg
-deploy/docker/mongo
-deploy/docker/pg
-deploy
+coverage
diff --git a/deploy/docker/docker-compose/docker-compose b/deploy/docker/docker-compose/docker-compose
diff --git a/packages/web/i18n/en/common.json b/packages/web/i18n/en/common.json
@@ -185,6 +185,7 @@
   "comfirn_create": "Confirm Creation",
   "commercial_function_tip": "Please Upgrade to the Commercial Version to Use This Feature: https://doc.fastgpt.cn/docs/commercial/intro/",
   "common.Confirm Update": "Confirm update",
+  "common.Create Failed": "Failed to create a collection",
   "comon.Continue_Adding": "Continue Adding",
   "compliance.chat": "The content is generated by third-party AI and cannot be guaranteed to be true and accurate. It is for reference only.",
   "compliance.dataset": "Please ensure that your content strictly complies with relevant laws and regulations and avoid containing any illegal or infringing content. \nPlease be careful when uploading materials that may contain sensitive information.",
diff --git a/packages/web/i18n/en/dataset.json b/packages/web/i18n/en/dataset.json
@@ -1,4 +1,5 @@
 {
+  " error?.message || t('core.dataset.collection.Create Failed'),\n            status.core.dataset.collection.Create Failed": "",
   "Enable": "Enable",
   "add_file": "Import",
   "api_file": "API Dataset",
diff --git a/packages/web/i18n/en/file.json b/packages/web/i18n/en/file.json
@@ -1,9 +1,18 @@
 {
+  " t('core.dataset.collection.Create Success', { count.core.dataset.collection.Create Success": "",
+  " t('file.Please select the image to upload select the image to upload'),\n        status.file.Please select the image to upload select the image to upload": "Please select the image to upload select the image to upload",
+  "Action": "Please select the image to upload",
+  "All images import failed": "All pictures failed to import",
+  "Please select the image to upload": "Please select the image to upload",
+  "Please select the image to upload select the image to upload": "",
+  "Please wait for all files to upload": "Please wait for all files to be uploaded to complete",
   "bucket_chat": "Conversation Files",
   "bucket_file": "Dataset Documents",
   "click_to_view_raw_source": "Click to View Original Source",
+  "delete_image": "Delete pictures",
   "file_name": "Filename",
   "file_size": "Filesize",
+  "reached_max_file_count": "Maximum file count reached",
   "release_the_mouse_to_upload_the_file": "Release Mouse to Upload File",
   "select_and_drag_file_tip": "Click or Drag Files Here to Upload",
   "select_file_amount_limit": "You can select up to {{max}} files",
@@ -12,7 +21,7 @@
   "support_file_type": "Supports {{fileType}} file types",
   "support_max_count": "Supports up to {{maxCount}} files",
   "support_max_size": "Maximum file size is {{maxSize}}",
+  "upload_error_description": "Only multiple files or a single folder can be uploaded at a time",
   "upload_failed": "Upload Failed",
-  "reached_max_file_count": "Maximum file count reached",
-  "upload_error_description": "Only multiple files or a single folder can be uploaded at a time"
-}
+  "uploading": "Uploading..."
+}
diff --git a/packages/web/i18n/zh-CN/common.json b/packages/web/i18n/zh-CN/common.json
@@ -185,7 +185,7 @@
   "comfirn_create": "确认创建",
   "commercial_function_tip": "请升级商业版后使用该功能：https://doc.fastgpt.cn/docs/commercial/intro/",
   "common.Confirm Update": "确认更新",
-  "common.Create Failed": "创建失败",
+  "common.Create Failed": "创建集合失败",
   "common.error.unKnow": "未知问题",
   "comon.Continue_Adding": "继续添加",
   "compliance.chat": "内容由第三方 AI 生成，无法确保真实准确，仅供参考",
diff --git a/packages/web/i18n/zh-CN/file.json b/packages/web/i18n/zh-CN/file.json
@@ -1,9 +1,16 @@
 {
+  "Action": "请选择要上传的图片",
+  "All images import failed": "所有图片导入失败",
+  "Please select the image to upload": "请选择要上传的图片",
+  "Please wait for all files to upload": "请等待所有文件上传完成",
   "bucket_chat": "对话文件",
   "bucket_file": "知识库文件",
   "click_to_view_raw_source": "点击查看来源",
+  "count.core.dataset.collection.Create Success": "成功导入 {{count}} 张图片",
+  "delete_image": "删除图片",
   "file_name": "文件名",
   "file_size": "文件大小",
+  "reached_max_file_count": "已达到最大文件数量",
   "release_the_mouse_to_upload_the_file": "松开鼠标上传文件",
   "select_and_drag_file_tip": "点击或拖动文件到此处上传",
   "select_file_amount_limit": "最多选择 {{max}} 个文件",
@@ -12,7 +19,7 @@
   "support_file_type": "支持 {{fileType}} 类型文件",
   "support_max_count": "最多支持 {{maxCount}} 个文件",
   "support_max_size": "单个文件最大 {{maxSize}}",
+  "upload_error_description": "单次只支持上传多个文件或者一个文件夹",
   "upload_failed": "上传异常",
-  "reached_max_file_count": "已达到最大文件数量",
-  "upload_error_description": "单次只支持上传多个文件或者一个文件夹"
-}
+  "uploading": "正在上传..."
+}
diff --git a/packages/web/i18n/zh-Hant/common.json b/packages/web/i18n/zh-Hant/common.json
@@ -185,6 +185,7 @@
   "comfirn_create": "確認建立",
   "commercial_function_tip": "請升級為商業版後使用此功能：https://doc.fastgpt.cn/docs/commercial/intro/",
   "common.Confirm Update": "確認更新",
+  "common.Create Failed": "創建集合失敗",
   "comon.Continue_Adding": "繼續新增",
   "compliance.chat": "內容由第三方 AI 產生，無法保證其真實性與準確性，僅供參考。",
   "compliance.dataset": "請確保您的內容嚴格遵守相關法律法規，避免包含任何違法或侵權的內容。\n在上傳可能涉及敏感資訊的資料時請務必謹慎。",
diff --git a/packages/web/i18n/zh-Hant/dataset.json b/packages/web/i18n/zh-Hant/dataset.json
@@ -1,4 +1,5 @@
 {
+  " error?.message || t('core.dataset.collection.Create Failed'),\n            status.core.dataset.collection.Create Failed": "",
   "Enable": "啟用",
   "add_file": "新增文件",
   "api_file": "API 檔案庫",
diff --git a/packages/web/i18n/zh-Hant/file.json b/packages/web/i18n/zh-Hant/file.json
@@ -1,9 +1,18 @@
 {
+  " t('core.dataset.collection.Create Success', { count.core.dataset.collection.Create Success": "",
+  " t('file.Please select the image to upload select the image to upload'),\n        status.file.Please select the image to upload select the image to upload": "",
+  "Action": "請選擇要上傳的圖片",
+  "All images import failed": "所有圖片導入失敗",
+  "Please select the image to upload": "請選擇要上傳的圖片",
+  "Please select the image to upload select the image to upload": "",
+  "Please wait for all files to upload": "請等待所有文件上傳完成",
   "bucket_chat": "對話檔案",
   "bucket_file": "知識庫檔案",
   "click_to_view_raw_source": "點選檢視原始來源",
+  "delete_image": "刪除圖片",
   "file_name": "檔案名稱",
   "file_size": "檔案大小",
+  "reached_max_file_count": "已達檔案數量上限",
   "release_the_mouse_to_upload_the_file": "放開滑鼠以上傳檔案",
   "select_and_drag_file_tip": "點選或拖曳檔案至此處上傳",
   "select_file_amount_limit": "最多可選擇 {{max}} 個檔案",
@@ -12,7 +21,7 @@
   "support_file_type": "支援 {{fileType}} 格式的檔案",
   "support_max_count": "最多可支援 {{maxCount}} 個檔案",
   "support_max_size": "單一檔案大小上限為 {{maxSize}}",
+  "upload_error_description": "單次僅支援上傳多個檔案或一個資料夾",
   "upload_failed": "上傳失敗",
-  "reached_max_file_count": "已達檔案數量上限",
-  "upload_error_description": "單次僅支援上傳多個檔案或一個資料夾"
-}
+  "uploading": "正在上傳..."
+}
diff --git a/projects/app/src/pageComponents/dataset/detail/DataCard.tsx b/projects/app/src/pageComponents/dataset/detail/DataCard.tsx
@@ -55,31 +55,19 @@ const getImagePreviewUrl = async (
   datasetId: string
 ) => {
   try {
-    console.log('开始为图片生成预览URL:', { fileId, fileName, teamId });
-
     if (!fileId) {
-      console.error('fileId为空，无法生成预览URL');
       return '';
     }
-
-    // 通过API获取token，传递必要参数
     const token = await postGetFileToken({
       bucketName: 'dataset',
       fileId,
       teamId,
       datasetId
     });
-
-    // 添加域名前缀
-    const origin = window.location.origin; // 获取当前域名
-
-    // 使用与upload.ts相同的URL格式
+    const origin = window.location.origin;
     const previewUrl = `${origin}${ReadFileBaseUrl}/${encodeURIComponent(fileName)}?token=${token}`;
-    console.log('成功生成预览URL:', previewUrl);
-
     return previewUrl;
   } catch (error) {
-    console.error('创建图片预览URL失败:', error);
     return '';
   }
 };
@@ -268,85 +256,48 @@ const DataCard = () => {
     fetchDetailsAndCreateUrls();
   }, [datasetDataList, isImageCollection]);
 
-  // 判断是否为图片集合的函数
   const isImageCollection = useMemo(() => {
     if (!collection) return false;
-    // 检查metadata中是否有标记
     if (
       collection.metadata &&
       typeof collection.metadata === 'object' &&
       'isImageCollection' in collection.metadata
     ) {
       return collection.metadata.isImageCollection === true;
     }
-    // 集合名称判断（备选方案）
+    // Fallback: check collection name
     return collection.name?.includes('图片集合') || false;
   }, [collection]);
 
-  // 添加状态存储预览URLs
   const [imagePreviewUrls, setImagePreviewUrls] = useState<Record<string, string>>({});
 
-  // 在数据加载成功后生成预览URLs
   useEffect(() => {
     if (!datasetDataList.length) {
-      console.log('数据列表为空，不生成预览URL');
       return;
     }
-
     if (!isImageCollection) {
-      console.log('非图片集合，不生成预览URL');
       return;
     }
-
-    console.log('数据列表长度:', datasetDataList.length);
-    console.log(
-      '列表数据:',
-      datasetDataList.map((item) => ({
-        id: item._id,
-        q: item.q,
-        a: item.a,
-        imageFileId: item.imageFileId
-      }))
-    );
-
-    // 直接使用列表数据生成预览URL
     const fetchDetailsAndCreateUrls = async () => {
       const urlMap: Record<string, string> = {};
-
-      // 并行处理所有项目
       const previewPromises = datasetDataList.map(async (item) => {
         try {
-          // 直接检查列表数据中是否包含imageFileId
           if (item.imageFileId) {
-            console.log(`项目 ${item._id} 包含图片ID:`, {
-              imageFileId: item.imageFileId,
-              fileName: item.a || 'image.jpg'
-            });
-
             const previewUrl = await getImagePreviewUrl(
               item.imageFileId,
               item.a ?? 'image.jpg',
               item.teamId ?? '',
               item.datasetId
             );
-
             if (previewUrl) {
               urlMap[item._id] = previewUrl;
-              console.log(`生成项目 ${item._id} 的预览URL成功`);
             }
           }
-        } catch (error) {
-          console.error(`生成项目 ${item._id} 预览URL失败:`, error);
-        }
+        } catch (error) {}
       });
-
-      // 等待所有预览URL生成完成
       await Promise.all(previewPromises);
-
-      console.log(`成功生成 ${Object.keys(urlMap).length} 个预览URL`);
       setImagePreviewUrls(urlMap);
     };
-
     fetchDetailsAndCreateUrls();
   }, [datasetDataList, isImageCollection]);
 
@@ -520,7 +471,6 @@ const DataCard = () => {
 
                 {/* Data content */}
                 <Box wordBreak={'break-all'} fontSize={'sm'}>
-                  {/* 如果是图片数据且在图片集合中 */}
                   {isImageCollection ? (
                     <Box
                       display="flex"
@@ -533,7 +483,6 @@ const DataCard = () => {
                       bg="var(--Gray-Modern-100, #F4F4F7)"
                       gap="24px"
                     >
-                      {/* 图片区域 - 左侧 */}
                       <Box
                         width="420px"
                         flexShrink={0}
@@ -556,7 +505,6 @@ const DataCard = () => {
                             cursor="pointer"
                             _hover={{ transform: 'scale(1.02)' }}
                             onError={(e) => {
-                              console.error('图片加载失败:', imagePreviewUrls[item._id]);
                               e.currentTarget.style.display = 'none';
                             }}
                           />
@@ -572,8 +520,6 @@ const DataCard = () => {
                           </Box>
                         )}
                       </Box>
-
-                      {/* 描述文本 - 右侧 */}
                       <Box
                         flex="1 0 0"
                         color="var(--Gray-Modern-800, #1D2532)"
@@ -591,7 +537,6 @@ const DataCard = () => {
                     </Box>
                   ) : (
                     <>
-                      {/* 非图片集合的展示保持不变 */}
                       <Markdown source={item.q} isDisabled />
                       {!!item.a && (
                         <>
@@ -668,7 +613,6 @@ const DataCard = () => {
         </ScrollData>
       </Flex>
 
-      {/* 图片数据集的插入的输入模态框 */}
       {editDataId !== undefined &&
         collection &&
         (isImageCollection ? (
diff --git a/projects/app/src/pageComponents/dataset/detail/ImageDatasetInputModal.tsx b/projects/app/src/pageComponents/dataset/detail/ImageDatasetInputModal.tsx
diff --git a/projects/app/src/pageComponents/dataset/detail/Import/diffSource/ImageDataset.tsx b/projects/app/src/pageComponents/dataset/detail/Import/diffSource/ImageDataset.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ " error?.message \|\| t('core.dataset.collection.Create Failed'),\n status.core.dataset.collection.Create Failed": "",`
`2`	`3`	`"Enable": "Enable",`
`3`	`4`	`"add_file": "Import",`
`4`	`5`	`"api_file": "API Dataset",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ " error?.message \|\| t('core.dataset.collection.Create Failed'),\n status.core.dataset.collection.Create Failed": "",`
`2`	`3`	`"Enable": "啟用",`
`3`	`4`	`"add_file": "新增文件",`
`4`	`5`	`"api_file": "API 檔案庫",`