tvcharts 0.6.27 → 0.6.29

package/dist/echarts.js

@@ -7178,7 +7178,7 @@ function getElementSSRData(el) {
 function registerSSRDataGetter(getter) {
   ssrDataGetter = getter;
 }
-var version = "5.6.3";
+var version = "5.6.4";
 
 // src/util/number.ts
 var RADIAN_EPSILON = 1e-4;
@@ -9109,7 +9109,8 @@ var CMD = {
   Z: 6,
   R: 7,
   F: 8,
-  B: 9
+  B: 9,
+  S: 10
 };
 var tmpOutX = [];
 var tmpOutY = [];
@@ -9221,6 +9222,15 @@ var PathProxy2 = class {
     }
     return this;
   }
+  strokeStyle(color2) {
+    const {r, g, b, a} = colorToRgba(color2);
+    this.addData(CMD.S, r, g, b, a);
+    if (this._ctx) {
+      this._ctx.strokeStyle = color2;
+      this._ctx.stroke();
+    }
+    return this;
+  }
   beginPathFill() {
     this._ctx && this._ctx.beginPath();
     this.addData(CMD.B);
@@ -9460,6 +9470,9 @@ var PathProxy2 = class {
         case CMD.F:
           i += 4;
           break;
+        case CMD.S:
+          i += 4;
+          break;
         case CMD.Z:
           xi = x0;
           yi = y0;
@@ -9573,6 +9586,9 @@ var PathProxy2 = class {
         case CMD.F:
           i += 4;
           break;
+        case CMD.S:
+          i += 4;
+          break;
       }
       if (l >= 0) {
         pathSegLen[segCount++] = l;
@@ -9782,6 +9798,15 @@ var PathProxy2 = class {
             ctx.fill();
             break;
           }
+          case CMD.S: {
+            const r2 = d[i++];
+            const g = d[i++];
+            const b = d[i++];
+            const a = d[i++];
+            ctx.strokeStyle = `rgba(${r2},${g},${b},${a})`;
+            ctx.stroke();
+            break;
+          }
           case CMD.B:
             ctx.beginPath();
             break;
@@ -12113,6 +12138,7 @@ function transformPath(path, m2) {
   const A = CMD3.A;
   const Q = CMD3.Q;
   const F = CMD3.F;
+  const S = CMD3.S;
   for (i = 0, j = 0; i < len2; ) {
     cmd = data[i++];
     j = i;
@@ -12151,6 +12177,10 @@ function transformPath(path, m2) {
         i += 4;
         j = i;
         break;
+      case S:
+        i += 4;
+        j = i;
+        break;
       case R:
         p[0] = data[i++];
         p[1] = data[i++];
@@ -22140,9 +22170,9 @@ var Flag = Path_default.extend({
     const {x, y} = shape;
     const width = shape.width / 2;
     const height = shape.height / 2;
-    const rectWidth = 0.2;
-    const range = 0.6;
-    const rangeHeight = 1;
+    const rectWidth = width * 0.2;
+    const range = height * 0.6;
+    const rangeHeight = height;
     const startX = x - width + rectWidth;
     const endX = x + width;
     const topY = y - height;
@@ -22416,20 +22446,19 @@ var symbolShapeMakers = {
     shape.offsetWidth = offsetWidth;
   },
   xCross: function(x, y, w, h, shape) {
-    shape.x = x + w / 2;
-    ;
+    shape.x = x;
     shape.y = y;
     shape.width = w;
     shape.height = h;
   },
   lCross: function(x, y, w, h, shape) {
-    shape.x = x + w / 2;
+    shape.x = x;
     shape.y = y;
     shape.width = w;
     shape.height = h;
   },
   flag: function(x, y, w, h, shape) {
-    shape.x = x + w / 2;
+    shape.x = x;
     shape.y = y;
     shape.width = w;
     shape.height = h;
@@ -22443,14 +22472,14 @@ var symbolShapeMakers = {
   arrowUp: function(x, y, w, h, shape, parentShape) {
     shape.rectWidth = parentShape.triangleWidth;
     shape.cx = x + 1;
-    shape.cy = y - h / 2;
+    shape.cy = y;
     shape.width = w;
     shape.height = h;
   },
   arrowDown: function(x, y, w, h, shape, parentShape) {
     shape.rectWidth = parentShape.triangleWidth;
     shape.cx = x + 1;
-    shape.cy = y - h / 2;
+    shape.cy = y;
     shape.width = w;
     shape.height = h;
   }
@@ -33508,7 +33537,19 @@ function getDefaultInterpolatedLabel(data, interpolatedValue) {
 }
 
 // src/chart/helper/Symbol.ts
-var variableTypes = ["labelCenter", "labelDown", "labelUp", "labelLeft", "labelRight", "labelLowerLeft", "labelLowerRight", "labelUpperLeft", "labelUpperRight", "arrowUp", "arrowDown"];
+var variableTypes = [
+  "labelCenter",
+  "labelDown",
+  "labelUp",
+  "labelLeft",
+  "labelRight",
+  "labelLowerLeft",
+  "labelLowerRight",
+  "labelUpperLeft",
+  "labelUpperRight",
+  "arrowUp",
+  "arrowDown"
+];
 var Symbol = class extends Group_default {
   constructor(data, idx, seriesScope, opts) {
     super();
@@ -53292,6 +53333,8 @@ var candlestickLayout = {
         const points4 = isNaN(axisDimVal) || isNaN(val) ? [NaN, NaN] : coordSys.dataToPoint(p);
         if (!isNaN(points4[0])) {
           points4[0] = points4[0] + 0.5;
+        }
+        if (!isNaN(points4[1])) {
           points4[1] = Math.floor(points4[1]);
         }
         return points4;
@@ -53305,6 +53348,8 @@ var candlestickLayout = {
           point1[0] = start2 ? point1[0] - 0.5 : point1[0] + 0.5;
           point2[0] = start2 ? point1[0] + 0.5 : point1[0] - 0.5;
         }
+        point1[1] += 0.5;
+        point2[1] += 0.5;
         start2 ? ends.push(point1, point2) : ends.push(point2, point1);
       }
       function makeBrushRect(lowestVal, highestVal, axisDimVal) {
@@ -53376,10 +53421,7 @@ function calculateCandleWidth(seriesModel, data) {
   const baseAxis = seriesModel.getBaseAxis();
   let extent3;
   const bandWidth = baseAxis.type === "category" ? baseAxis.getBandWidth() : (extent3 = baseAxis.getExtent(), Math.abs(extent3[1] - extent3[0]) / data.count());
-  const barMaxWidth = parsePercent2(retrieve2(seriesModel.get("barMaxWidth"), bandWidth), bandWidth);
-  const barMinWidth = parsePercent2(retrieve2(seriesModel.get("barMinWidth"), 1), bandWidth);
-  const barWidth = seriesModel.get("barWidth");
-  return barWidth != null ? parsePercent2(barWidth, bandWidth) : Math.max(Math.min(bandWidth / 2, barMaxWidth), barMinWidth);
+  return Math.max(bandWidth * 0.7, 1);
 }
 var candlestickLayout_default = candlestickLayout;
 
@@ -55348,7 +55390,60 @@ LabelsSeriesModel.defaultOption = {
 };
 var LabelsSeries_default = LabelsSeriesModel;
 
+// src/chart/labels/SymbolPath.ts
+var LargeSymbolPathShape3 = class {
+};
+var SymbolPath2 = class extends Path_default {
+  constructor(opts) {
+    super(opts);
+  }
+  getDefaultShape() {
+    return new LargeSymbolPathShape3();
+  }
+  buildPath(path, shape) {
+    const points4 = shape.points;
+    const symbolProxy = this.symbolProxy;
+    const symbolProxyShape = symbolProxy.shape;
+    const needCenter = shape.needCenter ?? true;
+    const isLine = shape.isLine;
+    for (let i = 0; i < points4.length; i++) {
+      const {point, color: color2, size, offset = [0, 0]} = points4[i];
+      const [width, height] = size;
+      const [x, y] = point;
+      if (isNaN(x) || isNaN(y)) {
+        continue;
+      }
+      const [xOffset, yOffset] = offset;
+      path.beginPathFill();
+      symbolProxyShape.x = x - (needCenter ? width / 2 : 0) + xOffset;
+      symbolProxyShape.y = y - (needCenter ? height / 2 : 0) + yOffset;
+      symbolProxyShape.width = width;
+      symbolProxyShape.height = height;
+      symbolProxy.buildPath(path, {...symbolProxyShape, ...points4[i].shape}, true);
+      isLine ? path.strokeStyle(color2) : path.fillStyle(color2);
+    }
+  }
+};
+var SymbolPath_default2 = SymbolPath2;
+
 // src/chart/labels/LabelsView.ts
+var variableMap = {
+  labelCenter: 1,
+  labelDown: 1,
+  labelUp: 1,
+  labelLeft: 1,
+  labelRight: 1,
+  labelLowerLeft: 1,
+  labelLowerRight: 1,
+  labelUpperLeft: 1,
+  labelUpperRight: 1,
+  arrowUp: 1,
+  arrowDown: 1,
+  flag: 1,
+  xCross: 1,
+  lCross: 1
+};
+var lineSymbols = ["xCross", "lCross"];
 var LabelsView2 = class extends Chart_default {
   constructor() {
     super(...arguments);
@@ -55356,41 +55451,72 @@ var LabelsView2 = class extends Chart_default {
   }
   render(seriesModel, ecModel, api2) {
     const data = seriesModel.getData();
-    const symbolDraw = this._updateSymbolDraw(data, seriesModel);
-    symbolDraw.updateData(data, {
-      clipShape: this._getClipShape(seriesModel)
-    });
+    this._renderSymbol(data, seriesModel);
+    this._renderText(data, seriesModel);
     this._finished = true;
   }
-  incrementalPrepareRender(seriesModel, ecModel, api2) {
-    const data = seriesModel.getData();
-    const symbolDraw = this._updateSymbolDraw(data, seriesModel);
-    symbolDraw.incrementalPrepareUpdate(data);
-    this._finished = false;
-  }
-  incrementalRender(taskParams, seriesModel, ecModel) {
-    this._symbolDraw.incrementalUpdate(taskParams, seriesModel.getData(), {
-      clipShape: this._getClipShape(seriesModel)
+  _renderText(data, seriesModel) {
+    if (!this._textGroup) {
+      this._textGroup = new Group_default();
+      this.group.add(this._textGroup);
+    } else {
+      this._textGroup.removeAll();
+    }
+    const textGroup = this._textGroup;
+    const textList = data.getLayout("textList");
+    each(textList, function(item) {
+      const {
+        text,
+        align,
+        textColor,
+        fontSize,
+        fontFamily,
+        point,
+        offset = [0, 0],
+        textBorderColor,
+        textBorderWidth
+      } = item;
+      const el = new Text_default({
+        style: {
+          text,
+          align,
+          fill: textColor,
+          fontFamily,
+          fontSize,
+          stroke: textBorderColor,
+          lineWidth: textBorderWidth
+        },
+        x: point[0] + offset[0],
+        y: point[1] + offset[1]
+      });
+      textGroup.add(el);
     });
-    this._finished = taskParams.end === seriesModel.getData().count();
   }
-  updateTransform(seriesModel, ecModel, api2) {
-    const data = seriesModel.getData();
-    this.group.dirty();
-    if (!this._finished || data.count() > 1e4) {
-      return {
-        update: true
-      };
+  _renderSymbol(data, seriesModel) {
+    if (!this._symbolGroup) {
+      this._symbolGroup = new Group_default();
+      this.group.add(this._symbolGroup);
     } else {
-      const res = pointsLayout("").reset(seriesModel, ecModel, api2);
-      if (res.progress) {
-        res.progress({start: 0, end: data.count(), count: data.count()}, data);
-      }
-      this._symbolDraw.updateLayout(data);
+      this._symbolGroup.removeAll();
     }
-  }
-  eachRendered(cb) {
-    this._symbolDraw && this._symbolDraw.eachRendered(cb);
+    const symbolGroup = this._symbolGroup;
+    const symbolStyleMap = data.getLayout("symbolStyleMap");
+    each(symbolStyleMap, function(item, key) {
+      const isLine = lineSymbols.includes(key);
+      const el = new SymbolPath_default2({
+        shape: {
+          points: item,
+          needCenter: !variableMap[key],
+          isLine
+        },
+        style: {
+          fill: "none",
+          lineWidth: isLine ? 2 : void 0
+        }
+      });
+      el.symbolProxy = createSymbol(key, 0, 0, 0, 0);
+      symbolGroup.add(el);
+    });
   }
   _getClipShape(seriesModel) {
     if (!seriesModel.get("clip", true)) {
@@ -55399,22 +55525,11 @@ var LabelsView2 = class extends Chart_default {
     const coordSys = seriesModel.coordinateSystem;
     return coordSys && coordSys.getArea && coordSys.getArea(0.1);
   }
-  _updateSymbolDraw(data, seriesModel) {
-    let symbolDraw = this._symbolDraw;
-    const pipelineContext = seriesModel.pipelineContext;
-    const isLargeDraw = pipelineContext.large;
-    if (!symbolDraw || isLargeDraw !== this._isLargeDraw) {
-      symbolDraw && symbolDraw.remove();
-      symbolDraw = this._symbolDraw = isLargeDraw ? new LargeSymbolDraw_default() : new SymbolDraw_default();
-      this._isLargeDraw = isLargeDraw;
-      this.group.removeAll();
-    }
-    this.group.add(symbolDraw.group);
-    return symbolDraw;
-  }
   remove(ecModel, api2) {
-    this._symbolDraw && this._symbolDraw.remove(true);
-    this._symbolDraw = null;
+    this._symbolGroup && this._symbolGroup.removeAll();
+    this._symbolGroup = null;
+    this._textGroup && this._textGroup.removeAll();
+    this._textGroup = null;
   }
   dispose() {
   }
@@ -55553,148 +55668,55 @@ function getSymbolLabelFontSize(size, width) {
   return labelFontSizeMapping[size] ?? 12;
 }
 
-// src/chart/labels/labelsVisual.ts
-var SYMBOL_PROPS_WITH_CB2 = [
-  "symbol",
-  "symbolSize",
-  "symbolRotate",
-  "symbolOffset"
+// src/chart/labels/labelsLayout.ts
+function getYByLocation(seriesModel) {
+  const location = seriesModel.get("location");
+  if (!["bottom", "top"].includes(location)) {
+    return null;
+  }
+  const yAxis = seriesModel.coordinateSystem.getAxis("y");
+  const scale4 = yAxis.scale;
+  const [, end2] = yAxis.getExtent();
+  const [boundaryGapX, boundaryGapY] = scale4.rawExtentInfo.getBoundaryGapInner();
+  return Math.floor(location === "top" ? end2 * boundaryGapX + 30 : end2 * (1 - boundaryGapY) + 30);
+}
+var labelSymbols = [
+  "labelDown",
+  "labelUp",
+  "labelLeft",
+  "labelRight",
+  "labelLowerLeft",
+  "labelLowerRight",
+  "labelUpperLeft",
+  "labelUpperRight",
+  "labelCenter"
 ];
-var SYMBOL_PROPS2 = SYMBOL_PROPS_WITH_CB2.concat([
-  "symbolKeepAspect"
-]);
-var labelSymbols = ["labelDown", "labelUp", "labelLeft", "labelRight", "labelLowerLeft", "labelLowerRight", "labelUpperLeft", "labelUpperRight", "labelCenter"];
 var labelSymbolByType = {};
 each(labelSymbols, function(type) {
   labelSymbolByType[type] = 1;
 });
-var lineSymbols = ["xCross", "lCross"];
 var padding = 10;
-function changeLabelOffsetBySymbol(symbol, label, shape, oldOffset) {
-  const [offsetX, offsetY] = oldOffset ?? [0, 0];
+function changeLabelOffsetBySymbol(symbol, symbolRect, shape, oldOffset) {
+  const [offsetX, offsetY] = oldOffset;
   switch (symbol) {
     case "labelDown":
-      label.option.offset = [offsetX, offsetY - shape.triangleWidth / 2];
-      break;
+      return [offsetX, offsetY - shape.triangleWidth];
     case "labelUp":
-      label.option.offset = [offsetX, offsetY + shape.triangleWidth / 2];
       break;
     case "labelLeft":
-      label.option.offset = [offsetX + shape.triangleWidth / 2, offsetY];
-      break;
+      return [offsetX + shape.triangleWidth + symbolRect[0] / 2, offsetY];
     case "labelRight":
-      label.option.offset = [offsetX - shape.triangleWidth / 2, offsetY];
-      break;
+      return [offsetX - shape.triangleWidth - symbolRect[0] / 2, offsetY];
     case "labelLowerLeft":
-      label.option.offset = [offsetX + shape.offsetX / 2, offsetY - shape.offsetY / 2];
-      break;
+      return [offsetX + shape.offsetX / 2 + symbolRect[0] / 2, offsetY - shape.offsetY];
     case "labelLowerRight":
-      label.option.offset = [offsetX - shape.offsetX / 2, offsetY - shape.offsetY / 2];
-      break;
+      return [offsetX - shape.offsetX / 2 - symbolRect[0] / 2, offsetY - shape.offsetY];
     case "labelUpperLeft":
-      label.option.offset = [offsetX + shape.offsetX / 2, offsetY + shape.offsetY / 2];
-      break;
+      return [offsetX + shape.offsetX + symbolRect[0] / 2, offsetY + shape.offsetWidth - symbolRect[1] / 2];
     case "labelUpperRight":
-      label.option.offset = [offsetX - shape.offsetX / 2, offsetY + shape.offsetY / 2];
-      break;
-  }
-}
-var LabelsVisual = {
-  seriesType: "labels",
-  reset: function(seriesModel) {
-    const bandWidth = Math.max(1, Math.round(seriesModel.coordinateSystem.getAxesByScale("ordinal")[0].scale.barSpace * 0.8));
-    const data = seriesModel.getData();
-    const location = seriesModel.get("location");
-    const showLast = seriesModel.get("showLast");
-    const symbolOptions = {};
-    for (let i = 0; i < SYMBOL_PROPS_WITH_CB2.length; i++) {
-      const symbolPropName = SYMBOL_PROPS_WITH_CB2[i];
-      const val = seriesModel.get(symbolPropName);
-      symbolOptions[symbolPropName] = val;
-    }
-    symbolOptions.symbol = symbolOptions.symbol || seriesModel.defaultSymbol;
-    data.setVisual(extend({
-      symbolKeepAspect: seriesModel.get("symbolKeepAspect")
-    }, symbolOptions));
-    const lastIndex = data.count(true) - 1;
-    function dataEach(data2, idx) {
-      if (showLast && lastIndex - data2.getRawIndex(idx) >= showLast) {
-        return;
-      }
-      const itemModel = data2.getItemModel(idx);
-      let symbol = itemModel.getShallow("symbol");
-      let symbolSize = itemModel.getShallow("symbolSize");
-      let symbolOffset = itemModel.getShallow("symbolOffset");
-      let symbolShape = {};
-      const symbolKeepAspect = itemModel.getShallow("symbolKeepAspect");
-      const style = itemModel.getModel("itemStyle").getItemStyle();
-      let oldOffset = [0, 0];
-      const labelModel = itemModel.getModel("label");
-      const align = labelModel.get("align");
-      const size = itemModel.get("size") ?? "normal";
-      const text = labelModel.get("formatter");
-      const isLabel = labelSymbolByType[symbol];
-      const labelShow = labelModel.get("show");
-      if (location === "top") {
-        labelModel.option.position = "bottom";
-      } else {
-        labelModel.option.position = isLabel || symbol === "textOutline" ? "inside" : "top";
-      }
-      if (!labelModel.option.fontSize) {
-        labelModel.option.fontSize = getSymbolLabelFontSize(size, bandWidth);
-      }
-      if (labelShow && text && (isLabel || ["left", "right"].includes(align))) {
-        const rect = labelModel.getTextRect(text);
-        if (isLabel) {
-          symbolSize = [rect.width + padding, rect.height + padding];
-        }
-        const align2 = labelModel.get("align");
-        if (align2 === "left") {
-          labelModel.option.offset = oldOffset = [-rect.width / 2, 0];
-        } else if (align2 === "right") {
-          labelModel.option.offset = oldOffset = [rect.width / 2, 0];
-        }
-      }
-      const {w, h, shape} = getSymbolSize2(symbol, size, bandWidth);
-      if (isLabel ? !labelShow || !text : true) {
-        symbolSize = [w, h];
-      }
-      if (shape) {
-        symbolShape = shape;
-        if (labelShow) {
-          changeLabelOffsetBySymbol(symbol, labelModel, shape, oldOffset);
-        }
-      }
-      if (lineSymbols.includes(symbol)) {
-        style.stroke = style.fill;
-        if (symbol === "lCross")
-          style.lineWidth = 2;
-      }
-      data2.setItemVisual(idx, {
-        symbol,
-        symbolSize,
-        symbolOffset,
-        symbolShape,
-        symbolKeepAspect,
-        style
-      });
-    }
-    return {dataEach: data.hasItemOption ? dataEach : null};
-  }
-};
-var labelsVisual_default = LabelsVisual;
-
-// src/chart/labels/labelsLayout.ts
-function getYByLocation(seriesModel) {
-  const location = seriesModel.get("location");
-  if (!["bottom", "top"].includes(location)) {
-    return null;
+      return [offsetX - shape.offsetX - symbolRect[0] / 2, offsetY];
   }
-  const yAxis = seriesModel.coordinateSystem.getAxis("y");
-  const scale4 = yAxis.scale;
-  const [, end2] = yAxis.getExtent();
-  const [boundaryGapX, boundaryGapY] = scale4.rawExtentInfo.getBoundaryGapInner();
-  return Math.floor(location === "top" ? end2 * boundaryGapX + 30 : end2 * (1 - boundaryGapY) + 30);
+  return oldOffset;
 }
 var labelsLayout = {
   seriesType: "labels",
@@ -55705,6 +55727,8 @@ var labelsLayout = {
     if (!coordSys) {
       return;
     }
+    const bandWidth = Math.max(1, Math.round(seriesModel.coordinateSystem.getAxesByScale("ordinal")[0].scale.barSpace * 0.8));
+    const location = seriesModel.get("location");
     const dims = map(coordSys.dimensions, function(dim) {
       return data.mapDimension(dim);
     }).slice(0, 2);
@@ -55716,8 +55740,9 @@ var labelsLayout = {
     const showLast = seriesModel.get("showLast");
     return {
       progress(params, labelsData) {
+        const symbolStyleMap = {};
+        const textList = [];
         const tmpIn = [];
-        const tmpOut = [];
         const lastIndex = data.count(true) - 1;
         for (let i = params.start; i < params.end; i++) {
           if (showLast && lastIndex - data.getRawIndex(i) >= showLast) {
@@ -55725,9 +55750,95 @@ var labelsLayout = {
           }
           tmpIn[0] = store.get(dimIdx0, i) + xOffset;
           tmpIn[1] = store.get(dimIdx1, i);
-          const point = coordSys.dataToPoint(tmpIn, null, tmpOut);
-          labelsData.setItemLayout(i, [point[0], price ?? point[1]]);
+          const point = coordSys.dataToPoint(tmpIn);
+          if (isNaN(point[1])) {
+            continue;
+          }
+          const itemModel = data.getItemModel(i);
+          const symbol = itemModel.getShallow("symbol");
+          let symbolSize = itemModel.getShallow("symbolSize");
+          const symbolOffset = itemModel.getShallow("symbolOffset") || [0, 0];
+          let symbolShape = {};
+          const style = itemModel.getModel("itemStyle").getItemStyle();
+          const labelModel = itemModel.getModel("label");
+          let oldOffset = labelModel.get("offset") || [0, 0];
+          const align = labelModel.get("align");
+          const size = itemModel.get("size") ?? "normal";
+          const text = labelModel.get("formatter");
+          const isLabel = labelSymbolByType[symbol];
+          const labelShow = labelModel.get("show");
+          let fontSize = labelModel.getShallow("fontSize");
+          let position2 = "top";
+          if (location === "top") {
+            position2 = "bottom";
+          } else {
+            position2 = isLabel || symbol === "textOutline" ? "inside" : "top";
+          }
+          if (!fontSize && labelShow) {
+            labelModel.option.fontSize = fontSize = getSymbolLabelFontSize(size, bandWidth);
+          }
+          let textRect = void 0;
+          if (labelShow) {
+            textRect = labelModel.getTextRect(text);
+            if (isLabel) {
+              symbolSize = [textRect.width + padding, textRect.height + padding];
+            }
+            const align2 = labelModel.get("align");
+            if (align2 === "left") {
+              oldOffset = [-textRect.width / 2, 0];
+            } else if (align2 === "right") {
+              oldOffset = [textRect.width / 2, 0];
+            }
+          }
+          const {w, h, shape} = getSymbolSize2(symbol, size, bandWidth);
+          if (isLabel ? !labelShow || !text : true) {
+            symbolSize = [w, h];
+          }
+          const symbolRect = Array.isArray(symbolSize) ? symbolSize : [symbolSize, symbolSize];
+          if (shape) {
+            symbolShape = shape;
+            if (labelShow) {
+              oldOffset = changeLabelOffsetBySymbol(symbol, symbolRect, shape, oldOffset);
+            }
+          }
+          const symbolPoint = [point[0], price || point[1]];
+          if (symbol !== "none" && style.fill) {
+            const symbolStyles = symbolStyleMap[symbol] || [];
+            symbolStyles.push({
+              point: symbolPoint,
+              size: symbolRect,
+              offset: symbolOffset,
+              color: style.fill,
+              shape: symbolShape
+            });
+            symbolStyleMap[symbol] = symbolStyles;
+          }
+          if (labelShow) {
+            const labelPoint = [...symbolPoint];
+            if (position2 === "inside") {
+              labelPoint[1] = labelPoint[1] - textRect.height / 2 - symbolRect[1] / 2;
+            } else if (position2 === "top") {
+              labelPoint[1] = labelPoint[1] - symbolRect[1] - textRect.height / 2 - 10;
+            } else {
+              labelPoint[1] = labelPoint[1] + 10;
+            }
+            textList.push({
+              text,
+              align: align || "center",
+              point: labelPoint,
+              fontSize,
+              textColor: labelModel.get("color") || "#fff",
+              fontFamily: labelModel.get("fontFamily"),
+              offset: [oldOffset[0] + symbolOffset[0], oldOffset[1] + symbolOffset[1]],
+              textBorderColor: labelModel.get("textBorderColor"),
+              textBorderWidth: labelModel.get("textBorderWidth")
+            });
+          }
         }
+        labelsData.setLayout({
+          symbolStyleMap,
+          textList
+        });
       }
     };
   }
@@ -55739,7 +55850,6 @@ function install25(registers) {
   registers.registerSeriesModel(LabelsSeries_default);
   registers.registerChartView(LabelsView_default);
   registers.registerLayout(labelsLayout_default);
-  registers.registerVisual(labelsVisual_default);
 }
 
 // src/chart/hlines/HLinesSeries.ts
@@ -64071,8 +64181,8 @@ DataZoomModel.defaultOption = {
   filterMode: "filter",
   start: 0,
   end: 100,
-  barSpace: 12,
-  lastBarRightSideDiffBarCount: 50 / 12,
+  barSpace: 6,
+  lastBarRightSideDiffBarCount: 50 / 6,
   offsetRightDistance: 50
 };
 function retrieveRawOption(option) {
@@ -75292,6 +75402,9 @@ function pathToBezierCurves(path) {
       case CMD5.F:
         i += 4;
         break;
+      case CMD5.S:
+        i += 4;
+        break;
       case CMD5.Z:
         currentSubpath && addLine(xi, yi, x0, y0);
         xi = x0;