tvcharts 0.6.95 → 0.6.97

package/lib/chart/minePolyLines/MinePolyLinesLayout.js

@@ -60,7 +60,7 @@ var MinePolyLinesLayout = {
     return {
       progress: function (params, minePolyLinesData) {
         // const store = minePolyLinesData.getStore();
-        var linesPointById = {};
+        var linesPointLayouts = [];
         var _loop_1 = function (i) {
           var itemModel = data.getItemModel(i);
           var _a = itemModel.get('itemStyle'),
@@ -77,21 +77,22 @@ var MinePolyLinesLayout = {
             return "continue";
           }
           var key = color + ":" + width + ":" + lineStyle + ":" + fill + ":" + closed_1 + ":" + curved;
-          var linePoints = linesPointById[key] || [];
           var points = itemModel.get('points');
           var itemPoints = [];
           each(points, function (item) {
             var point = coordSys.dataToPoint(item);
             itemPoints.push(point);
           });
-          linePoints.push(itemPoints);
-          linesPointById[key] = linePoints;
+          linesPointLayouts.push({
+            key: key,
+            points: itemPoints
+          });
         };
         for (var i = params.start; i < params.end; i++) {
           _loop_1(i);
         }
         data.setLayout({
-          linesPointById: linesPointById
+          linesPointLayouts: linesPointLayouts
         });
       }
     };

package/lib/chart/minePolyLines/MinePolyLinesSeries.js

@@ -46,6 +46,7 @@ import { __extends } from "tslib";
 import SeriesModel from '../../model/Series.js';
 import createSeriesData from '../helper/createSeriesData.js';
 import * as zrUtil from 'tvrender/lib/core/util.js';
+;
 var MinePolyLinesSeriesModel = /** @class */function (_super) {
   __extends(MinePolyLinesSeriesModel, _super);
   function MinePolyLinesSeriesModel() {

package/lib/chart/minePolyLines/MinePolyLinesView.js

@@ -90,8 +90,10 @@ var MinePolyLinesView = /** @class */function (_super) {
     }
     var linesGroup = this._linesGroup;
     var z2 = seriesModel.get('z2');
-    var linesPointById = data.getLayout('linesPointById');
-    each(linesPointById, function (item, key) {
+    var linesPointLayouts = data.getLayout('linesPointLayouts');
+    each(linesPointLayouts, function (item) {
+      var key = item.key,
+        points = item.points;
       var _a = key.split(':'),
         color = _a[0],
         width = _a[1],
@@ -99,11 +101,14 @@ var MinePolyLinesView = /** @class */function (_super) {
         fill = _a[3],
         closed = _a[4],
         curved = _a[5];
+      var isCurved = curved === 'true';
+      var isClosed = closed === 'true';
       var el = new PolyLinesPath({
         shape: {
-          points: item,
-          closed: closed === 'true',
-          curved: curved === 'true'
+          points: points,
+          closed: isClosed,
+          curved: isCurved,
+          lineStyle: lineStyle
         },
         style: {
           fill: fill,

package/lib/chart/minePolyLines/PolyLinesPath.js

@@ -46,11 +46,86 @@ import { __extends } from "tslib";
 // TODO Batch by color
 import * as graphic from '../../util/graphic.js';
 import smoothBezier from 'tvrender/lib/graphic/helper/smoothBezier.js';
+import { getArrowPoints } from '../mineLines/util.js';
 // const BOOST_SIZE_THRESHOLD = 4;
 var PolyLinesPathShape = /** @class */function () {
   function PolyLinesPathShape() {}
   return PolyLinesPathShape;
 }();
+function drawArrow(params) {
+  var lineStyle = params.lineStyle,
+    path = params.path,
+    polyPoints = params.polyPoints;
+  if (polyPoints.length < 2) {
+    return;
+  }
+  var lastIndex = polyPoints.length - 1;
+  switch (lineStyle) {
+    case 'style_arrow_left':
+      {
+        var points = getArrowPoints(polyPoints[1][0], polyPoints[1][1], polyPoints[0][0], polyPoints[0][1]);
+        if (!points) {
+          return;
+        }
+        var x1 = points[0],
+          y1 = points[1],
+          x2 = points[2],
+          y2 = points[3],
+          x3 = points[4],
+          y3 = points[5];
+        path.moveTo(x1, y1);
+        path.lineTo(x2, y2);
+        path.lineTo(x3, y3);
+        break;
+      }
+    case 'style_arrow_right':
+      {
+        var points = getArrowPoints(polyPoints[lastIndex - 1][0], polyPoints[lastIndex - 1][1], polyPoints[lastIndex][0], polyPoints[lastIndex][1]);
+        if (!points) {
+          return;
+        }
+        var x1 = points[0],
+          y1 = points[1],
+          x2 = points[2],
+          y2 = points[3],
+          x3 = points[4],
+          y3 = points[5];
+        path.moveTo(x1, y1);
+        path.lineTo(x2, y2);
+        path.lineTo(x3, y3);
+        break;
+      }
+    case 'style_arrow_both':
+      {
+        var points = getArrowPoints(polyPoints[1][0], polyPoints[1][1], polyPoints[0][0], polyPoints[0][1]);
+        if (!points) {
+          return;
+        }
+        var lx1 = points[0],
+          ly1 = points[1],
+          lx2 = points[2],
+          ly2 = points[3],
+          lx3 = points[4],
+          ly3 = points[5];
+        path.moveTo(lx1, ly1);
+        path.lineTo(lx2, ly2);
+        path.lineTo(lx3, ly3);
+        var _a = getArrowPoints(polyPoints[lastIndex - 1][0], polyPoints[lastIndex - 1][1], polyPoints[lastIndex][0], polyPoints[lastIndex][1]),
+          x1 = _a[0],
+          y1 = _a[1],
+          x2 = _a[2],
+          y2 = _a[3],
+          x3 = _a[4],
+          y3 = _a[5];
+        path.moveTo(x1, y1);
+        path.lineTo(x2, y2);
+        path.lineTo(x3, y3);
+        break;
+      }
+    default:
+      break;
+  }
+}
 var PolyLinesPath = /** @class */function (_super) {
   __extends(PolyLinesPath, _super);
   // private _ctx: CanvasRenderingContext2D;
@@ -63,27 +138,31 @@ var PolyLinesPath = /** @class */function (_super) {
   PolyLinesPath.prototype.buildPath = function (ctx, shape) {
     var points = shape.points,
       closed = shape.closed,
-      curved = shape.curved;
-    for (var index = 0; index < points.length; index++) {
-      var polyPoints = points[index];
-      if (curved) {
-        var controlPoints = smoothBezier(polyPoints, 0.8, closed);
-        ctx.moveTo(polyPoints[0][0], polyPoints[0][1]);
-        var len = polyPoints.length;
-        for (var i = 0; i < (closed ? len : len - 1); i++) {
-          var cp1 = controlPoints[i * 2];
-          var cp2 = controlPoints[i * 2 + 1];
-          var p = polyPoints[(i + 1) % len];
-          ctx.bezierCurveTo(cp1[0], cp1[1], cp2[0], cp2[1], p[0], p[1]);
-        }
-      } else {
-        ctx.moveTo(polyPoints[0][0], polyPoints[0][1]);
-        for (var i = 1, l = polyPoints.length; i < l; i++) {
-          ctx.lineTo(polyPoints[i][0], polyPoints[i][1]);
-        }
+      curved = shape.curved,
+      lineStyle = shape.lineStyle;
+    var polyPoints = points;
+    if (curved) {
+      var controlPoints = smoothBezier(polyPoints, 0.8, closed);
+      ctx.moveTo(polyPoints[0][0], polyPoints[0][1]);
+      var len = polyPoints.length;
+      for (var i = 0; i < (closed ? len : len - 1); i++) {
+        var cp1 = controlPoints[i * 2];
+        var cp2 = controlPoints[i * 2 + 1];
+        var p = polyPoints[(i + 1) % len];
+        ctx.bezierCurveTo(cp1[0], cp1[1], cp2[0], cp2[1], p[0], p[1]);
+      }
+    } else {
+      ctx.moveTo(polyPoints[0][0], polyPoints[0][1]);
+      for (var i = 1, l = polyPoints.length; i < l; i++) {
+        ctx.lineTo(polyPoints[i][0], polyPoints[i][1]);
       }
-      closed && ctx.closePath();
     }
+    closed && ctx.closePath();
+    drawArrow({
+      lineStyle: lineStyle,
+      path: ctx,
+      polyPoints: polyPoints
+    });
   };
   return PolyLinesPath;
 }(graphic.Path);

package/lib/component/axisPointer/axisTrigger.js

@@ -146,6 +146,10 @@ export default function axisTrigger(payload, ecModel, api) {
   if (outputPayload.dataIndex === void 0 && outputPayload.axesInfo.length) {
     outputPayload.dataIndex = +outputPayload.axesInfo[0].value;
   }
+  if (outputPayload.seriesIndex !== undefined && outputPayload.axesInfo.length) {
+    outputPayload.dataIndexInside = void 0;
+    outputPayload.dataIndex = +outputPayload.axesInfo[0].value;
+  }
   // if (payload.isConnect && outputPayload.axesInfo.length) {
   //     outputPayload.axesInfo = filter(outputPayload.axesInfo, function (item) {
   //         return item.axisDim !== 'y';

package/lib/component/marker/MarkLabelView.js

@@ -666,15 +666,16 @@ function createLabel(_a) {
     zlevel: zlevel,
     ignore: !showTitle
   });
+  var lineY = Math.floor(y) + 0.5;
   var lineEl = new graphicUtil.Line({
     style: Object.assign(lineStyle, labelTextStyle.backgroundColor ? {
       stroke: labelTextStyle.backgroundColor
     } : {}),
     shape: {
       x1: showTitle && isLeft ? gridRect.x + 2 : gridRect.x,
-      y1: y,
+      y1: lineY,
       x2: showTitle && !isLeft ? gridRect.x + gridRect.width - 2 : gridRect.x + gridRect.width,
-      y2: y
+      y2: lineY
     },
     z: 100,
     // zlevel,
@@ -727,12 +728,13 @@ function updateLabel(_a) {
           element.ignore = true;
           return;
         }
+        var lineY = Math.floor(y) + 0.5;
         element.attr({
           shape: {
             x1: showTitle && isLeft ? gridRect.x + 2 : gridRect.x,
-            y1: y,
+            y1: lineY,
             x2: showTitle && !isLeft ? gridRect.x + gridRect.width - 2 : gridRect.x + gridRect.width,
-            y2: y
+            y2: lineY
           },
           style: Object.assign(lineStyle, labelTextStyle.backgroundColor ? {
             stroke: labelTextStyle.backgroundColor

package/package.json

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

package/types/src/chart/minePolyLines/MinePolyLinesSeries.d.ts

@@ -5,7 +5,7 @@ declare type LinesValue = OptionDataValue | OptionDataValue[];
 interface LinesStatesMixin {
     emphasis?: DefaultStatesMixinEmphasis;
 }
-export declare type ILineStyle = 'style_dashed' | 'style_dotted' | 'style_solid';
+export declare type ILineStyle = 'style_arrow_both' | 'style_arrow_left' | 'style_arrow_right' | 'style_dashed' | 'style_dotted' | 'style_solid';
 export interface LinesStateOption {
     id: string;
     itemStyle?: {

package/types/src/chart/minePolyLines/PolyLinesPath.d.ts

@@ -1,10 +1,12 @@
 import * as graphic from '../../util/graphic.js';
 import { PathProps } from 'tvrender/lib/graphic/Path.js';
 import PathProxy from 'tvrender/lib/core/PathProxy.js';
+import { ILineStyle } from './MinePolyLinesSeries.js';
 declare class PolyLinesPathShape {
-    points: number[][][];
+    points: number[][];
     closed: boolean;
     curved: boolean;
+    lineStyle: ILineStyle;
 }
 declare type PolyLinesPathProps = PathProps & {
     shape?: Partial<PolyLinesPathShape>;