@egova-mobile/app-media-utils 0.0.6 → 0.0.7

package/dist/image/image-processor.d.ts

@@ -19,7 +19,7 @@ export declare class ImageProcessor {
      * 根据 MIME 类型获取文件扩展名
      */
     private getExtensionFromMimeType;
-    compress(canvas: HTMLCanvasElement, filename: string, lastModified: number, type: string, quality: number, lastCompressFileSize?: number): Promise<File>;
+    compress(canvas: HTMLCanvasElement, filename: string, lastModified: number, type: string, quality: number, lastCompressFileSize?: number, originalFileType?: string): Promise<File>;
     /**
      * 浮点型数据比较大小
      */

package/dist/image/image-util.d.ts

@@ -33,7 +33,7 @@ export declare function canvas2Image(canvas: HTMLCanvasElement, type?: string, q
  * @param quality
  * @see {@link https://meshworld.in/convert-canvas-to-an-image-using-javascript/}
  */
-export declare function canvas2File(canvas: HTMLCanvasElement, fileName: string, lastModified: number, type?: string, quality?: number): Promise<File>;
+export declare function canvas2File(canvas: HTMLCanvasElement, fileName: string, lastModified: number, type?: string, quality?: number, forceFileType?: string): Promise<File>;
 export type ResizeResultType = 'image' | 'canvas';
 /**
  * 缩放图片

package/dist/index.cjs.js

@@ -1384,18 +1384,20 @@ function canvas2Image(canvas, type = "image/jpeg", quality = 0.8) {
   image.src = canvas.toDataURL(type, quality);
   return Promise.resolve(image);
 }
-function canvas2File(canvas, fileName, lastModified, type = "image/jpeg", quality = 0.8) {
+function canvas2File(canvas, fileName, lastModified, type = "image/jpeg", quality = 0.8, forceFileType) {
   return new Promise((resolve, reject) => {
+    const blobType = type === "image/gif" ? "image/png" : type;
     canvas.toBlob(
       (blob) => {
         if (!blob) {
           reject(new Error("canvas文件导出失败"));
         } else {
-          const file = new File([blob], fileName, { lastModified, type });
+          const fileType = forceFileType || type;
+          const file = new File([blob], fileName, { lastModified, type: fileType });
           resolve(file);
         }
       },
-      type,
+      blobType,
       quality
     );
   });
@@ -1509,7 +1511,10 @@ var ImageProcessor = class {
         exportFilename,
         lastModified,
         fileType,
-        DEFAULT_JPEG_QUALITY
+        DEFAULT_JPEG_QUALITY,
+        -1,
+        originalFileType
+        // 传入原始文件类型，用于GIF等特殊格式
       );
     });
   }
@@ -1528,8 +1533,9 @@ var ImageProcessor = class {
     };
     return mimeToExt[mimeType] || "jpg";
   }
-  compress(canvas, filename, lastModified, type, quality, lastCompressFileSize = -1) {
-    return canvas2File(canvas, filename, lastModified, type, quality).then(
+  compress(canvas, filename, lastModified, type, quality, lastCompressFileSize = -1, originalFileType) {
+    const forceFileType = originalFileType === "image/gif" ? originalFileType : void 0;
+    return canvas2File(canvas, filename, lastModified, type, quality, forceFileType).then(
       (file) => {
         let qualityStep = JPEG_QUALITY_STEP;
         if (file.size > this.compressOptions.photoFileSizeLimit * 1024) {
@@ -1549,7 +1555,8 @@ var ImageProcessor = class {
             lastModified,
             type,
             this.roundToDecimalPlace(nextCompressQuality, 2),
-            file.size
+            file.size,
+            originalFileType
           );
         } else {
           return Promise.resolve(file);

package/dist/index.esm.mjs

@@ -1359,18 +1359,20 @@ function canvas2Image(canvas, type = "image/jpeg", quality = 0.8) {
   image.src = canvas.toDataURL(type, quality);
   return Promise.resolve(image);
 }
-function canvas2File(canvas, fileName, lastModified, type = "image/jpeg", quality = 0.8) {
+function canvas2File(canvas, fileName, lastModified, type = "image/jpeg", quality = 0.8, forceFileType) {
   return new Promise((resolve, reject) => {
+    const blobType = type === "image/gif" ? "image/png" : type;
     canvas.toBlob(
       (blob) => {
         if (!blob) {
           reject(new Error("canvas文件导出失败"));
         } else {
-          const file = new File([blob], fileName, { lastModified, type });
+          const fileType = forceFileType || type;
+          const file = new File([blob], fileName, { lastModified, type: fileType });
           resolve(file);
         }
       },
-      type,
+      blobType,
       quality
     );
   });
@@ -1484,7 +1486,10 @@ var ImageProcessor = class {
         exportFilename,
         lastModified,
         fileType,
-        DEFAULT_JPEG_QUALITY
+        DEFAULT_JPEG_QUALITY,
+        -1,
+        originalFileType
+        // 传入原始文件类型，用于GIF等特殊格式
       );
     });
   }
@@ -1503,8 +1508,9 @@ var ImageProcessor = class {
     };
     return mimeToExt[mimeType] || "jpg";
   }
-  compress(canvas, filename, lastModified, type, quality, lastCompressFileSize = -1) {
-    return canvas2File(canvas, filename, lastModified, type, quality).then(
+  compress(canvas, filename, lastModified, type, quality, lastCompressFileSize = -1, originalFileType) {
+    const forceFileType = originalFileType === "image/gif" ? originalFileType : void 0;
+    return canvas2File(canvas, filename, lastModified, type, quality, forceFileType).then(
       (file) => {
         let qualityStep = JPEG_QUALITY_STEP;
         if (file.size > this.compressOptions.photoFileSizeLimit * 1024) {
@@ -1524,7 +1530,8 @@ var ImageProcessor = class {
             lastModified,
             type,
             this.roundToDecimalPlace(nextCompressQuality, 2),
-            file.size
+            file.size,
+            originalFileType
           );
         } else {
           return Promise.resolve(file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@egova-mobile/app-media-utils",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.mjs",