tvcharts 0.9.44 → 0.9.45

package/lib/chart/line/LineView.js

@@ -117,7 +117,7 @@ function getStackedOnPoints(coordSys, data, dataCoordInfo) {
   }
   return points;
 }
-function turnPointsIntoStep(points, coordSys, stepTurnAt, connectNulls) {
+export function turnPointsIntoStep(points, coordSys, stepTurnAt, connectNulls, lineWidth) {
   var baseAxis = coordSys.getBaseAxis();
   var baseIndex = baseAxis.dim === 'x' || baseAxis.dim === 'radius' ? 0 : 1;
   var stepPoints = [];
@@ -164,6 +164,11 @@ function turnPointsIntoStep(points, coordSys, stepTurnAt, connectNulls) {
   }
   // Last points
   stepPoints.push(points[i++], points[i++]);
+  if (lineWidth != null && lineWidth % 2 === 1) {
+    for (var i_1 = 0; i_1 < stepPoints.length; i_1++) {
+      stepPoints[i_1] = Math.floor(stepPoints[i_1]) + 0.5;
+    }
+  }
   return stepPoints;
 }
 /**
@@ -539,9 +544,10 @@ var LineView = /** @class */function (_super) {
       hasAnimation && this._initSymbolLabelAnimation(data, coordSys, clipShapeForSymbol);
       if (step) {
         // TODO If stacked series is not step
-        points = turnPointsIntoStep(points, coordSys, step, connectNulls);
+        var lineWidth = lineStyleModel.get('width');
+        points = turnPointsIntoStep(points, coordSys, step, connectNulls, lineWidth);
         if (stackedOnPoints) {
-          stackedOnPoints = turnPointsIntoStep(stackedOnPoints, coordSys, step, connectNulls);
+          stackedOnPoints = turnPointsIntoStep(stackedOnPoints, coordSys, step, connectNulls, lineWidth);
         }
       }
       polyline = this._newPolyline(points);
@@ -599,9 +605,10 @@ var LineView = /** @class */function (_super) {
           // Not do it in update with animation
           if (step) {
             // TODO If stacked series is not step
-            points = turnPointsIntoStep(points, coordSys, step, connectNulls);
+            var lineWidth = lineStyleModel.get('width');
+            points = turnPointsIntoStep(points, coordSys, step, connectNulls, lineWidth);
             if (stackedOnPoints) {
-              stackedOnPoints = turnPointsIntoStep(stackedOnPoints, coordSys, step, connectNulls);
+              stackedOnPoints = turnPointsIntoStep(stackedOnPoints, coordSys, step, connectNulls, lineWidth);
             }
           }
           polyline.setShape({
@@ -1020,10 +1027,11 @@ var LineView = /** @class */function (_super) {
     var stackedOnNext = diff.stackedOnNext;
     if (step) {
       // TODO If stacked series is not step
-      current = turnPointsIntoStep(diff.current, coordSys, step, connectNulls);
-      stackedOnCurrent = turnPointsIntoStep(diff.stackedOnCurrent, coordSys, step, connectNulls);
-      next = turnPointsIntoStep(diff.next, coordSys, step, connectNulls);
-      stackedOnNext = turnPointsIntoStep(diff.stackedOnNext, coordSys, step, connectNulls);
+      var lineWidth = seriesModel.get(['lineStyle', 'width']);
+      current = turnPointsIntoStep(diff.current, coordSys, step, connectNulls, lineWidth);
+      stackedOnCurrent = turnPointsIntoStep(diff.stackedOnCurrent, coordSys, step, connectNulls, lineWidth);
+      next = turnPointsIntoStep(diff.next, coordSys, step, connectNulls, lineWidth);
+      stackedOnNext = turnPointsIntoStep(diff.stackedOnNext, coordSys, step, connectNulls, lineWidth);
     }
     // Don't apply animation if diff is large.
     // For better result and avoid memory explosion problems like

package/lib/chart/symbolLine/SymbolLineView.js

@@ -49,6 +49,7 @@ import SymbolPath from './SymbolPath.js';
 import { createSymbol } from '../../util/symbol.js';
 import { ECPolyline } from '../line/poly.js';
 import { getECData } from '../../util/innerStore.js';
+import { turnPointsIntoStep } from '../line/LineView.js';
 import { toggleHoverEmphasis } from '../../util/states.js';
 // const SKIP_PROPS = ['color', 'borderColor'] as const;
 function getSmooth(smooth) {
@@ -83,14 +84,19 @@ var SymbolLineView = /** @class */function (_super) {
     var smooth = getSmooth(seriesModel.get('smooth'));
     var symbolSize = seriesModel.get('symbolSize') || 4;
     var isSimple = data.getLayout('isSimple');
+    var step = seriesModel.get('step');
+    var coordSys = seriesModel.coordinateSystem;
     var _a = symbolSize instanceof Array ? symbolSize : [symbolSize, symbolSize],
       width = _a[0],
       height = _a[1];
     var smoothMonotone = seriesModel.get('smoothMonotone');
     var ignoreBothEndsSymbol = seriesModel.get('ignoreBothEndsSymbol');
+    var lineStyleModel = seriesModel.getModel('lineStyle');
     var points = data.getLayout('points') || [];
+    if (step) {
+      points = turnPointsIntoStep(points, coordSys, step, connectNulls, lineStyleModel.get('width'));
+    }
     var polyline = this._newPolyline(points);
-    var lineStyleModel = seriesModel.getModel('lineStyle');
     var color = lineStyleModel.get('color');
     polyline.useStyle(zrUtil.defaults(
     // Use color in lineStyle first
@@ -107,7 +113,7 @@ var SymbolLineView = /** @class */function (_super) {
     });
     polyline.states.emphasis = emphasisState;
     group.add(polyline);
-    if (!isSimple) {
+    if (symbol && symbol !== 'none' && !isSimple) {
       var el = new SymbolPath({
         shape: {
           points: points,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.9.44",
+  "version": "0.9.45",
   "main": "dist/echarts.js",
   "module": "index.js",
   "jsdelivr": "dist/echarts.min.js",

package/types/src/chart/line/LineView.d.ts

@@ -14,6 +14,7 @@ import { CoordinateSystemClipArea } from '../../coord/CoordinateSystem.js';
 import Model from '../../model/Model.js';
 declare type PolarArea = ReturnType<Polar['getArea']>;
 declare type Cartesian2DArea = ReturnType<Cartesian2D['getArea']>;
+export declare function turnPointsIntoStep(points: ArrayLike<number>, coordSys: Cartesian2D | Polar, stepTurnAt: 'start' | 'end' | 'middle', connectNulls: boolean, lineWidth?: number): number[];
 export declare function canShowAllSymbolForCategory(categoryAxis: Axis2D, data: SeriesData): boolean;
 interface EndLabelAnimationRecord {
     lastFrameIndex: number;