zartui 3.1.29 → 3.1.30

package/lib/zartui.cjs.js

@@ -20554,7 +20554,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.1.29";
+const version = "3.1.30";
 function install(app) {
   const components = [
     ActionSheet,

package/lib/zartui.es.js

@@ -20552,7 +20552,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.1.29";
+const version = "3.1.30";
 function install(app) {
   const components = [
     ActionSheet,

package/lib/zartui.js

@@ -15384,16 +15384,28 @@
         );
       });
     }
-    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);
@@ -15401,6 +15413,25 @@
         }
       );
     }
+    /**
+     * 浮点型数据比较大小
+     */
+    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;
+    }
   };
   const chooseImage = (type) => {
     return new Promise((resolve, reject) => {
@@ -24552,7 +24583,7 @@
       });
     }
   };
-  const version = "3.1.29";
+  const version = "3.1.30";
   function install(app) {
     const components = [
       ActionSheet,