tvcharts 0.7.98 → 0.8.1

package/lib/chart/linesPlot/LinePlotPath.js

@@ -77,30 +77,59 @@ var LinePlotPath = /** @class */function (_super) {
     return new LinePlotShape();
   };
   LinePlotPath.prototype.buildPath = function (ctx, shape) {
-    var points = shape.points;
-    for (var index = 0; index < points.length; index++) {
-      var point = points[index];
-      //   if (isPointNull(point) && connectNulls) {
-      //     continue
-      //   }
-      if (point === 0 || isPointNull(point)) {
-        var nextPoint = points[++index];
-        while ((nextPoint === 0 || isPointNull(nextPoint)) && index < points.length) {
-          nextPoint = points[++index];
+    var points = shape.points,
+      connectSelf = shape.connectSelf,
+      barWidth = shape.barWidth;
+    if (connectSelf) {
+      var offset = barWidth / 2;
+      var isMove = false;
+      for (var index = 0; index < points.length; index++) {
+        var point = points[index];
+        if (point === 0 || isPointNull(point)) {
+          isMove = true;
+          continue;
+        }
+        if (isMove) {
+          var nextPoint = points[index + 1];
+          var _a = point,
+            x = _a[0],
+            y = _a[1];
+          if (!nextPoint || isPointNull(nextPoint)) {
+            ctx.moveTo(x - offset, y);
+            ctx.lineTo(x + offset, y);
+            continue;
+          }
+          ctx.moveTo(x, y);
+          isMove = false;
+        } else {
+          var _b = point,
+            x = _b[0],
+            y = _b[1];
+          ctx.lineTo(x, y);
         }
-        if (!nextPoint) {
+      }
+    } else {
+      for (var index = 0; index < points.length; index++) {
+        var point = points[index];
+        if (point === 0 || isPointNull(point)) {
+          var nextPoint = points[++index];
+          while ((nextPoint === 0 || isPointNull(nextPoint)) && index < points.length) {
+            nextPoint = points[++index];
+          }
+          if (!nextPoint) {
+            continue;
+          }
+          var _c = nextPoint,
+            x_1 = _c[0],
+            y_1 = _c[1];
+          ctx.moveTo(x_1, y_1);
           continue;
         }
-        var _a = nextPoint,
-          x_1 = _a[0],
-          y_1 = _a[1];
-        ctx.moveTo(x_1, y_1);
-        continue;
+        var _d = point,
+          x = _d[0],
+          y = _d[1];
+        ctx.lineTo(x, y);
       }
-      var _b = point,
-        x = _b[0],
-        y = _b[1];
-      ctx.lineTo(x, y);
     }
   };
   return LinePlotPath;

package/lib/chart/linesPlot/LinesPlotView.js

@@ -292,6 +292,9 @@ var LinesPlotView = /** @class */function (_super) {
       //     return;
       // }
       var visualColor_1 = getVisualGradient(data, seriesModel.coordinateSystem, api);
+      var connectNulls_1 = seriesModel.get('connectNulls');
+      var step_1 = seriesModel.get('step');
+      var barSpace_1 = Math.floor((seriesModel.coordinateSystem.getAxesByScale('ordinal')[0].scale.barSpace || calculatebandWidth(seriesModel, data)) * 0.8) || 1;
       each(linePointsByKey, function (item, key) {
         var _a = key.split(':'),
           stroke = _a[0],
@@ -305,7 +308,9 @@ var LinesPlotView = /** @class */function (_super) {
         }
         var el = new LinePlotPath({
           shape: {
-            points: item
+            points: item,
+            connectSelf: !connectNulls_1 && !step_1,
+            barWidth: barSpace_1
           },
           style: {
             lineDash: lineDash,

package/lib/data/OrdinalMeta.js

@@ -147,6 +147,45 @@ var OrdinalMeta = /** @class */function () {
   OrdinalMeta.prototype.getMarksByWeight = function () {
     return this._marksByWeight;
   };
+  OrdinalMeta.prototype.reFillExtraCategories = function (startTime) {
+    var timePoints = [];
+    var marksByWeight = new HashMap();
+    var formatInterval = this.dataInterval === '1D';
+    var utcOffsetTime = this.utcOffsetTime;
+    var addItem = function (value, index) {
+      var d = formatInterval ? convertToUTCDayStart(value - utcOffsetTime) : value * 1000;
+      timePoints.push({
+        originalTime: value,
+        index: index,
+        timestamp: d / 1000
+      });
+    };
+    var categories = this.categories;
+    each(categories, function (val, index) {
+      addItem(val, index);
+    });
+    var extraCategory = this.loadMoreCategory(startTime, 300);
+    map(extraCategory, function (val, i) {
+      var index = i + categories.length;
+      addItem(val, index);
+    });
+    if (timePoints.length) {
+      fillWeightsForPoints(timePoints);
+      for (var index = 0; index < timePoints.length; ++index) {
+        var point = timePoints[index];
+        var marksForWeight = marksByWeight.get(point.weight);
+        if (marksForWeight === undefined) {
+          marksForWeight = [];
+          marksByWeight.set(point.weight, marksForWeight);
+        }
+        marksForWeight.push(point);
+      }
+    }
+    this.extraCategory = extraCategory;
+    this._marksByWeight = marksByWeight;
+    this._appendCount = 0;
+    this.cache = null;
+  };
   OrdinalMeta.prototype.appendData = function (data) {
     var _a;
     var _this = this;
@@ -157,6 +196,11 @@ var OrdinalMeta = /** @class */function () {
       });
     }
     (_a = this.categories).push.apply(_a, data);
+    var lastUpdateTime = +data[data.length - 1];
+    if (lastUpdateTime !== +this.extraCategory[0]) {
+      this.reFillExtraCategories(lastUpdateTime);
+      return;
+    }
     this.extraCategory.splice(0, data.length);
     if (this.loadMoreCategory) {
       var startTime = this.extraCategory[this.extraCategory.length - 1];

package/package.json

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

package/types/dist/echarts.d.ts

@@ -2648,7 +2648,7 @@ interface MarksCache {
 }
 declare class OrdinalMeta {
     readonly categories: OrdinalRawValue[];
-    readonly extraCategory: OrdinalRawValue[];
+    extraCategory: OrdinalRawValue[];
     private loadMoreCategory;
     cache: MarksCache | null;
     private _marksByWeight;
@@ -2672,6 +2672,7 @@ declare class OrdinalMeta {
     static createByAxisModel(axisModel: Model): OrdinalMeta;
     getOrdinal(category: OrdinalRawValue): OrdinalNumber;
     getMarksByWeight(): HashMap<TimePoint[], string | number>;
+    reFillExtraCategories(startTime: number): void;
     appendData(data: string[]): void;
     getCategories(): OrdinalRawValue[];
     getClosestTime(time: string): number;

package/types/dist/shared.d.ts

@@ -2648,7 +2648,7 @@ interface MarksCache {
 }
 declare class OrdinalMeta {
     readonly categories: OrdinalRawValue[];
-    readonly extraCategory: OrdinalRawValue[];
+    extraCategory: OrdinalRawValue[];
     private loadMoreCategory;
     cache: MarksCache | null;
     private _marksByWeight;
@@ -2672,6 +2672,7 @@ declare class OrdinalMeta {
     static createByAxisModel(axisModel: Model): OrdinalMeta;
     getOrdinal(category: OrdinalRawValue): OrdinalNumber;
     getMarksByWeight(): HashMap<TimePoint[], string | number>;
+    reFillExtraCategories(startTime: number): void;
     appendData(data: string[]): void;
     getCategories(): OrdinalRawValue[];
     getClosestTime(time: string): number;

package/types/src/chart/linesPlot/LinePlotPath.d.ts

@@ -5,6 +5,8 @@ import * as graphic from '../../util/graphic.js';
 import { PathProps } from 'tvrender/lib/graphic/Path.js';
 declare class LinePlotShape {
     points: (number | number[])[];
+    connectSelf?: boolean;
+    barWidth?: number;
 }
 interface ECLineProps extends PathProps {
     shape: LinePlotShape;

package/types/src/data/OrdinalMeta.d.ts

@@ -8,7 +8,7 @@ interface MarksCache {
 }
 declare class OrdinalMeta {
     readonly categories: OrdinalRawValue[];
-    readonly extraCategory: OrdinalRawValue[];
+    extraCategory: OrdinalRawValue[];
     private loadMoreCategory;
     cache: MarksCache | null;
     private _marksByWeight;
@@ -32,6 +32,7 @@ declare class OrdinalMeta {
     static createByAxisModel(axisModel: Model): OrdinalMeta;
     getOrdinal(category: OrdinalRawValue): OrdinalNumber;
     getMarksByWeight(): HashMap<TimePoint[], string | number>;
+    reFillExtraCategories(startTime: number): void;
     appendData(data: string[]): void;
     getCategories(): OrdinalRawValue[];
     getClosestTime(time: string): number;