tvcharts 0.6.25 → 0.6.27

package/dist/echarts.js

@@ -15396,6 +15396,19 @@ function windowOpen(link, target) {
     window.open(link, target);
   }
 }
+function getFormatColor(color2) {
+  if (~color2.indexOf("defaultColor")) {
+    const colors = color2.split("_");
+    return {
+      color: `rgba(0, 0, 0, ${colors[1]})`,
+      isDefaultColor: true
+    };
+  }
+  return {
+    isDefaultColor: false,
+    color: color2
+  };
+}
 
 // src/util/layout.ts
 var each2 = each;
@@ -53279,6 +53292,7 @@ var candlestickLayout = {
         const points4 = isNaN(axisDimVal) || isNaN(val) ? [NaN, NaN] : coordSys.dataToPoint(p);
         if (!isNaN(points4[0])) {
           points4[0] = points4[0] + 0.5;
+          points4[1] = Math.floor(points4[1]);
         }
         return points4;
       }
@@ -53334,11 +53348,11 @@ var candlestickLayout = {
         tmpIn[cDimIdx] = axisDimVal;
         tmpIn[vDimIdx] = lowestVal;
         point = coordSys.dataToPoint(tmpIn, null, tmpOut);
-        points4[offset++] = point ? point[0] : NaN;
-        points4[offset++] = point ? point[1] : NaN;
+        points4[offset++] = point ? point[0] + 0.5 : NaN;
+        points4[offset++] = point ? Math.floor(point[1]) : NaN;
         tmpIn[vDimIdx] = highestVal;
         point = coordSys.dataToPoint(tmpIn, null, tmpOut);
-        points4[offset++] = point ? point[1] : NaN;
+        points4[offset++] = point ? Math.floor(point[1]) : NaN;
         if (points4[offset - 1] === points4[offset - 2]) {
           points4[offset - 1] += 1;
         }
@@ -54780,7 +54794,14 @@ var BarPlotPath = class extends Path_default {
         continue;
       }
       const [x, y] = point;
-      ctx.rect(x - offset - 0.5, Math.min(y, baseY), width, Math.abs(y - baseY));
+      const leftX = Math.floor(x - offset);
+      const rightX = Math.floor(x + offset);
+      const dataY = Math.floor(y);
+      ctx.moveTo(leftX, dataY);
+      ctx.lineTo(rightX, dataY);
+      ctx.lineTo(rightX, baseY);
+      ctx.lineTo(leftX, baseY);
+      ctx.lineTo(leftX, dataY);
     }
   }
 };
@@ -54822,6 +54843,7 @@ var SymbolPath = class extends Path_default {
 var SymbolPath_default = SymbolPath;
 
 // src/chart/linesPlot/LinesPlotView.ts
+var LastZ2 = -1;
 var LinesPlotView2 = class extends Chart_default {
   constructor() {
     super(...arguments);
@@ -54862,19 +54884,20 @@ var LinesPlotView2 = class extends Chart_default {
         this._lineGroup.removeAll();
       }
       const lineGroup = this._lineGroup;
+      const z2 = seriesModel.get("z2");
       each(linePointsByKey, function(item, key) {
-        const [stroke, lineDash, lineWidth] = key.split("_");
-        const z2 = seriesModel.get("z2");
+        const [stroke, lineDash, lineWidth] = key.split(":");
+        const {color: color2, isDefaultColor} = getFormatColor(stroke);
         const el = new LinePlotPath_default({
           shape: {
             points: item
           },
           style: {
             lineDash,
-            stroke,
+            stroke: color2,
             lineWidth: +lineWidth
           },
-          z2
+          z2: isDefaultColor ? LastZ2 : z2
         });
         lineGroup.add(el);
       });
@@ -54899,16 +54922,18 @@ var LinesPlotView2 = class extends Chart_default {
       const z2 = seriesModel.get("z2");
       const baseY = seriesModel.coordinateSystem.dataToPoint([0, histbase])[1];
       each(linePointsByKey, function(item, key) {
-        const [stroke, lineDash, lineWidth] = key.split("_");
+        const [stroke] = key.split(":");
+        const {color: color2, isDefaultColor} = getFormatColor(stroke);
         const el = new PolyPlotPath_default({
           shape: {
             points: item,
             baseY
           },
           style: {
-            fill: stroke
+            stroke: color2,
+            fill: color2
           },
-          z2
+          z2: isDefaultColor ? LastZ2 : z2
         });
         polygonGroup.add(el);
       });
@@ -54933,17 +54958,18 @@ var LinesPlotView2 = class extends Chart_default {
       const z2 = seriesModel.get("z2");
       const baseY = seriesModel.coordinateSystem.dataToPoint([0, histbase])[1];
       each(linePointsByKey, function(item, key) {
-        const [stroke, lineDash, lineWidth] = key.split("_");
+        const [stroke, lineDash, lineWidth] = key.split(":");
+        const {color: color2, isDefaultColor} = getFormatColor(stroke);
         const el = new HistogramPlotPath_default({
           shape: {
             points: item,
             baseY
           },
           style: {
-            stroke,
+            stroke: color2,
             lineWidth: +lineWidth
           },
-          z2
+          z2: isDefaultColor ? LastZ2 : z2
         });
         histogramGroup.add(el);
       });
@@ -55017,23 +55043,25 @@ var LinesPlotView2 = class extends Chart_default {
       const baseY = seriesModel.coordinateSystem.dataToPoint([0, histbase])[1];
       if (width <= 1) {
         each(linePointsByKey, function(item, key) {
-          const [stroke] = key.split("_");
+          const [stroke] = key.split(":");
+          const {color: color2, isDefaultColor} = getFormatColor(stroke);
           const el = new HistogramPlotPath_default({
             shape: {
               points: item,
               baseY
             },
             style: {
-              stroke
+              stroke: color2
             },
-            z2
+            z2: isDefaultColor ? LastZ2 : z2
           });
           barGroup.add(el);
         });
         return;
       }
       each(linePointsByKey, function(item, key) {
-        const [stroke] = key.split("_");
+        const [stroke] = key.split(":");
+        const {color: color2, isDefaultColor} = getFormatColor(stroke);
         const el = new BarPath_default({
           shape: {
             points: item,
@@ -55041,9 +55069,9 @@ var LinesPlotView2 = class extends Chart_default {
             width
           },
           style: {
-            fill: stroke
+            fill: color2
           },
-          z2
+          z2: isDefaultColor ? LastZ2 : z2
         });
         barGroup.add(el);
       });
@@ -55133,6 +55161,10 @@ function optimizePixels(point) {
   point[0] = point[0] + 0.5;
   return point;
 }
+function optimizeStepPoint(point, lineWidth) {
+  point[0] = lineWidth % 2 === 0 ? Math.floor(point[0]) : Math.floor(point[0]) + 0.5;
+  point[1] = lineWidth % 2 === 0 ? Math.floor(point[1]) : Math.floor(point[1]) + 0.5;
+}
 var linesPlotLayout = {
   seriesType: "linesPlot",
   plan: createRenderPlanner(),
@@ -55178,7 +55210,7 @@ var linesPlotLayout = {
           symbolData.push({
             point,
             size: dataModal.get("symbolSize") || symbolSize,
-            color: symbolColor
+            color: symbolColor ? getFormatColor(symbolColor).color : symbolColor
           });
           symbolPointsByColor[symbolKey] = symbolData;
         }
@@ -55198,13 +55230,16 @@ var linesPlotLayout = {
           if (connectNulls && isNaN(y)) {
             continue;
           }
+          const isStep = step && !isRawFirst && !isRawLast;
           let nextPoint = [];
           if (!isSingle && isRawLast) {
             const lastPoints = linePointsByKey[lastKey] || [];
+            if (isStep && Array.isArray(lastPoints[lastPoints.length - 1])) {
+              point[1] = lastPoints[lastPoints.length - 1][1];
+            }
             lastPoints.push(point);
             break;
           }
-          const isStep = step && !isRawFirst && !isRawLast;
           if (isStep) {
             let nextX = store.get(dimIdx0, i + 1);
             let nextY = store.get(dimIdx1, i + 1);
@@ -55216,6 +55251,7 @@ var linesPlotLayout = {
             nextPoint = optimizePixels(coordSys.dataToPoint([nextX + xOffset, nextY]));
             const midX = (point[0] + nextPoint[0]) / 2;
             point[0] = midX;
+            point[1] = Math.floor(point[1]);
             nextPoint[0] = midX;
           }
           const itemModel = lineData.getItemModel(isSingle ? i : i + 1);
@@ -55224,7 +55260,7 @@ var linesPlotLayout = {
             type = "solid",
             width = "1"
           } = itemModel.get("lineStyle");
-          const key = `${color2}_${type}_${width}`;
+          const key = `${color2}:${type}:${width}`;
           const points4 = linePointsByKey[key] || [];
           if (!isSingle && lastKey !== key) {
             if (lastKey) {
@@ -55235,6 +55271,8 @@ var linesPlotLayout = {
           }
           points4.push(point);
           if (isStep) {
+            optimizeStepPoint(point, +width);
+            optimizeStepPoint(nextPoint, +width);
             points4.push(nextPoint);
             if (symbolByStep) {
               setSymbolPoint(nextPoint, i + 1);
@@ -55947,8 +55985,9 @@ var FillsView2 = class extends Chart_default {
     const polygonGroup = this._polygonGroup;
     const coordSys = seriesModel.coordinateSystem;
     each(pointsByColor, function(points4, key) {
-      const colors = key.split("_");
+      const colors = key.split(":");
       let fill = key;
+      let isDefaultFill = false;
       if (colors.length > 1) {
         const [topColor, topValue, bottomColor, bottomValue] = colors;
         const tValue = coordSys.dataToPoint([0, topValue])[1];
@@ -55963,6 +56002,10 @@ var FillsView2 = class extends Chart_default {
             color: bottomColor
           }
         ], true);
+      } else {
+        const {color: color2, isDefaultColor} = getFormatColor(fill);
+        fill = color2;
+        isDefaultFill = isDefaultColor;
       }
       const el = new FillPolyPath_default({
         shape: {
@@ -55971,7 +56014,7 @@ var FillsView2 = class extends Chart_default {
         style: {
           fill
         },
-        z2
+        z2: isDefaultFill ? -1 : z2
       });
       polygonGroup.add(el);
     });
@@ -56000,10 +56043,10 @@ var FillsView_default = FillsView;
 // src/chart/fills/fillsLayout.ts
 function getKey(itemModel) {
   let key = itemModel.option?.color;
-  if (!key && itemModel.get("topColor")) {
-    key = `${itemModel.get("topColor")}_${itemModel.get("topValue")}_${itemModel.get("bottomColor")}_${itemModel.get("bottomValue")}`;
+  if (!key && itemModel.get("topValue")) {
+    key = `${itemModel.get("topColor") || "transparent"}:${itemModel.get("topValue")}:${itemModel.get("bottomColor") || "transparent"}:${itemModel.get("bottomValue")}`;
   }
-  return key;
+  return key || "transparent";
 }
 var fillsLayout = {
   seriesType: "fills",
@@ -64279,7 +64322,11 @@ var AxisProxy = class {
               return;
             }
             if (dim === "x" && offset) {
-              range[dim][0] = range[dim][0] - offset;
+              if (offset > 0) {
+                range[dim][0] = range[dim][0] - offset;
+              } else {
+                range[dim][1] = range[dim][1] - offset;
+              }
             }
             seriesData.selectRange(range);
           }