tvcharts 0.6.40 → 0.6.42

package/lib/chart/fills/FillsView.js

@@ -49,7 +49,6 @@ import * as graphic from '../../util/graphic.js';
 // import type SeriesData from '../../data/SeriesData.js';
 import { createClipPath } from '../helper/createClipPathFromCoordSys.js';
 import FillPolyPath from './FillPolyPath.js';
-import LargeFillPolyPath from './LargeFillPolyPath.js';
 import { getFormatColor } from '../../util/format.js';
 import { each } from 'tvrender/lib/core/util.js';
 var FillsView = /** @class */function (_super) {
@@ -75,57 +74,56 @@ var FillsView = /** @class */function (_super) {
     var z2 = seriesModel.get('z2');
     var polygonGroup = this._polygonGroup;
     var coordSys = seriesModel.coordinateSystem;
-    var fillLength = Object.keys(pointsByColor).length;
-    if (fillLength >= 8) {
-      var el = new LargeFillPolyPath({
+    each(pointsByColor, function (points, key) {
+      var colors = key.split(':');
+      var fill = key;
+      var isDefaultFill = false;
+      if (colors.length > 1) {
+        var topColor = colors[0],
+          topValue = colors[1],
+          bottomColor = colors[2],
+          bottomValue = colors[3];
+        var tValue = coordSys.dataToPoint([0, topValue])[1];
+        var bValue = coordSys.dataToPoint([0, bottomValue])[1];
+        fill = new graphic.LinearGradient(0, tValue, 0, bValue, [{
+          offset: 0,
+          color: topColor
+        }, {
+          offset: 1,
+          color: bottomColor
+        }], true);
+      } else {
+        var _a = getFormatColor(fill),
+          color = _a.color,
+          isDefaultColor = _a.isDefaultColor;
+        fill = color;
+        isDefaultFill = isDefaultColor;
+      }
+      var el = new FillPolyPath({
         shape: {
-          pointsByColor: pointsByColor
+          points: points
         },
         style: {
-          fill: 'none'
+          // fill: key,
+          fill: fill
         },
-        z2: z2
+        z2: isDefaultFill ? -1 : z2
       });
       polygonGroup.add(el);
-    } else {
-      each(pointsByColor, function (points, key) {
-        var colors = key.split(':');
-        var fill = key;
-        var isDefaultFill = false;
-        if (colors.length > 1) {
-          var topColor = colors[0],
-            topValue = colors[1],
-            bottomColor = colors[2],
-            bottomValue = colors[3];
-          var tValue = coordSys.dataToPoint([0, topValue])[1];
-          var bValue = coordSys.dataToPoint([0, bottomValue])[1];
-          fill = new graphic.LinearGradient(0, tValue, 0, bValue, [{
-            offset: 0,
-            color: topColor
-          }, {
-            offset: 1,
-            color: bottomColor
-          }], true);
-        } else {
-          var _a = getFormatColor(fill),
-            color = _a.color,
-            isDefaultColor = _a.isDefaultColor;
-          fill = color;
-          isDefaultFill = isDefaultColor;
-        }
-        var el = new FillPolyPath({
-          shape: {
-            points: points
-          },
-          style: {
-            // fill: key,
-            fill: fill
-          },
-          z2: isDefaultFill ? -1 : z2
-        });
-        polygonGroup.add(el);
-      });
-    }
+    });
+    // const fillLength = Object.keys(pointsByColor).length;
+    // if (fillLength >= 100) {
+    //   const el = new LargeFillPolyPath({
+    //     shape: {
+    //       pointsByColor: pointsByColor,
+    //     },
+    //     style: {
+    //       fill: 'none'
+    //     },
+    //     z2: z2,
+    //   });
+    //   polygonGroup.add(el);
+    // }
     var clipPath = seriesModel.get('clip', true) && createClipPath(seriesModel.coordinateSystem, false, seriesModel);
     if (clipPath) {
       this.group.setClipPath(clipPath);

package/lib/chart/fills/fillsLayout.js

@@ -48,8 +48,8 @@ function getKey(itemModel) {
   var _a;
   // const color = itemModel.option?.color
   var key = (_a = itemModel.option) === null || _a === void 0 ? void 0 : _a.color;
-  if (!key && itemModel.get('topValue')) {
-    key = (itemModel.get('topColor') || 'transparent') + ":" + itemModel.get('topValue') + ":" + (itemModel.get('bottomColor') || 'transparent') + ":" + itemModel.get('bottomValue');
+  if (!key && itemModel.get('topValue') !== void 0) {
+    key = (itemModel.get('topColor') || 'rgba(255,255,255,0)') + ":" + itemModel.get('topValue') + ":" + (itemModel.get('bottomColor') || 'rgba(255,255,255,0)') + ":" + itemModel.get('bottomValue');
   }
   return key || 'transparent';
 }

package/lib/component/marker/MarkLabelView.js

@@ -52,6 +52,7 @@ import * as graphicUtil from '../../util/graphic.js';
 import { getFont } from '../../label/labelStyle.js';
 import Group from 'tvrender/lib/graphic/Group.js';
 import { positiveBorderColorQuery, negativeBorderColorQuery } from '../../chart/candlestick/candlestickVisual.js';
+var DefaultColor = 'rgb(41,98,255)';
 var markerTypeCalculator = {
   dataMin: function (item, seriesModel) {
     var seriesData = seriesModel.getData();
@@ -96,9 +97,9 @@ var markerTypeCalculator = {
     return {
       value: seriesData.getByRawIndex(item.valueDim, lastIndex),
       labelTextStyle: {
-        fill: contrastColor(fill),
+        fill: fill ? contrastColor(fill) : '#fff',
         // stroke: fill,
-        backgroundColor: removeTransparency(fill),
+        backgroundColor: fill ? removeTransparency(fill) : DefaultColor,
         // borderColor: fill,
         borderWidth: 0
       }
@@ -125,10 +126,10 @@ var markerTypeCalculator = {
     return {
       value: seriesData.getByRawIndex(item.valueDim, lastIndex),
       labelTextStyle: {
-        fill: fill,
+        fill: fill || DefaultColor,
         // stroke: fill,
         backgroundColor: backgroundColor,
-        borderColor: fill,
+        borderColor: fill || DefaultColor,
         borderWidth: 1
       }
     };
@@ -619,7 +620,8 @@ function createLabel(_a) {
     markerModel = _a.markerModel,
     gridRect = _a.gridRect,
     position = _a.position,
-    labelTextStyle = _a.labelTextStyle,
+    _d = _a.labelTextStyle,
+    labelTextStyle = _d === void 0 ? {} : _d,
     fontSize = _a.fontSize;
   var zlevel = markerModel.option.zlevel;
   var lineStyle = labelData.lineStyle,
@@ -658,7 +660,7 @@ function createLabel(_a) {
     ignore: !showTitle
   });
   var lineEl = new graphicUtil.Line({
-    style: Object.assign(lineStyle, labelTextStyle ? {
+    style: Object.assign(lineStyle, labelTextStyle.backgroundColor ? {
       stroke: labelTextStyle.backgroundColor
     } : {}),
     shape: {
@@ -689,7 +691,8 @@ function updateLabel(_a) {
     gridRect = _a.gridRect,
     position = _a.position,
     el = _a.el,
-    labelTextStyle = _a.labelTextStyle,
+    _d = _a.labelTextStyle,
+    labelTextStyle = _d === void 0 ? {} : _d,
     fontSize = _a.fontSize;
   var lineStyle = labelData.lineStyle,
     showLine = labelData.showLine,
@@ -724,7 +727,7 @@ function updateLabel(_a) {
             x2: showTitle && !isLeft ? gridRect.x + gridRect.width - 2 : gridRect.x + gridRect.width,
             y2: y
           },
-          style: Object.assign(lineStyle, labelTextStyle ? {
+          style: Object.assign(lineStyle, labelTextStyle.backgroundColor ? {
             stroke: labelTextStyle.backgroundColor
           } : {})
         });

package/package.json

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