From 16486409231888d774da1b4ff2a89313a6b3075d Mon Sep 17 00:00:00 2001
From: handongxun <handongxun@dcloud.io>
Date: Tue, 7 May 2019 20:03:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20H5=20canvas=20=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B8=90=E5=8F=98=E8=89=B2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/service/api/context/canvas.js    | 15 +++++++++++----
 src/core/view/components/canvas/index.vue |  2 ++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/core/service/api/context/canvas.js b/src/core/service/api/context/canvas.js
index 9fdb55f2c..6224ab385 100644
--- a/src/core/service/api/context/canvas.js
+++ b/src/core/service/api/context/canvas.js
@@ -671,10 +671,17 @@ methods3.forEach(function (method) {
       case 'setFillStyle':
       case 'setStrokeStyle':
         return function (color) {
-          this.actions.push({
-            method,
-            data: ['normal', checkColor(color)]
-          })
+          if (typeof color !== 'object') {
+            this.actions.push({
+              method,
+              data: ['normal', checkColor(color)]
+            })
+          } else {
+            this.actions.push({
+              method,
+              data: [color.type, color.data, color.colorStop]
+            })
+          }
         }
       case 'setGlobalAlpha':
         return function (alpha) {
diff --git a/src/core/view/components/canvas/index.vue b/src/core/view/components/canvas/index.vue
index 80d1b227f..525a8b52f 100644
--- a/src/core/view/components/canvas/index.vue
+++ b/src/core/view/components/canvas/index.vue
@@ -163,6 +163,7 @@ export default {
                 let color = resolveColor(data2[1])
                 LinearGradient.addColorStop(offset, color)
               })
+              color = LinearGradient
             } else if (data[0] === 'radial') {
               let x = data[1][0]
               let y = data[1][1]
@@ -173,6 +174,7 @@ export default {
                 let color = resolveColor(data2[1])
                 LinearGradient.addColorStop(offset, color)
               })
+              color = LinearGradient
             } else if (data[0] === 'pattern') {
               let loaded = this.checkImageLoaded(data[1], actions.slice(index + 1), callbackId,
                 function (image) {
-- 
GitLab