修复 IOS 移动图片后超出裁剪范围，调用裁剪方法后图片出现黑屏问题。

ffx0s · Sep 6, 2019 · e779f2c · e779f2c
1 parent 1840869
commit e779f2c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/dist/crop.js b/dist/crop.js
@@ -1926,6 +1926,7 @@
 
   var validation = {
     validation: function validation(position, isDraw) {
+      var transition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       var that = this;
       position = position || that.position;
       var _that$options = that.options,
@@ -1963,7 +1964,16 @@
       }
 
       if (isDraw && result.isDraw) {
-        that.animate(result.x, result.y, result.scale);
+        if (transition) {
+          that.animate(result.x, result.y, result.scale);
+        } else {
+          that.setData({
+            x: result.x,
+            y: result.y,
+            scale: result.scale
+          });
+          that.draw();
+        }
       }
 
       return result;
@@ -2294,6 +2304,7 @@
       key: "get",
       value: function get(options) {
         var crop = this;
+        crop.canvas.validation(null, true, false);
         var canvasRatio = crop.options.canvasRatio;
         var _crop$canvas$position = crop.canvas.position,
             scale = _crop$canvas$position.scale,
@@ -2325,7 +2336,7 @@
         if (antialiasing) {
           _canvas = antialisScale(_drawImage(clipWidth, clipHeight), clipScale);
         } else {
-          _canvas = _drawImage(options.width, Math.round(clipHeight * (options.width / clipWidth)));
+          _canvas = _drawImage(options.width, Math.round(clipHeight * clipScale));
         }
 
         var format = {

diff --git a/src/canvas/validation.js b/src/canvas/validation.js
@@ -1,7 +1,7 @@
 import { calculate } from './helper'
 
 export default {
-  validation (position, isDraw) {
+  validation (position, isDraw, transition = true) {
     const that = this
     position = position || that.position
     const { maxScale, minScale } = that.options
@@ -30,7 +30,12 @@ export default {
     }
 
     if (isDraw && result.isDraw) {
-      that.animate(result.x, result.y, result.scale)
+      if (transition) {
+        that.animate(result.x, result.y, result.scale)
+      } else {
+        that.setData({ x: result.x, y: result.y, scale: result.scale })
+        that.draw()
+      }
     }
 
     return result

diff --git a/src/crop/index.js b/src/crop/index.js
@@ -143,6 +143,9 @@ class Crop {
 
   get (options) {
     const crop = this
+
+    crop.canvas.validation(null, true, false)
+
     const { canvasRatio } = crop.options
     const { scale, x, y } = crop.canvas.position
     const clipWidth = crop.border.width * canvasRatio / scale
@@ -180,7 +183,7 @@ class Crop {
     if (antialiasing) {
       canvas = antialisScale(_drawImage(clipWidth, clipHeight), clipScale)
     } else {
-      canvas = _drawImage(options.width, Math.round(clipHeight * (options.width / clipWidth)))
+      canvas = _drawImage(options.width, Math.round(clipHeight * clipScale))
     }
 
     const format = {