tvcharts 0.6.74 → 0.6.75

package/lib/component/dataZoom/AxisProxy.js

@@ -258,7 +258,9 @@ var AxisProxy = /** @class */function () {
         fromTime: +categories[visibleFrom],
         toTime: +categories[visibleTo],
         offsetRightDistance: lastBarRightSideDiffBarCount > 0 ? lastBarRightSideDiffBarCount * barSpace : 0,
-        offsetLeftDistance: from < 0 ? -from * barSpace : 0
+        offsetLeftDistance: from < 0 ? -from * barSpace : 0,
+        lastBarRightSideDiffBarCount: lastBarRightSideDiffBarCount,
+        barSpace: barSpace
       });
     } else {
       if (dataZoomModel.get('useValueRange') && (dataZoomModel.settledOption.startValue || dataZoomModel.settledOption.endValue)) {

package/lib/component/dataZoom/DataZoomModel.js

@@ -342,10 +342,10 @@ var DataZoomModel = /** @class */function (_super) {
         thisOption[names[1]] = settledOption[names[1]] = opt[names[1]];
       }
     }, this);
-    if (opt.barSpace) {
+    if (typeof opt.barSpace === 'number') {
       thisOption.barSpace = opt.barSpace;
     }
-    if (opt.lastBarRightSideDiffBarCount) {
+    if (typeof opt.lastBarRightSideDiffBarCount === 'number') {
       thisOption.lastBarRightSideDiffBarCount = opt.lastBarRightSideDiffBarCount;
     }
     if (!isLocal && (typeof opt.barSpace === 'number' || typeof opt.lastBarRightSideDiffBarCount === 'number')) {

package/lib/core/echarts.js

@@ -704,6 +704,84 @@ var ECharts = /** @class */function (_super) {
       return this.getDataURL(opts);
     }
   };
+  ECharts.prototype.getWindowConnectedDataURL = function (opts) {
+    if (this._disposed) {
+      disposedWarning(this.id);
+      return;
+    }
+    var isSvg = opts.type === 'svg';
+    var mathMin = Math.min;
+    var mathMax = Math.max;
+    var MAX_NUMBER = Infinity;
+    var left = MAX_NUMBER;
+    var top = MAX_NUMBER;
+    var right = -MAX_NUMBER;
+    var bottom = -MAX_NUMBER;
+    var canvasList = [];
+    var dpr = opts && opts.pixelRatio || this.getDevicePixelRatio();
+    var layoutId = this.layout;
+    // const groupId = this.group;
+    var groupIds = [];
+    each(instances, function (chart, id) {
+      if (chart.layout === layoutId && !groupIds.includes(chart.group)) {
+        groupIds.push(chart.group);
+      }
+    });
+    each(instances, function (chart, id) {
+      if (groupIds.includes(chart.group)) {
+        var canvas = isSvg ? chart.getZr().painter.getSvgDom().innerHTML : chart.renderToCanvas(clone(opts));
+        var boundingRect = chart.getDom().getBoundingClientRect();
+        left = mathMin(boundingRect.left, left);
+        top = mathMin(boundingRect.top, top);
+        right = mathMax(boundingRect.right, right);
+        bottom = mathMax(boundingRect.bottom, bottom);
+        canvasList.push({
+          dom: canvas,
+          left: boundingRect.left,
+          top: boundingRect.top
+        });
+      }
+    });
+    left *= dpr;
+    top *= dpr;
+    right *= dpr;
+    bottom *= dpr;
+    var width = right - left;
+    var height = bottom - top;
+    var targetCanvas = platformApi.createCanvas();
+    var zr = zrender.init(targetCanvas, {
+      renderer: isSvg ? 'svg' : 'canvas'
+    });
+    zr.resize({
+      width: width,
+      height: height
+    });
+    if (opts.connectedBackgroundColor) {
+      zr.add(new graphic.Rect({
+        shape: {
+          x: 0,
+          y: 0,
+          width: width,
+          height: height
+        },
+        style: {
+          fill: opts.connectedBackgroundColor
+        }
+      }));
+    }
+    each(canvasList, function (item) {
+      var img = new graphic.Image({
+        style: {
+          x: item.left * dpr - left,
+          y: item.top * dpr - top,
+          image: item.dom
+        }
+      });
+      zr.add(img);
+    });
+    zr.refreshImmediately();
+    return targetCanvas.toDataURL('image/' + (opts && opts.type || 'png'));
+  };
   ECharts.prototype.convertToPixel = function (finder, value) {
     return doConvertPixel(this, 'convertToPixel', finder, value);
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.6.74",
+  "version": "0.6.75",
   "description": "基于echarts5.5.0二次开发",
   "license": "Apache-2.0",
   "keywords": [

package/types/dist/echarts.d.ts

@@ -8230,6 +8230,13 @@ declare class ECharts extends Eventful<ECEventDefinition> {
         connectedBackgroundColor?: ZRColor;
         excludeComponents?: string[];
     }): string;
+    getWindowConnectedDataURL(opts?: {
+        type?: 'png' | 'jpeg' | 'svg';
+        pixelRatio?: number;
+        backgroundColor?: ZRColor;
+        connectedBackgroundColor?: ZRColor;
+        excludeComponents?: string[];
+    }): string;
     /**
      * Convert from logical coordinate system to pixel coordinate system.
      * See CoordinateSystem#convertToPixel.

package/types/dist/shared.d.ts

@@ -8231,6 +8231,13 @@ declare class ECharts extends Eventful<ECEventDefinition> {
         connectedBackgroundColor?: ZRColor;
         excludeComponents?: string[];
     }): string;
+    getWindowConnectedDataURL(opts?: {
+        type?: 'png' | 'jpeg' | 'svg';
+        pixelRatio?: number;
+        backgroundColor?: ZRColor;
+        connectedBackgroundColor?: ZRColor;
+        excludeComponents?: string[];
+    }): string;
     /**
      * Convert from logical coordinate system to pixel coordinate system.
      * See CoordinateSystem#convertToPixel.

package/types/src/core/echarts.d.ts

@@ -183,6 +183,13 @@ declare class ECharts extends Eventful<ECEventDefinition> {
         connectedBackgroundColor?: ZRColor;
         excludeComponents?: string[];
     }): string;
+    getWindowConnectedDataURL(opts?: {
+        type?: 'png' | 'jpeg' | 'svg';
+        pixelRatio?: number;
+        backgroundColor?: ZRColor;
+        connectedBackgroundColor?: ZRColor;
+        excludeComponents?: string[];
+    }): string;
     /**
      * Convert from logical coordinate system to pixel coordinate system.
      * See CoordinateSystem#convertToPixel.