tvcharts 0.9.15 → 0.9.17

package/lib/chart/boxes/BoxesLayout.js

@@ -131,7 +131,8 @@ var BoxesLayout = {
     return {
       progress: function (params, boxesData) {
         var store = boxesData.getStore();
-        var linesPointById = {};
+        // const linesPointById: Record<string, number[]> = {};
+        var linesPoints = [];
         var textList = [];
         for (var i = params.start; i < params.end; i++) {
           var x1Val = store.get(x1DimI, i);
@@ -159,7 +160,7 @@ var BoxesLayout = {
             continue;
           }
           var key = (border_color || 'none') + ":" + border_width + ":" + style + ":" + bgcolor;
-          var points = linesPointById[key] || [];
+          // const points = [];
           optimizePoint(startPoint, endPoint, border_width);
           var _b = getHExtend(startPoint[0], endPoint[0], extend),
             left = _b[0],
@@ -191,11 +192,16 @@ var BoxesLayout = {
               fontWeight: fontWeight
             });
           }
-          points.push(left, right, startPoint[1], endPoint[1]);
-          linesPointById[key] = points;
+          // points.push(left, right, startPoint[1], endPoint[1]);
+          linesPoints.push({
+            points: [left, right, startPoint[1], endPoint[1]],
+            key: key
+          });
+          // linesPointById[key] = points;
         }
+
         data.setLayout({
-          linesPointById: linesPointById,
+          linesPoints: linesPoints,
           textList: textList
         });
       }

package/lib/chart/boxes/BoxesPath.js

@@ -76,13 +76,14 @@ var BoxesPath = /** @class */function (_super) {
       path.lineTo(right, bottom);
       path.lineTo(left, bottom);
       path.closePath();
-      if (i < points.length - 2) {
-        hasFill && path.fillStyle(fill);
-        hasStroke && path.strokeStyle(stroke);
-        path.beginPathFill();
-      }
+      // if (i < points.length - 2) {
+      //     hasFill && path.fillStyle(fill);
+      //     hasStroke && path.strokeStyle(stroke); 
+      //     path.beginPathFill();
+      // }
     }
   };
+
   return BoxesPath;
 }(graphic.Path);
 export default BoxesPath;

package/lib/chart/boxes/BoxesView.js

@@ -95,8 +95,10 @@ var BoxesView = /** @class */function (_super) {
     var isMobile = seriesModel.get('isMobile');
     var linesGroup = this._linesGroup;
     var z2 = seriesModel.get('z2');
-    var linesPointById = data.getLayout('linesPointById');
-    each(linesPointById, function (item, key) {
+    var linesPointById = data.getLayout('linesPoints');
+    each(linesPointById, function (item) {
+      var key = item.key,
+        points = item.points;
       var _a = key.split(':'),
         color = _a[0],
         width = _a[1],
@@ -104,7 +106,7 @@ var BoxesView = /** @class */function (_super) {
         fill = _a[3];
       var el = new BoxesPath({
         shape: {
-          points: item,
+          points: points,
           fill: fill || 'none',
           stroke: color,
           isWebviewRender: isMobile

package/lib/component/events/EventsView.js

@@ -45,6 +45,13 @@ import { __extends } from "tslib";
 import ComponentView from "../../view/Component.js";
 import { each } from "tvrender/lib/core/util.js";
 import * as graphic from "../../util/graphic.js";
+import { getIsLightColor } from '../../util/color.js';
+var getRectFill = function (color) {
+  if (typeof color !== 'string') {
+    return '#000';
+  }
+  return getIsLightColor(color) ? '#fff' : '#000';
+};
 var r = 15;
 var optimizeX = function (x, lineWidth) {
   return lineWidth % 2 === 0 ? x : Math.floor(x) + 0.5;
@@ -96,6 +103,7 @@ var EventsView = /** @class */function (_super) {
     var lineStyle = eventsModel.get('lineStyle');
     var z = eventsModel.get('z');
     var selectedEventViewId = eventsModel.get('selectedEventViewId');
+    var backgroundColor = ecModel.get('backgroundColor') || '#fff';
     var hoverEventId = this.hoverEventId;
     var lastPoint = this._lastPoint;
     var mouseMove = this._mouseMove.bind(this);
@@ -143,7 +151,6 @@ var EventsView = /** @class */function (_super) {
           }
         });
         img.setClipPath(clipPath);
-        imgGroup.add(img);
         var rect = new graphic.Rect({
           shape: {
             x: x + 5 - borderWidth / 2,
@@ -154,7 +161,7 @@ var EventsView = /** @class */function (_super) {
           },
           style: {
             stroke: "#ED544F",
-            fill: "none",
+            fill: getRectFill(backgroundColor),
             lineWidth: borderWidth
           },
           z2: z2,
@@ -168,6 +175,7 @@ var EventsView = /** @class */function (_super) {
           }
         }
         imgGroup.add(rect);
+        imgGroup.add(img);
         if (i !== list.length - 1) {
           y = y - 24;
         }

package/package.json

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