fix: img compress (labring#546)

liuhonghui · Dec 3, 2023 · 9c77dfb · 9c77dfb
1 parent 7fc05af
commit 9c77dfb
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 7 deletions.
diff --git a/docSite/content/docs/installation/upgrading/463.md b/docSite/content/docs/installation/upgrading/463.md
@@ -30,3 +30,4 @@ curl --location --request POST 'https://{{host}}/api/admin/initv463' \
 4. 优化 - 流读取文件，防止内存溢出
 5. 优化 - 4v模型自动将 url 转 base64，本地也可调试
 6. 优化 - 图片压缩等级
+7. 修复 - 图片压缩失败报错，防止文件读取过程卡死。
diff --git a/projects/app/src/pages/api/core/chat/update.ts b/projects/app/src/pages/api/core/chat/update.ts
@@ -13,10 +13,13 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
 
     await authChat({ req, authToken: true, chatId });
 
-    await MongoChat.findOneAndUpdate({ chatId }, {
-      ...(customTitle && { customTitle }),
-      ...(top && { top })
-    });
+    await MongoChat.findOneAndUpdate(
+      { chatId },
+      {
+        ...(customTitle !== undefined && { customTitle }),
+        ...(top !== undefined && { top })
+      }
+    );
     jsonRes(res);
   } catch (err) {
     jsonRes(res, {

diff --git a/projects/app/src/pages/chat/index.tsx b/projects/app/src/pages/chat/index.tsx
@@ -328,7 +328,7 @@ const Chat = ({ appId, chatId }: { appId: string; chatId: string }) => {
               }}
               onSetCustomTitle={async (e) => {
                 try {
-                  await putChatHistory({
+                  putChatHistory({
                     chatId: e.chatId,
                     customTitle: e.title
                   });

diff --git a/projects/app/src/pages/dataset/detail/components/Import/ImportModal.tsx b/projects/app/src/pages/dataset/detail/components/Import/ImportModal.tsx
@@ -84,8 +84,8 @@ const ImportData = ({
       title={<Box {...TitleStyle}>{t('dataset.data.File import')}</Box>}
       isOpen
       isCentered
-      maxW={['90vw', '85vw']}
-      w={['90vw', '85vw']}
+      maxW={['90vw', 'min(1440px,85vw)']}
+      w={['90vw', 'min(1440px,85vw)']}
       h={'90vh'}
     >
       <ModalCloseButton onClick={onClose} />

diff --git a/projects/app/src/web/common/file/controller.ts b/projects/app/src/web/common/file/controller.ts
@@ -92,6 +92,7 @@ export const compressBase64ImgAndUpload = ({
         reject(error);
       }
     };
+    img.onerror = reject;
   });
 };
 export const compressImgFileAndUpload = async ({

diff --git a/projects/app/src/web/common/file/utils.ts b/projects/app/src/web/common/file/utils.ts
@@ -187,13 +187,15 @@ export const formatMarkdown = async (rawText: string = '') => {
           maxH: 4329,
           maxSize: 1024 * 1024 * 5
         });
+
         rawText = rawText.replace(base64, str);
       } catch (error) {
         rawText = rawText.replace(base64, '');
         rawText = rawText.replace(/!\[.*\]\(\)/g, '');
       }
     })
   );
+
   // Remove white space on both sides of the picture
   const trimReg = /\s*(!\[.*\]\(.*\))\s*/g;
   if (trimReg.test(rawText)) {