From 7062b6254b6d3397548717f85ec1da25024d149b Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 27 Dec 2019 20:46:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96H5=E7=AB=AFcanvas?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=86=85=E5=AD=98=E5=8D=A0=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/helpers/hidpi.js                 |  11 +-
 src/core/service/api/context/canvas.js    |   4 +-
 src/core/view/components/canvas/index.vue | 229 ++++++++++++----------
 3 files changed, 130 insertions(+), 114 deletions(-)

diff --git a/src/core/helpers/hidpi.js b/src/core/helpers/hidpi.js
index f7bd0f6e5..0245c690d 100644
--- a/src/core/helpers/hidpi.js
+++ b/src/core/helpers/hidpi.js
@@ -1,12 +1,13 @@
 export const pixelRatio = (function () {
   const canvas = document.createElement('canvas')
+  canvas.height = canvas.width = 0
   const context = canvas.getContext('2d')
   const backingStore = context.backingStorePixelRatio ||
-        context.webkitBackingStorePixelRatio ||
-        context.mozBackingStorePixelRatio ||
-        context.msBackingStorePixelRatio ||
-        context.oBackingStorePixelRatio ||
-        context.backingStorePixelRatio || 1
+    context.webkitBackingStorePixelRatio ||
+    context.mozBackingStorePixelRatio ||
+    context.msBackingStorePixelRatio ||
+    context.oBackingStorePixelRatio ||
+    context.backingStorePixelRatio || 1
   return (window.devicePixelRatio || 1) / backingStore
 })()
 
diff --git a/src/core/service/api/context/canvas.js b/src/core/service/api/context/canvas.js
index 6ebda3c2a..a44528056 100644
--- a/src/core/service/api/context/canvas.js
+++ b/src/core/service/api/context/canvas.js
@@ -259,10 +259,12 @@ var methods3 = ['setFillStyle', 'setTextAlign', 'setStrokeStyle', 'setGlobalAlph
 ]
 
 var tempCanvas
-function getTempCanvas () {
+function getTempCanvas (width = 0, height = 0) {
   if (!tempCanvas) {
     tempCanvas = document.createElement('canvas')
   }
+  tempCanvas.width = width
+  tempCanvas.height = height
   return tempCanvas
 }
 
diff --git a/src/core/view/components/canvas/index.vue b/src/core/view/components/canvas/index.vue
index 7deaf205a..d476e3c76 100644
--- a/src/core/view/components/canvas/index.vue
+++ b/src/core/view/components/canvas/index.vue
@@ -1,18 +1,18 @@
 <template>
-  <uni-canvas
-    :canvas-id="canvasId"
-    :disable-scroll="disableScroll"
+  <uni-canvas
+    :canvas-id="canvasId"
+    :disable-scroll="disableScroll"
     v-on="_listeners">
-    <canvas
-      ref="canvas"
-      width="300"
+    <canvas
+      ref="canvas"
+      width="300"
       height="150" />
     <div style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden;">
       <slot />
     </div>
-    <v-uni-resize-sensor
-      ref="sensor"
-      @resize="_resize"/>
+    <v-uni-resize-sensor
+      ref="sensor"
+      @resize="_resize" />
   </uni-canvas>
 </template>
 <script>
@@ -42,6 +42,16 @@ function processTouches (target, touches) {
   })
 }
 
+var tempCanvas
+function getTempCanvas (width = 0, height = 0) {
+  if (!tempCanvas) {
+    tempCanvas = document.createElement('canvas')
+  }
+  tempCanvas.width = width
+  tempCanvas.height = height
+  return tempCanvas
+}
+
 export default {
   name: 'Canvas',
   mixins: [subscriber],
@@ -97,6 +107,10 @@ export default {
       height: this.$refs.sensor.$el.offsetHeight
     })
   },
+  beforeDestroy () {
+    const canvas = this.$refs.canvas
+    canvas.height = canvas.width = 0
+  },
   methods: {
     _handleSubscribe ({
       type,
@@ -335,7 +349,7 @@ export default {
           } else {
             // 解决 PLUS-APP（wkwebview）以及 H5 图像跨域问题（H5图像响应头需包含access-control-allow-origin）
             if (window.plus && src.indexOf('http://') !== 0 && src.indexOf('https://') !==
-                                0) {
+              0) {
               loadFile(src)
             } else if (/^data:.*,.*/.test(src)) {
               sefl._images[src].src = src
@@ -392,7 +406,6 @@ export default {
         height = canvas.offsetHeight - y
       }
       try {
-        const newCanvas = document.createElement('canvas')
         if (!hidpi) {
           if (!destWidth && !destHeight) {
             destWidth = Math.round(width * pixelRatio)
@@ -406,15 +419,15 @@ export default {
           destWidth = width
           destHeight = height
         }
-        newCanvas.width = destWidth
-        newCanvas.height = destHeight
+        const newCanvas = getTempCanvas(destWidth, destHeight)
         const context = newCanvas.getContext('2d')
         context.__hidpi__ = true
         context.drawImageByCanvas(canvas, x, y, width, height, 0, 0, destWidth, destHeight, false)
         imgData = context.getImageData(0, 0, destWidth, destHeight)
-      } catch (error) {
-        if (!callbackId) {
-          return
+        newCanvas.height = newCanvas.width = 0
+      } catch (error) {
+        if (!callbackId) {
+          return
         }
         UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
           callbackId,
@@ -423,13 +436,13 @@ export default {
           }
         }, this.$page.id)
         return
-      }
-      if (!callbackId) {
-        return {
-          data: [...imgData.data],
-          width: destWidth,
-          height: destHeight
-        }
+      }
+      if (!callbackId) {
+        return {
+          data: [...imgData.data],
+          width: destWidth,
+          height: destHeight
+        }
       } else {
         UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
           callbackId,
@@ -439,7 +452,7 @@ export default {
             width: destWidth,
             height: destHeight
           }
-        }, this.$page.id)
+        }, this.$page.id)
       }
     },
     putImageData ({
@@ -454,12 +467,11 @@ export default {
         if (!height) {
           height = Math.round(data.length / 4 / width)
         }
-        const canvas = document.createElement('canvas')
-        canvas.width = width
-        canvas.height = height
+        const canvas = getTempCanvas(width, height)
         const context = canvas.getContext('2d')
         context.putImageData(new ImageData(new Uint8ClampedArray(data), width, height), 0, 0)
         this.$refs.canvas.getContext('2d').drawImage(canvas, x, y, width, height)
+        canvas.height = canvas.width = 0
       } catch (error) {
         UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
           callbackId,
@@ -475,91 +487,92 @@ export default {
           errMsg: 'canvasPutImageData:ok'
         }
       }, this.$page.id)
-    },
-    getDataUrl ({
-      x = 0,
-      y = 0,
-      width,
-      height,
-      destWidth,
-      destHeight,
-      hidpi = true,
-      fileType,
-      qualit,
-      callbackId
-    }) {
-      let res = this.getImageData({
-        x,
-        y,
-        width,
-        height,
-        destWidth,
-        destHeight,
-        hidpi
-      })
-      if (!res.data || !res.data.length) {
-        UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
-          callbackId,
-          data: {
-            errMsg: 'canvasGetDataUrl:fail'
-          }
-        }, this.$page.id)
-        return
-      }
-      let imgData
-      try {
-        imgData = new ImageData(new Uint8ClampedArray(res.data), res.width, res.height)
-      } catch (error) {
-        UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
-          callbackId,
-          data: {
-            errMsg: 'canvasGetDataUrl:fail'
-          }
-        }, this.$page.id)
-        return
-      }
-      destWidth = res.width
-      destHeight = res.height
-      const canvas = document.createElement('canvas')
-      canvas.width = destWidth
-      canvas.height = destHeight
-      const c2d = canvas.getContext('2d')
-      c2d.putImageData(imgData, 0, 0)
-      let base64 = canvas.toDataURL('image/png')
-      const img = new Image()
-      img.onload = () => {
-        if (fileType === 'jpeg') {
-          c2d.fillStyle = '#fff'
-          c2d.fillRect(0, 0, destWidth, destHeight)
-        }
-        c2d.drawImage(img, 0, 0)
-        base64 = canvas.toDataURL(`image/${fileType}`, qualit)
-        UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
-          callbackId,
-          data: {
-            errMsg: 'canvasGetDataUrl:ok',
-            base64: base64
-          }
-        }, this.$page.id)
-      }
-      img.src = base64
+    },
+    getDataUrl ({
+      x = 0,
+      y = 0,
+      width,
+      height,
+      destWidth,
+      destHeight,
+      hidpi = true,
+      fileType,
+      qualit,
+      callbackId
+    }) {
+      let res = this.getImageData({
+        x,
+        y,
+        width,
+        height,
+        destWidth,
+        destHeight,
+        hidpi
+      })
+      if (!res.data || !res.data.length) {
+        UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
+          callbackId,
+          data: {
+            errMsg: 'canvasGetDataUrl:fail'
+          }
+        }, this.$page.id)
+        return
+      }
+      let imgData
+      try {
+        imgData = new ImageData(new Uint8ClampedArray(res.data), res.width, res.height)
+      } catch (error) {
+        UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
+          callbackId,
+          data: {
+            errMsg: 'canvasGetDataUrl:fail'
+          }
+        }, this.$page.id)
+        return
+      }
+      destWidth = res.width
+      destHeight = res.height
+      const canvas = getTempCanvas(destWidth, destHeight)
+      const c2d = canvas.getContext('2d')
+      c2d.putImageData(imgData, 0, 0)
+      let base64 = canvas.toDataURL('image/png')
+      canvas.height = canvas.width = 0
+      const img = new Image()
+      img.onload = () => {
+        const canvas = getTempCanvas(destWidth, destHeight)
+        if (fileType === 'jpeg') {
+          c2d.fillStyle = '#fff'
+          c2d.fillRect(0, 0, destWidth, destHeight)
+        }
+        c2d.drawImage(img, 0, 0)
+        base64 = canvas.toDataURL(`image/${fileType}`, qualit)
+        canvas.height = canvas.width = 0
+        UniViewJSBridge.publishHandler('onCanvasMethodCallback', {
+          callbackId,
+          data: {
+            errMsg: 'canvasGetDataUrl:ok',
+            base64: base64
+          }
+        }, this.$page.id)
+      }
+      img.src = base64
     }
   }
 }
 </script>
 <style>
-    uni-canvas {
-        width: 300px;
-        height: 150px;
-        display: block;
-        position: relative;
-    }
+uni-canvas {
+  width: 300px;
+  height: 150px;
+  display: block;
+  position: relative;
+}
 
-    uni-canvas>canvas {
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-    }
+uni-canvas > canvas {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
 </style>
-- 
GitLab