@egova-mobile/app-media-utils 0.0.2 → 0.0.4

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

@@ -14,5 +14,15 @@ export declare class ImageProcessor {
     private compressOptions;
     constructor(file: File, resizeOptions: ResizeOptions, watermarkOptions: WatermarkOptions, compressOptions: CompressOptions);
     process(): Promise<void | File>;
-    compress(canvas: HTMLCanvasElement, filename: string, lastModified: number, type: string, quality: number): Promise<File>;
+    compress(canvas: HTMLCanvasElement, filename: string, lastModified: number, type: string, quality: number, lastCompressFileSize?: number): Promise<File>;
+    /**
+     * 浮点型数据比较大小
+     */
+    compareFloats(a: number, b: number): number;
+    /**
+     * 浮点型数据保留小数(四舍五入)
+     * @param num 浮点型数据
+     * @param decimalPlaces 保留的小数位数
+     */
+    roundToDecimalPlace(num: number, decimalPlaces: number): number;
 }

package/dist/index.cjs.js

@@ -50,9 +50,9 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js
 var require_dayjs_min = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js"(exports, module2) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js"(exports, module2) {
     !function(t, e) {
       "object" == typeof exports && "undefined" != typeof module2 ? module2.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
     }(exports, function() {
@@ -344,9 +344,9 @@ var require_dayjs_min = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js
 var require_zh_cn = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js"(exports, module2) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js"(exports, module2) {
     !function(e, _) {
       "object" == typeof exports && "undefined" != typeof module2 ? module2.exports = _(require_dayjs_min()) : "function" == typeof define && define.amd ? define(["dayjs"], _) : (e = "undefined" != typeof globalThis ? globalThis : e || self).dayjs_locale_zh_cn = _(e.dayjs);
     }(exports, function(e) {
@@ -1226,15 +1226,19 @@ function drawGroupedWatermarks(canvas, watermarks, groupPosition) {
     }
     const contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
     let baseOrigin = new Point(contentPadding, contentPadding);
+    let titlePadding = 0;
     if (groupPosition === "center" /* Center */) {
       baseOrigin = new Point(
         contentPadding,
         Math.round((canvas.height - totalHeight) / 2)
       );
     } else if (groupPosition === "bottom" /* Bottom */) {
+      tiles.forEach((item) => {
+        titlePadding += item.style.paddingTop + item.style.paddingBottom;
+      });
       baseOrigin = new Point(
         contentPadding,
-        canvas.height - totalHeight - contentPadding
+        canvas.height - totalHeight - contentPadding - titlePadding
       );
     } else if (groupPosition === "top" /* Top */) {
       baseOrigin = new Point(contentPadding, contentPadding);
@@ -1502,16 +1506,28 @@ var ImageProcessor = class {
       );
     });
   }
-  compress(canvas, filename, lastModified, type, quality) {
+  compress(canvas, filename, lastModified, type, quality, lastCompressFileSize = -1) {
     return canvas2File(canvas, filename, lastModified, type, quality).then(
       (file) => {
-        if (file.size > this.compressOptions.photoFileSizeLimit * 1024 && quality - JPEG_QUALITY_STEP > MIN_JPEG_QUALITY) {
+        let qualityStep = JPEG_QUALITY_STEP;
+        if (file.size > this.compressOptions.photoFileSizeLimit * 1024) {
+          let factor = Math.floor(file.size / (1024 * this.compressOptions.photoFileSizeLimit));
+          if (factor > 1 && quality > MIN_JPEG_QUALITY) {
+            qualityStep = this.roundToDecimalPlace(JPEG_QUALITY_STEP * factor, 2);
+            let maxQualityStep = this.roundToDecimalPlace(quality - MIN_JPEG_QUALITY, 2);
+            qualityStep = Math.min(qualityStep, maxQualityStep);
+          }
+        }
+        let compressFileSizeChanged = lastCompressFileSize === -1 || file.size < lastCompressFileSize;
+        let nextCompressQuality = this.roundToDecimalPlace(quality - qualityStep, 2);
+        if (compressFileSizeChanged && file.size > this.compressOptions.photoFileSizeLimit * 1024 && this.compareFloats(nextCompressQuality, MIN_JPEG_QUALITY) >= 0) {
           return this.compress(
             canvas,
             filename,
             lastModified,
             type,
-            quality - JPEG_QUALITY_STEP
+            this.roundToDecimalPlace(nextCompressQuality, 2),
+            file.size
           );
         } else {
           return Promise.resolve(file);
@@ -1519,4 +1535,23 @@ var ImageProcessor = class {
       }
     );
   }
+  /**
+   * 浮点型数据比较大小
+   */
+  compareFloats(a, b) {
+    const diff = Math.abs(a - b);
+    if (diff < Number.EPSILON) {
+      return 0;
+    }
+    return a - b > 0 ? 1 : -1;
+  }
+  /**
+   * 浮点型数据保留小数(四舍五入)
+   * @param num 浮点型数据
+   * @param decimalPlaces 保留的小数位数
+   */
+  roundToDecimalPlace(num, decimalPlaces) {
+    const factor = Math.pow(10, decimalPlaces);
+    return Math.round(num * factor) / factor;
+  }
 };

package/dist/index.esm.mjs

@@ -44,9 +44,9 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js
 var require_dayjs_min = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/dayjs.min.js"(exports, module) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/dayjs.min.js"(exports, module) {
     !function(t, e) {
       "object" == typeof exports && "undefined" != typeof module ? module.exports = e() : "function" == typeof define && define.amd ? define(e) : (t = "undefined" != typeof globalThis ? globalThis : t || self).dayjs = e();
     }(exports, function() {
@@ -338,9 +338,9 @@ var require_dayjs_min = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js
+// ../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js
 var require_zh_cn = __commonJS({
-  "../../node_modules/.pnpm/dayjs@1.11.10/node_modules/dayjs/locale/zh-cn.js"(exports, module) {
+  "../../node_modules/.pnpm/dayjs@1.11.13/node_modules/dayjs/locale/zh-cn.js"(exports, module) {
     !function(e, _) {
       "object" == typeof exports && "undefined" != typeof module ? module.exports = _(require_dayjs_min()) : "function" == typeof define && define.amd ? define(["dayjs"], _) : (e = "undefined" != typeof globalThis ? globalThis : e || self).dayjs_locale_zh_cn = _(e.dayjs);
     }(exports, function(e) {
@@ -1201,15 +1201,19 @@ function drawGroupedWatermarks(canvas, watermarks, groupPosition) {
     }
     const contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
     let baseOrigin = new Point(contentPadding, contentPadding);
+    let titlePadding = 0;
     if (groupPosition === "center" /* Center */) {
       baseOrigin = new Point(
         contentPadding,
         Math.round((canvas.height - totalHeight) / 2)
       );
     } else if (groupPosition === "bottom" /* Bottom */) {
+      tiles.forEach((item) => {
+        titlePadding += item.style.paddingTop + item.style.paddingBottom;
+      });
       baseOrigin = new Point(
         contentPadding,
-        canvas.height - totalHeight - contentPadding
+        canvas.height - totalHeight - contentPadding - titlePadding
       );
     } else if (groupPosition === "top" /* Top */) {
       baseOrigin = new Point(contentPadding, contentPadding);
@@ -1477,16 +1481,28 @@ var ImageProcessor = class {
       );
     });
   }
-  compress(canvas, filename, lastModified, type, quality) {
+  compress(canvas, filename, lastModified, type, quality, lastCompressFileSize = -1) {
     return canvas2File(canvas, filename, lastModified, type, quality).then(
       (file) => {
-        if (file.size > this.compressOptions.photoFileSizeLimit * 1024 && quality - JPEG_QUALITY_STEP > MIN_JPEG_QUALITY) {
+        let qualityStep = JPEG_QUALITY_STEP;
+        if (file.size > this.compressOptions.photoFileSizeLimit * 1024) {
+          let factor = Math.floor(file.size / (1024 * this.compressOptions.photoFileSizeLimit));
+          if (factor > 1 && quality > MIN_JPEG_QUALITY) {
+            qualityStep = this.roundToDecimalPlace(JPEG_QUALITY_STEP * factor, 2);
+            let maxQualityStep = this.roundToDecimalPlace(quality - MIN_JPEG_QUALITY, 2);
+            qualityStep = Math.min(qualityStep, maxQualityStep);
+          }
+        }
+        let compressFileSizeChanged = lastCompressFileSize === -1 || file.size < lastCompressFileSize;
+        let nextCompressQuality = this.roundToDecimalPlace(quality - qualityStep, 2);
+        if (compressFileSizeChanged && file.size > this.compressOptions.photoFileSizeLimit * 1024 && this.compareFloats(nextCompressQuality, MIN_JPEG_QUALITY) >= 0) {
           return this.compress(
             canvas,
             filename,
             lastModified,
             type,
-            quality - JPEG_QUALITY_STEP
+            this.roundToDecimalPlace(nextCompressQuality, 2),
+            file.size
           );
         } else {
           return Promise.resolve(file);
@@ -1494,6 +1510,25 @@ var ImageProcessor = class {
       }
     );
   }
+  /**
+   * 浮点型数据比较大小
+   */
+  compareFloats(a, b) {
+    const diff = Math.abs(a - b);
+    if (diff < Number.EPSILON) {
+      return 0;
+    }
+    return a - b > 0 ? 1 : -1;
+  }
+  /**
+   * 浮点型数据保留小数(四舍五入)
+   * @param num 浮点型数据
+   * @param decimalPlaces 保留的小数位数
+   */
+  roundToDecimalPlace(num, decimalPlaces) {
+    const factor = Math.pow(10, decimalPlaces);
+    return Math.round(num * factor) / factor;
+  }
 };
 export {
   CompressOptions,

package/package.json

@@ -1,10 +1,19 @@
 {
   "name": "@egova-mobile/app-media-utils",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.mjs",
   "typings": "dist/index.d.ts",
+  "scripts": {
+    "clean": "rimraf ./dist",
+    "dev": "node ./build.js -w",
+    "build:types": "tsc -p ./tsconfig.json --emitDeclarationOnly",
+    "build:bundle": "node ./build.js",
+    "build": "pnpm clean && pnpm build:bundle && pnpm build:types",
+    "release": "zartui-mobile-cli release",
+    "prepare": "pnpm build"
+  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
@@ -32,13 +41,5 @@
   },
   "peerDependencies": {
     "dayjs": "^1.11.8"
-  },
-  "scripts": {
-    "clean": "rimraf ./dist",
-    "dev": "node ./build.js -w",
-    "build:types": "tsc -p ./tsconfig.json --emitDeclarationOnly",
-    "build:bundle": "node ./build.js",
-    "build": "pnpm clean && pnpm build:bundle && pnpm build:types",
-    "release": "zartui-mobile-cli release"
   }
-}
+}