cxw-010203

components/option/stackingLineOption.js

@@ -10,7 +10,7 @@ export default function brokenLines(dName = [], dValue = [], dColor = [], dx = [
             color: "#fff", //设置文字颜色
         },
         extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;",
-        confine: true
+        confine: true,    
     },
     legend: {
       icon: 'rectangle', //data图标样式

ec-canvas/ec-canvas.js

@@ -46,7 +46,8 @@ Component({
     },
 
     data: {
-    isUseNewCanvas: false
+        isUseNewCanvas: false,
+        isEnd: false,
     },
 
     ready: function () {
@@ -58,16 +59,15 @@ Component({
                     option.series.forEach(series => {
                         series.progressive = 0;
                     });
-        }
+                } else if (typeof option.series === 'object') {
-        else if (typeof option.series === 'object') {
                     option.series.progressive = 0;
                 }
             }
         });
 
         if (!this.data.ec) {
-      console.warn('组件需绑定 ec 变量，例：<ec-canvas id="mychart-dom-bar" '
+            console.warn('组件需绑定 ec 变量，例：<ec-canvas id="mychart-dom-bar" ' +
-        + 'canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>');
+                'canvas-id="mychart-bar" ec="{{ ec }}"></ec-canvas>');
             return;
         }
 
@@ -79,11 +79,12 @@ Component({
 methods: {
     init: function (callback) {
         const version = wx.getSystemInfoSync().SDKVersion
-
         const canUseNewCanvas = compareVersion(version, '2.9.0') >= 0;
         const forceUseOldCanvas = this.data.forceUseOldCanvas;
         const isUseNewCanvas = canUseNewCanvas && !forceUseOldCanvas;
-      this.setData({ isUseNewCanvas });
+        this.setData({
+            isUseNewCanvas
+        });
 
         if (forceUseOldCanvas && canUseNewCanvas) {
             console.warn('开发者强制使用旧canvas,建议关闭');
@@ -96,9 +97,9 @@ Component({
         } else {
             const isValid = compareVersion(version, '1.9.91') >= 0
             if (!isValid) {
-          console.error('微信基础库版本过低，需大于等于 1.9.91。'
+                console.error('微信基础库版本过低，需大于等于 1.9.91。' +
-            + '参见：https://github.com/ecomfe/echarts-for-weixin'
+                    '参见：https://github.com/ecomfe/echarts-for-weixin' +
-            + '#%E5%BE%AE%E4%BF%A1%E7%89%88%E6%9C%AC%E8%A6%81%E6%B1%82');
+                    '#%E5%BE%AE%E4%BF%A1%E7%89%88%E6%9C%AC%E8%A6%81%E6%B1%82');
                 return;
             } else {
                 console.warn('建议将微信基础库调整大于等于2.9.0版本。升级后绘图将有更好性能');
@@ -121,11 +122,9 @@ Component({
         query.select('.ec-canvas').boundingClientRect(res => {
             if (typeof callback === 'function') {
                 this.chart = callback(canvas, res.width, res.height, canvasDpr);
-        }
+            } else if (this.data.ec && typeof this.data.ec.onInit === 'function') {
-        else if (this.data.ec && typeof this.data.ec.onInit === 'function') {
                 this.chart = this.data.ec.onInit(canvas, res.width, res.height, canvasDpr);
-        }
+            } else {
-        else {
                 this.triggerEvent('init', {
                     canvas: canvas,
                     width: res.width,
@@ -141,7 +140,10 @@ Component({
         const query = wx.createSelectorQuery().in(this)
         query
             .select('.ec-canvas')
-        .fields({ node: true, size: true })
+            .fields({
+                node: true,
+                size: true
+            })
             .exec(res => {
                 const canvasNode = res[0].node
                 this.canvasNode = canvasNode
@@ -177,7 +179,10 @@ Component({
             const query = wx.createSelectorQuery().in(this)
             query
                 .select('.ec-canvas')
-          .fields({ node: true, size: true })
+                .fields({
+                    node: true,
+                    size: true
+                })
                 .exec(res => {
                     const canvasNode = res[0].node
                     opt.canvas = canvasNode

ec-canvas/wx-canvas.js

@@ -10,9 +10,7 @@ export default class WxCanvas {
     else {
       this._initStyle(ctx);
     }
-
     // this._initCanvas(zrender, ctx);
-
     this._initEvent();
   }
 
@@ -49,7 +47,6 @@ export default class WxCanvas {
     zrender.util.getContext = function () {
       return ctx;
     };
-
     zrender.util.$override('measureText', function (text, font) {
       ctx.font = font || '12px sans-serif';
       return ctx.measureText(text);