4.6.7 first pr (#726)

projects/app/src/web/common/file/controller.ts

@@ -1,10 +1,8 @@
 import { postUploadImg, postUploadFiles } from '@/web/common/file/api';
 import { UploadImgProps } from '@fastgpt/global/common/file/api';
 import { BucketNameEnum } from '@fastgpt/global/common/file/constants';
-import {
-  compressBase64ImgAndUpload as compressBase64ImgAndUploadControl,
-  type CompressImgProps
-} from '@fastgpt/web/common/file/img';
+import { preUploadImgProps } from '@fastgpt/global/common/file/api';
+import { compressBase64Img, type CompressImgProps } from '@fastgpt/web/common/file/img';
 
 /**
  * upload file to mongo gridfs
@@ -34,57 +32,45 @@ export const uploadFiles = ({
   });
 };
 
-export const getUploadMdImgController = ({
-  base64Img,
-  metadata
-}: {
-  base64Img: string;
-  metadata: Record<string, any>;
-}) =>
-  compressBase64ImgAndUpload({
-    base64Img,
+export const getUploadBase64ImgController = (props: CompressImgProps & UploadImgProps) =>
+  compressBase64Img({
     maxW: 4000,
     maxH: 4000,
     maxSize: 1024 * 1024 * 5,
-    metadata
+    ...props
   });
 
 /**
  * compress image. response base64
  * @param maxSize The max size of the compressed image
  */
-export const compressBase64ImgAndUpload = ({
-  expiredTime,
-  metadata,
-  shareId,
-  ...props
-}: UploadImgProps & CompressImgProps) => {
-  return compressBase64ImgAndUploadControl({
-    ...props,
-    uploadController: (base64Img) =>
-      postUploadImg({
-        shareId,
-        base64Img,
-        expiredTime,
-        metadata
-      })
-  });
-};
-export const compressImgFileAndUpload = async ({
-  file,
+export const compressBase64ImgAndUpload = async ({
+  base64Img,
   maxW,
   maxH,
   maxSize,
-  expiredTime,
-  shareId
-}: {
-  file: File;
-  maxW?: number;
-  maxH?: number;
-  maxSize?: number;
-  expiredTime?: Date;
-  shareId?: string;
-}) => {
+  ...props
+}: UploadImgProps & CompressImgProps) => {
+  const compressUrl = await compressBase64Img({
+    base64Img,
+    maxW,
+    maxH,
+    maxSize
+  });
+
+  return postUploadImg({
+    ...props,
+    base64Img: compressUrl
+  });
+};
+
+export const compressImgFileAndUpload = async ({
+  file,
+  ...props
+}: preUploadImgProps &
+  CompressImgProps & {
+    file: File;
+  }) => {
   const reader = new FileReader();
   reader.readAsDataURL(file);
 
@@ -94,16 +80,12 @@ export const compressImgFileAndUpload = async ({
     };
     reader.onerror = (err) => {
       console.log(err);
-      reject('压缩图片异常');
+      reject('Load image error');
     };
   });
 
   return compressBase64ImgAndUpload({
     base64Img,
-    maxW,
-    maxH,
-    maxSize,
-    expiredTime,
-    shareId
+    ...props
   });
 };