From a5cbcd41970dff849704c5db083e594b917336bb Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Tue, 18 Jun 2019 18:01:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20H5=20=E7=AB=AF=20un?=
 =?UTF-8?q?i.canvasToTempFilePath=20=E6=8E=A5=E5=8F=A3=20desWidth=E3=80=81?=
 =?UTF-8?q?desHeight=20=E5=8F=82=E6=95=B0=E4=B8=8D=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/helpers/protocol/canvas.js    |  6 +-
 src/core/service/api/context/canvas.js | 79 +++++++-------------------
 2 files changed, 25 insertions(+), 60 deletions(-)

diff --git a/src/core/helpers/protocol/canvas.js b/src/core/helpers/protocol/canvas.js
index c07196005f..b7395ee2c4 100644
--- a/src/core/helpers/protocol/canvas.js
+++ b/src/core/helpers/protocol/canvas.js
@@ -64,8 +64,8 @@ export const canvasPutImageData = {
 }
 
 const fileType = {
-  PNG: 'PNG',
-  JPG: 'JPG'
+  PNG: 'png',
+  JPG: 'jpeg'
 }
 
 export const canvasToTempFilePath = {
@@ -103,7 +103,7 @@ export const canvasToTempFilePath = {
     type: String,
     validator (value, params) {
       value = (value || '').toUpperCase()
-      params.fileType = Object.values(fileType).indexOf(value) < 0 ? fileType.PNG : value
+      params.fileType = value in fileType ? fileType[value] : fileType.PNG
     }
   },
   quality: {
diff --git a/src/core/service/api/context/canvas.js b/src/core/service/api/context/canvas.js
index 6224ab3851..e175962990 100644
--- a/src/core/service/api/context/canvas.js
+++ b/src/core/service/api/context/canvas.js
@@ -1,5 +1,5 @@
 import createCallbacks from 'uni-helpers/callbacks'
-import { wrapper, pixelRatio } from 'uni-helpers/hidpi'
+import { pixelRatio } from 'uni-helpers/hidpi'
 
 const canvasEventCallbacks = createCallbacks('canvasEvent')
 
@@ -255,17 +255,10 @@ var methods3 = ['setFillStyle', 'setTextAlign', 'setStrokeStyle', 'setGlobalAlph
 ]
 
 var tempCanvas
-function getTempCanvas (width, height) {
+function getTempCanvas () {
   if (!tempCanvas) {
     tempCanvas = document.createElement('canvas')
   }
-  if (typeof width !== 'undefined' && typeof height !== 'undefined') {
-    if (tempCanvas.width !== width || tempCanvas.height !== height) {
-      tempCanvas.width = width / pixelRatio
-      tempCanvas.height = height / pixelRatio
-      wrapper(tempCanvas)
-    }
-  }
   return tempCanvas
 }
 
@@ -857,56 +850,28 @@ export function canvasToTempFilePath ({
       })
       return
     }
-    var cWidth = (typeof destWidth !== 'undefined') ? (destWidth * pixelRatio) : data.width
-    var cHeight = (typeof destHeight !== 'undefined') ? (destHeight * pixelRatio) : data.height
-    var canvas = getTempCanvas(cWidth, cHeight)
+    var canvas = getTempCanvas()
+    canvas.width = data.width
+    canvas.height = data.height
     var c2d = canvas.getContext('2d')
-    c2d.putImageData(imgData, 0, 0, 0, 0, imgData.width, imgData.height)
-    var imageType = (fileType ? fileType.toLowerCase() : 'png')
-    if (imageType === 'jpg') {
-      imageType = 'jpeg'
-    }
-
-    var dCanvas
-    var isDest = (typeof destWidth !== 'undefined' && typeof destHeight !== 'undefined')
-    if (isDest) {
-      dCanvas = document.createElement('canvas')
-      dCanvas.width = destWidth
-      dCanvas.height = destHeight
-    } else {
-      dCanvas = canvas.cloneNode(true)
-    }
-    var dCtx = dCanvas.getContext('2d')
-    if (imageType === 'jpeg') {
-      dCtx.fillStyle = '#fff'
-      dCtx.fillRect(0, 0, dCanvas.width, dCanvas.height)
-    }
-
-    if (isDest) {
-      dCtx.drawImageByCanvas(canvas, 0, 0, canvas.width, canvas.height, 0, 0, destWidth, destHeight, true)
-    } else {
-      dCtx.drawImage(canvas, 0, 0)
+    c2d.putImageData(imgData, 0, 0)
+    var base64 = canvas.toDataURL('image/png')
+    var img = new Image()
+    img.onload = function () {
+      var width = canvas.width = typeof destWidth === 'number' ? destWidth : imgData.width * pixelRatio
+      var height = canvas.height = typeof destHeight === 'number' ? destHeight : imgData.height * pixelRatio
+      if (fileType === 'jpeg') {
+        c2d.fillStyle = '#fff'
+        c2d.fillRect(0, 0, width, height)
+      }
+      c2d.drawImage(img, 0, 0, img.width, img.height, 0, 0, width, height)
+      base64 = canvas.toDataURL(`image/${fileType}`, qualit)
+      invoke(callbackId, {
+        errMsg: 'canvasToTempFilePath:ok',
+        tempFilePath: base64
+      })
     }
-    var base64 = dCanvas.toDataURL(`image/${imageType}`, qualit)
-
-    invoke(callbackId, {
-      errMsg: 'canvasToTempFilePath:ok',
-      tempFilePath: base64
-    })
-
-    // TODO base64返回的是高清图，如果将img通过drawImage画到等宽高的canvas会出现显示不全问题, drawImage在次做了高清处理
-    // var img = new Image()
-    // img.onload = function () {
-    //   canvas.width = destWidth || imgData.width
-    //   canvas.height = destHeight || imgData.height
-    //   c2d.drawImage(img, 0, 0)
-    //   base64 = canvas.toDataURL(`image/jpeg`, qualit)
-    //   invoke(callbackId, {
-    //     errMsg: 'canvasToTempFilePath:ok',
-    //     tempFilePath: base64
-    //   })
-    // }
-    // img.src = base64
+    img.src = base64
   })
   operateCanvas(canvasId, pageId, 'getImageData', {
     x,
-- 
GitLab