tvcharts 0.8.2 → 0.8.4

package/dist/echarts.js

@@ -801,12 +801,9 @@ function parseRgbaStringFast(str) {
   for (let i = openParenIdx + 1; i < str.length - 1; i++) {
     const c = str.charCodeAt(i);
     if (c >= 48 && c <= 57) {
-      if (fracDiv) {
-        num = num * 10 + (c - 48);
+      num = num * 10 + (c - 48);
+      if (fracDiv)
         fracDiv *= 10;
-      } else {
-        num = num * 10 + (c - 48);
-      }
     } else if (c === 46) {
       if (!fracDiv)
         fracDiv = 1;
@@ -821,7 +818,7 @@ function parseRgbaStringFast(str) {
   if (index < 4) {
     nums[index++] = fracDiv ? num / fracDiv : num;
   }
-  if (nums[3] === void 0) {
+  if (index < 4) {
     nums[3] = 1;
   }
   return nums;
@@ -7247,7 +7244,7 @@ function getElementSSRData(el) {
 function registerSSRDataGetter(getter) {
   ssrDataGetter = getter;
 }
-var version = "5.6.89";
+var version = "5.6.91";
 
 // src/util/number.ts
 var RADIAN_EPSILON = 1e-4;
@@ -14328,9 +14325,9 @@ function setTextStyleCommon(textStyle, textStyleModel, opt, isNotNormal, isAttac
   if (overflow) {
     textStyle.overflow = overflow;
   }
-  const margin = textStyleModel.get("minMargin");
-  if (margin != null) {
-    textStyle.margin = margin;
+  const margin2 = textStyleModel.get("minMargin");
+  if (margin2 != null) {
+    textStyle.margin = margin2;
   }
   setTokenTextStyle(textStyle, textStyleModel, globalTextStyle, opt, isNotNormal, isAttached, true, false);
 }
@@ -15647,7 +15644,7 @@ function boxLayout(orient, group, gap, maxWidth, maxHeight) {
 var box = boxLayout;
 var vbox = curry(boxLayout, "vertical");
 var hbox = curry(boxLayout, "horizontal");
-function getAvailableSize(positionInfo, containerRect, margin) {
+function getAvailableSize(positionInfo, containerRect, margin2) {
   const containerWidth = containerRect.width;
   const containerHeight = containerRect.height;
   let x = parsePercent2(positionInfo.left, containerWidth);
@@ -15658,14 +15655,14 @@ function getAvailableSize(positionInfo, containerRect, margin) {
   (isNaN(x2) || isNaN(parseFloat(positionInfo.right))) && (x2 = containerWidth);
   (isNaN(y) || isNaN(parseFloat(positionInfo.top))) && (y = 0);
   (isNaN(y2) || isNaN(parseFloat(positionInfo.bottom))) && (y2 = containerHeight);
-  margin = normalizeCssArray2(margin || 0);
+  margin2 = normalizeCssArray2(margin2 || 0);
   return {
-    width: Math.max(x2 - x - margin[1] - margin[3], 0),
-    height: Math.max(y2 - y - margin[0] - margin[2], 0)
+    width: Math.max(x2 - x - margin2[1] - margin2[3], 0),
+    height: Math.max(y2 - y - margin2[0] - margin2[2], 0)
   };
 }
-function getLayoutRect(positionInfo, containerRect, margin) {
-  margin = normalizeCssArray2(margin || 0);
+function getLayoutRect(positionInfo, containerRect, margin2) {
+  margin2 = normalizeCssArray2(margin2 || 0);
   const containerWidth = containerRect.width;
   const containerHeight = containerRect.height;
   let left = parsePercent2(positionInfo.left, containerWidth);
@@ -15674,8 +15671,8 @@ function getLayoutRect(positionInfo, containerRect, margin) {
   const bottom = parsePercent2(positionInfo.bottom, containerHeight);
   let width = parsePercent2(positionInfo.width, containerWidth);
   let height = parsePercent2(positionInfo.height, containerHeight);
-  const verticalMargin = margin[2] + margin[0];
-  const horizontalMargin = margin[1] + margin[3];
+  const verticalMargin = margin2[2] + margin2[0];
+  const horizontalMargin = margin2[1] + margin2[3];
   const aspect = positionInfo.aspect;
   if (isNaN(width)) {
     width = containerWidth - right - horizontalMargin - left;
@@ -15706,7 +15703,7 @@ function getLayoutRect(positionInfo, containerRect, margin) {
   }
   switch (positionInfo.left || positionInfo.right) {
     case "center":
-      left = containerWidth / 2 - width / 2 - margin[3];
+      left = containerWidth / 2 - width / 2 - margin2[3];
       break;
     case "right":
       left = containerWidth - width - horizontalMargin;
@@ -15715,7 +15712,7 @@ function getLayoutRect(positionInfo, containerRect, margin) {
   switch (positionInfo.top || positionInfo.bottom) {
     case "middle":
     case "center":
-      top = containerHeight / 2 - height / 2 - margin[0];
+      top = containerHeight / 2 - height / 2 - margin2[0];
       break;
     case "bottom":
       top = containerHeight - height - verticalMargin;
@@ -15729,11 +15726,11 @@ function getLayoutRect(positionInfo, containerRect, margin) {
   if (isNaN(height)) {
     height = containerHeight - verticalMargin - top - (bottom || 0);
   }
-  const rect = new BoundingRect_default(left + margin[3], top + margin[0], width, height);
-  rect.margin = margin;
+  const rect = new BoundingRect_default(left + margin2[3], top + margin2[0], width, height);
+  rect.margin = margin2;
   return rect;
 }
-function positionElement(el, positionInfo, containerRect, margin, opt, out2) {
+function positionElement(el, positionInfo, containerRect, margin2, opt, out2) {
   const h = !opt || !opt.hv || opt.hv[0];
   const v = !opt || !opt.hv || opt.hv[1];
   const boundingMode = opt && opt.boundingMode || "all";
@@ -15754,7 +15751,7 @@ function positionElement(el, positionInfo, containerRect, margin, opt, out2) {
       rect.applyTransform(transform2);
     }
   }
-  const layoutRect = getLayoutRect(defaults({width: rect.width, height: rect.height}, positionInfo), containerRect, margin);
+  const layoutRect = getLayoutRect(defaults({width: rect.width, height: rect.height}, positionInfo), containerRect, margin2);
   const dx = h ? layoutRect.x - rect.x : 0;
   const dy = v ? layoutRect.y - rect.y : 0;
   if (boundingMode === "raw") {
@@ -28185,6 +28182,45 @@ var OrdinalMeta = class {
   getMarksByWeight() {
     return this._marksByWeight;
   }
+  reFillExtraCategories(startTime) {
+    const timePoints = [];
+    const marksByWeight = new HashMap();
+    const formatInterval = this.dataInterval === "1D";
+    const utcOffsetTime = this.utcOffsetTime;
+    const addItem = (value, index) => {
+      const d = formatInterval ? convertToUTCDayStart(value - utcOffsetTime) : value * 1e3;
+      timePoints.push({
+        originalTime: value,
+        index,
+        timestamp: d / 1e3
+      });
+    };
+    const categories = this.categories;
+    each(categories, (val, index) => {
+      addItem(val, index);
+    });
+    const extraCategory = this.loadMoreCategory(startTime, 300);
+    map(extraCategory, (val, i) => {
+      const index = i + categories.length;
+      addItem(val, index);
+    });
+    if (timePoints.length) {
+      fillWeightsForPoints(timePoints);
+      for (let index = 0; index < timePoints.length; ++index) {
+        const point = timePoints[index];
+        let marksForWeight = marksByWeight.get(point.weight);
+        if (marksForWeight === void 0) {
+          marksForWeight = [];
+          marksByWeight.set(point.weight, marksForWeight);
+        }
+        marksForWeight.push(point);
+      }
+    }
+    this.extraCategory = extraCategory;
+    this._marksByWeight = marksByWeight;
+    this._appendCount = 0;
+    this.cache = null;
+  }
   appendData(data) {
     if (this._map) {
       const length2 = this.categories.length;
@@ -28193,6 +28229,11 @@ var OrdinalMeta = class {
       });
     }
     this.categories.push(...data);
+    const lastUpdateTime = +data[data.length - 1];
+    if (lastUpdateTime !== +this.extraCategory[0]) {
+      this.reFillExtraCategories(lastUpdateTime);
+      return;
+    }
     this.extraCategory.splice(0, data.length);
     if (this.loadMoreCategory) {
       const startTime = this.extraCategory[this.extraCategory.length - 1];
@@ -30440,29 +30481,29 @@ __export(util_exports2, {
 
 // src/util/color.ts
 function parseColor(color2) {
-  if (color2.startsWith("#")) {
-    color2 = color2.slice(1);
-    if (color2.length === 3) {
-      color2 = color2.split("").map((c) => c + c).join("");
-    }
-    if (color2.length !== 6 || !/^[0-9A-Fa-f]{6}$/.test(color2)) {
-      return [0, 0, 0];
-    }
+  color2 = color2.trim().toLowerCase();
+  const rgbRegex = /^rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})/;
+  const rgbMatch = color2.match(rgbRegex);
+  if (rgbMatch) {
     return [
-      parseInt(color2.slice(0, 2), 16),
-      parseInt(color2.slice(2, 4), 16),
-      parseInt(color2.slice(4, 6), 16)
+      parseInt(rgbMatch[1], 10),
+      parseInt(rgbMatch[2], 10),
+      parseInt(rgbMatch[3], 10)
     ];
   }
-  const match = color2.match(/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})(?:\s*,\s*[\d.]+)?\s*\)/);
-  if (!match) {
-    return [0, 0, 0];
+  if (color2.startsWith("#")) {
+    let hex = color2.slice(1);
+    if (hex.length === 3 || hex.length === 4) {
+      hex = hex.split("").map((c) => c + c).join("");
+    }
+    if (hex.length === 6 || hex.length === 8) {
+      const r = parseInt(hex.slice(0, 2), 16);
+      const g = parseInt(hex.slice(2, 4), 16);
+      const b = parseInt(hex.slice(4, 6), 16);
+      return [r, g, b];
+    }
   }
-  return [
-    parseInt(match[1], 10),
-    parseInt(match[2], 10),
-    parseInt(match[3], 10)
-  ];
+  return [0, 0, 0];
 }
 function contrastColor2(color2) {
   const [r, g, b] = parseColor(color2);
@@ -30957,9 +30998,9 @@ var Axis = class {
 function fixExtentWithBands(extent3, nTick) {
   const size = extent3[1] - extent3[0];
   const len2 = nTick;
-  const margin = size / len2 / 2;
-  extent3[0] += margin;
-  extent3[1] -= margin;
+  const margin2 = size / len2 / 2;
+  extent3[0] += margin2;
+  extent3[1] -= margin2;
 }
 function fixOnBandTicksCoords(axis, ticksCoords, alignWithLabel, clamp2) {
   const ticksLen = ticksCoords.length;
@@ -38131,8 +38172,8 @@ function constrainTextWidth(layout18, availableWidth, forceRecalculate = false)
     }
     const newRect = label.getBoundingRect();
     textRect.width = newRect.width;
-    const margin = (label.style.margin || 0) + 2.1;
-    textRect.height = newRect.height + margin;
+    const margin2 = (label.style.margin || 0) + 2.1;
+    textRect.height = newRect.height + margin2;
     textRect.y -= (textRect.height - oldHeight) / 2;
   }
 }
@@ -38260,9 +38301,9 @@ function pieLabelLayout(seriesModel) {
     if (!isLabelInside) {
       const textRect = label.getBoundingRect().clone();
       textRect.applyTransform(label.getComputedTransform());
-      const margin = (label.style.margin || 0) + 2.1;
-      textRect.y -= margin / 2;
-      textRect.height += margin;
+      const margin2 = (label.style.margin || 0) + 2.1;
+      textRect.y -= margin2 / 2;
+      textRect.height += margin2;
       labelLayoutList.push({
         label,
         labelLine,
@@ -39682,12 +39723,12 @@ var Grid2 = class {
           const labelUnionRect = estimateLabelUnionRect(axis);
           if (labelUnionRect) {
             const dim = axis.isHorizontal() ? "height" : "width";
-            const margin = axis.model.get(["axisLabel", "margin"]);
-            gridRect[dim] -= labelUnionRect[dim] + margin;
+            const margin2 = axis.model.get(["axisLabel", "margin"]);
+            gridRect[dim] -= labelUnionRect[dim] + margin2;
             if (axis.position === "top") {
-              gridRect.y += labelUnionRect.height + margin;
+              gridRect.y += labelUnionRect.height + margin2;
             } else if (axis.position === "left") {
-              gridRect.x += labelUnionRect.width + margin;
+              gridRect.x += labelUnionRect.width + margin2;
             }
           }
         }
@@ -55748,23 +55789,49 @@ var LinePlotPath = class extends Path_default {
     return new LinePlotShape();
   }
   buildPath(ctx2, shape) {
-    const {points: points4} = shape;
-    for (let index = 0; index < points4.length; index++) {
-      const point = points4[index];
-      if (point === 0 || isPointNull3(point)) {
-        let nextPoint = points4[++index];
-        while ((nextPoint === 0 || isPointNull3(nextPoint)) && index < points4.length) {
-          nextPoint = points4[++index];
+    const {points: points4, connectSelf, barWidth} = shape;
+    if (connectSelf) {
+      const offset = barWidth / 2;
+      let isMove = false;
+      for (let index = 0; index < points4.length; index++) {
+        const point = points4[index];
+        if (point === 0 || isPointNull3(point)) {
+          isMove = true;
+          continue;
         }
-        if (!nextPoint) {
+        if (isMove) {
+          const nextPoint = points4[index + 1];
+          const [x, y] = point;
+          if (!nextPoint || isPointNull3(nextPoint)) {
+            ctx2.moveTo(x - offset, y);
+            ctx2.lineTo(x + offset, y);
+            continue;
+          }
+          ctx2.moveTo(x, y);
+          isMove = false;
+        } else {
+          const [x, y] = point;
+          ctx2.lineTo(x, y);
+        }
+      }
+    } else {
+      for (let index = 0; index < points4.length; index++) {
+        const point = points4[index];
+        if (point === 0 || isPointNull3(point)) {
+          let nextPoint = points4[++index];
+          while ((nextPoint === 0 || isPointNull3(nextPoint)) && index < points4.length) {
+            nextPoint = points4[++index];
+          }
+          if (!nextPoint) {
+            continue;
+          }
+          const [x2, y2] = nextPoint;
+          ctx2.moveTo(x2, y2);
           continue;
         }
-        const [x2, y2] = nextPoint;
-        ctx2.moveTo(x2, y2);
-        continue;
+        const [x, y] = point;
+        ctx2.lineTo(x, y);
       }
-      const [x, y] = point;
-      ctx2.lineTo(x, y);
     }
   }
 };
@@ -56268,6 +56335,9 @@ var LinesPlotView2 = class extends Chart_default {
       const lineGroup = this._lineGroup;
       const z2 = seriesModel.get("z2");
       const visualColor = getVisualGradient2(data, seriesModel.coordinateSystem, api2);
+      const connectNulls = seriesModel.get("connectNulls");
+      const step = seriesModel.get("step");
+      const barSpace = Math.floor((seriesModel.coordinateSystem.getAxesByScale("ordinal")[0].scale.barSpace || calculatebandWidth(seriesModel, data)) * 0.8) || 1;
       each(linePointsByKey, function(item, key) {
         const [stroke, lineDash, lineWidth] = key.split(":");
         const {color: color2, isDefaultColor} = getFormatColor(stroke);
@@ -56276,12 +56346,15 @@ var LinesPlotView2 = class extends Chart_default {
         }
         const el = new LinePlotPath_default({
           shape: {
-            points: item
+            points: item,
+            connectSelf: !connectNulls && !step,
+            barWidth: barSpace
           },
           style: {
             lineDash,
             stroke: visualColor || color2,
             lineWidth: +lineWidth,
+            lineCap: "round",
             lineJoin: "round"
           },
           z2: isDefaultColor ? LastZ2 : z2
@@ -58369,6 +58442,9 @@ var boxFontSizeMapping = {
   tiny: 8
 };
 function getFontSize(size, text, maxWidth, font) {
+  if (typeof size === "number") {
+    return size;
+  }
   return boxFontSizeMapping[size] || findFontSize(text, maxWidth, font, 2);
 }
 
@@ -60034,6 +60110,9 @@ var labelFontSizeMapping = {
   tiny: 8
 };
 function getSymbolLabelFontSize(size, width) {
+  if (typeof size === "number") {
+    return size;
+  }
   if (size === "auto" && width) {
     return Math.max(8, width / 2);
   }
@@ -60172,7 +60251,8 @@ var labelsLayout = {
           }
           let textRect = void 0;
           if (textShow) {
-            textRect = getTextRect2(text, `${fontSize || gfontSize} ${labelModel.fontFamily || gfontFamily}`);
+            const textSize = fontSize ? fontSize + "px" : gfontSize;
+            textRect = getTextRect2(text, `${textSize} ${labelModel.fontFamily || gfontFamily}`);
             if (isLabel) {
               symbolSize = [textRect.width + HPadding, textRect.height + VPadding];
             }
@@ -61929,7 +62009,7 @@ var ThemeRiverView2 = class extends Chart_default {
       let polygon;
       const textLayout = data.getItemLayout(indices[0]);
       const labelModel = seriesModel.getModel("label");
-      const margin = labelModel.get("margin");
+      const margin2 = labelModel.get("margin");
       const emphasisModel = seriesModel.getModel("emphasis");
       if (status === "add") {
         const layerGroup = newLayersGroups[idx] = new Group_default();
@@ -61978,7 +62058,7 @@ var ThemeRiverView2 = class extends Chart_default {
       });
       const labelEl = polygon.getTextContent();
       if (labelEl) {
-        labelEl.x = textLayout.x - margin;
+        labelEl.x = textLayout.x - margin2;
         labelEl.y = textLayout.y0 + textLayout.y / 2;
       }
       polygon.useStyle(style);
@@ -65457,6 +65537,9 @@ function axisTrigger(payload, ecModel, api2) {
   if (!tooltipDisabled) {
     dispatchTooltipActually(dataByCoordSys, point, payload, dispatchAction3);
   }
+  if (payload.showPoint) {
+    dispatchPointer(ecModel, shouldHide || !outputPayload.axesInfo.length, point, dispatchAction3);
+  }
   const highlightDisabled = ecModel.get("highlightDisabled");
   if (!highlightDisabled) {
     dispatchHighDownActually(axesInfo, dispatchAction3, api2);
@@ -65628,6 +65711,23 @@ function dispatchTooltipActually(dataByCoordSys, point, payload, dispatchAction3
     dataByCoordSys: dataByCoordSys.list
   });
 }
+function dispatchPointer(ecModel, shouldHide, point, dispatchAction3) {
+  if (illegalPoint(point) || shouldHide) {
+    dispatchAction3({type: "hidePointer"});
+    return;
+  }
+  const grid = ecModel.getComponent("grid", 0);
+  const yAxis = grid.coordinateSystem.getAxis("y");
+  const xAxis = grid.coordinateSystem.getAxis("x");
+  const yData = yAxis.coordToData(yAxis.toLocalCoord(point[1]));
+  const xData = xAxis.coordToData(xAxis.toLocalCoord(point[0]));
+  dispatchAction3({
+    type: "showPointer",
+    escapeConnect: true,
+    x: xData,
+    y: yData
+  });
+}
 function dispatchHighDownActually(axesInfo, dispatchAction3, api2) {
   const zr = api2.getZr();
   const highDownKey = "axisPointerLastHighlights";
@@ -67441,20 +67541,20 @@ var CalendarView2 = class extends Component_default2 {
     }
     return params.nameMap;
   }
-  _yearTextPositionControl(textEl, point, orient, position2, margin) {
+  _yearTextPositionControl(textEl, point, orient, position2, margin2) {
     let x = point[0];
     let y = point[1];
     let aligns = ["center", "bottom"];
     if (position2 === "bottom") {
-      y += margin;
+      y += margin2;
       aligns = ["center", "top"];
     } else if (position2 === "left") {
-      x -= margin;
+      x -= margin2;
     } else if (position2 === "right") {
-      x += margin;
+      x += margin2;
       aligns = ["center", "top"];
     } else {
-      y -= margin;
+      y -= margin2;
     }
     let rotate2 = 0;
     if (position2 === "left" || position2 === "right") {
@@ -67475,7 +67575,7 @@ var CalendarView2 = class extends Component_default2 {
     if (!yearLabel.get("show")) {
       return;
     }
-    const margin = yearLabel.get("margin");
+    const margin2 = yearLabel.get("margin");
     let pos = yearLabel.get("position");
     if (!pos) {
       pos = orient !== "horizontal" ? "top" : "left";
@@ -67507,16 +67607,16 @@ var CalendarView2 = class extends Component_default2 {
         text: content
       })
     });
-    yearText.attr(this._yearTextPositionControl(yearText, posPoints[pos], orient, pos, margin));
+    yearText.attr(this._yearTextPositionControl(yearText, posPoints[pos], orient, pos, margin2));
     group.add(yearText);
   }
-  _monthTextPositionControl(point, isCenter, orient, position2, margin) {
+  _monthTextPositionControl(point, isCenter, orient, position2, margin2) {
     let align = "left";
     let vAlign = "top";
     let x = point[0];
     let y = point[1];
     if (orient === "horizontal") {
-      y = y + margin;
+      y = y + margin2;
       if (isCenter) {
         align = "center";
       }
@@ -67524,7 +67624,7 @@ var CalendarView2 = class extends Component_default2 {
         vAlign = "bottom";
       }
     } else {
-      x = x + margin;
+      x = x + margin2;
       if (isCenter) {
         vAlign = "middle";
       }
@@ -67545,7 +67645,7 @@ var CalendarView2 = class extends Component_default2 {
       return;
     }
     let nameMap = monthLabel.get("nameMap");
-    let margin = monthLabel.get("margin");
+    let margin2 = monthLabel.get("margin");
     const pos = monthLabel.get("position");
     const align = monthLabel.get("align");
     const termPoints = [this._tlpoints, this._blpoints];
@@ -67557,7 +67657,7 @@ var CalendarView2 = class extends Component_default2 {
     }
     const idx = pos === "start" ? 0 : 1;
     const axis = orient === "horizontal" ? 0 : 1;
-    margin = pos === "start" ? -margin : margin;
+    margin2 = pos === "start" ? -margin2 : margin2;
     const isCenter = align === "center";
     for (let i = 0; i < termPoints[idx].length - 1; i++) {
       const tmp = termPoints[idx][i].slice();
@@ -67578,22 +67678,22 @@ var CalendarView2 = class extends Component_default2 {
       const content = this._formatterLabel(formatter, params);
       const monthText = new Text_default({
         z2: 30,
-        style: extend(createTextStyle(monthLabel, {text: content}), this._monthTextPositionControl(tmp, isCenter, orient, pos, margin))
+        style: extend(createTextStyle(monthLabel, {text: content}), this._monthTextPositionControl(tmp, isCenter, orient, pos, margin2))
       });
       group.add(monthText);
     }
   }
-  _weekTextPositionControl(point, orient, position2, margin, cellSize) {
+  _weekTextPositionControl(point, orient, position2, margin2, cellSize) {
     let align = "center";
     let vAlign = "middle";
     let x = point[0];
     let y = point[1];
     const isStart = position2 === "start";
     if (orient === "horizontal") {
-      x = x + margin + (isStart ? 1 : -1) * cellSize[0] / 2;
+      x = x + margin2 + (isStart ? 1 : -1) * cellSize[0] / 2;
       align = isStart ? "right" : "left";
     } else {
-      y = y + margin + (isStart ? 1 : -1) * cellSize[1] / 2;
+      y = y + margin2 + (isStart ? 1 : -1) * cellSize[1] / 2;
       vAlign = isStart ? "bottom" : "top";
     }
     return {
@@ -67611,7 +67711,7 @@ var CalendarView2 = class extends Component_default2 {
     const coordSys = calendarModel.coordinateSystem;
     const pos = dayLabel.get("position");
     let nameMap = dayLabel.get("nameMap");
-    let margin = dayLabel.get("margin");
+    let margin2 = dayLabel.get("margin");
     const firstDayOfWeek = coordSys.getFirstDayOfWeek();
     if (!nameMap || isString(nameMap)) {
       if (nameMap) {
@@ -67622,10 +67722,10 @@ var CalendarView2 = class extends Component_default2 {
     }
     let start2 = coordSys.getNextNDay(rangeData.end.time, 7 - rangeData.lweek).time;
     const cellSize = [coordSys.getCellWidth(), coordSys.getCellHeight()];
-    margin = parsePercent2(margin, Math.min(cellSize[1], cellSize[0]));
+    margin2 = parsePercent2(margin2, Math.min(cellSize[1], cellSize[0]));
     if (pos === "start") {
       start2 = coordSys.getNextNDay(rangeData.start.time, -(7 + rangeData.fweek)).time;
-      margin = -margin;
+      margin2 = -margin2;
     }
     for (let i = 0; i < 7; i++) {
       const tmpD = coordSys.getNextNDay(start2, i);
@@ -67634,7 +67734,7 @@ var CalendarView2 = class extends Component_default2 {
       day = Math.abs((i + firstDayOfWeek) % 7);
       const weekText = new Text_default({
         z2: 30,
-        style: extend(createTextStyle(dayLabel, {text: nameMap[day]}), this._weekTextPositionControl(point, orient, pos, margin, cellSize))
+        style: extend(createTextStyle(dayLabel, {text: nameMap[day]}), this._weekTextPositionControl(point, orient, pos, margin2, cellSize))
       });
       group.add(weekText);
     }
@@ -68995,6 +69095,10 @@ var AxisProxy = class {
         this._percentWindow = [void 0, void 0];
       } else {
         const dataWindow = this.calculateDataWindow(dataZoomModel.settledOption);
+        if (dataWindow.valueWindow[0] === dataWindow.valueWindow[1]) {
+          dataWindow.valueWindow[0] = dataWindow.valueWindow[0] - 0.5;
+          dataWindow.valueWindow[1] = dataWindow.valueWindow[1] + 0.5;
+        }
         this._valueWindow = dataWindow.valueWindow;
         this._percentWindow = dataWindow.percentWindow;
       }
@@ -70742,6 +70846,10 @@ TooltipModel.defaultOption = {
       width: 1,
       type: "dashed",
       textStyle: {}
+    },
+    pointerStyle: {
+      r: 6,
+      color: "rgb(41,98,255)"
     }
   },
   textStyle: {
@@ -71237,6 +71345,7 @@ var TooltipView2 = class extends Component_default2 {
   constructor() {
     super(...arguments);
     this.type = TooltipView2.type;
+    this._lastPoint = [];
   }
   init(ecModel, api2) {
     if (env_default.node || !api2.getDom()) {
@@ -71256,6 +71365,7 @@ var TooltipView2 = class extends Component_default2 {
     this._tooltipModel = tooltipModel;
     this._ecModel = ecModel;
     this._api = api2;
+    this._keepShowPoint(tooltipModel, ecModel);
     if (!tooltipModel.get("showContent")) {
       return;
     }
@@ -71727,10 +71837,65 @@ var TooltipView2 = class extends Component_default2 {
       from: this.uid
     });
   }
+  _updatePointer(tooltipModel, ecModel, point) {
+    const [x, y] = point;
+    const grid = ecModel.getComponent("grid", 0);
+    const yAxis = grid.coordinateSystem.getAxis("y");
+    const xAxis = grid.coordinateSystem.getAxis("x");
+    const cx = xAxis.toGlobalCoord(xAxis.dataToCoord(x));
+    const cy = yAxis.toGlobalCoord(yAxis.dataToCoord(y));
+    const pointerEl = this._pointEl;
+    const pointerStyle = tooltipModel.getModel("axisPointer").get("pointerStyle");
+    pointerEl.attr({
+      style: {
+        fill: pointerStyle.color
+      },
+      shape: {
+        cx,
+        cy
+      }
+    });
+  }
+  _keepShowPoint(tooltipModel, ecModel) {
+    if (!this._pointEl) {
+      return;
+    }
+    this.group.add(this._pointEl);
+    this._updatePointer(tooltipModel, ecModel, this._lastPoint);
+  }
+  showPoint(tooltipModel, ecModel, api2, payload) {
+    const pointerStyle = tooltipModel.getModel("axisPointer").get("pointerStyle");
+    if (!this._pointEl) {
+      this._pointEl = new Circle_default({
+        shape: {
+          r: pointerStyle.r
+        },
+        style: {
+          fill: pointerStyle.color
+        }
+      });
+      this.group.add(this._pointEl);
+    }
+    const {x, y} = payload;
+    this._updatePointer(tooltipModel, ecModel, [x, y]);
+    this._lastPoint = [x, y];
+  }
+  hidePoint(tooltipModel, ecModel, api2, payload) {
+    if (this._pointEl) {
+      this.group.remove(this._pointEl);
+      this._pointEl = null;
+      this._lastPoint = [];
+    }
+  }
   dispose(ecModel, api2) {
     if (env_default.node || !api2.getDom()) {
       return;
     }
+    if (this._pointEl) {
+      this.group.remove(this._pointEl);
+      this._pointEl = null;
+      this._lastPoint = [];
+    }
     clear(this, "_updatePosition");
     this._tooltipContent.dispose();
     unregister("itemTooltip", api2);
@@ -71877,6 +72042,16 @@ function install51(registers) {
     event: "hideTip",
     update: "tooltip:manuallyHideTip"
   }, noop);
+  registers.registerAction({
+    type: "showPointer",
+    event: "showPointer",
+    update: "tooltip:showPoint"
+  }, noop);
+  registers.registerAction({
+    type: "hidePointer",
+    event: "hidePointer",
+    update: "tooltip:hidePoint"
+  }, noop);
 }
 
 // src/component/brush/preprocessor.ts
@@ -72788,6 +72963,7 @@ function getTextYOffset(height, align, paddings) {
       return paddings;
   }
 }
+var margin = 6;
 function getXYByPosition(rect, position2, width, height, frame_width = 0) {
   let x = rect.x;
   let y = rect.y;
@@ -72804,16 +72980,16 @@ function getXYByPosition(rect, position2, width, height, frame_width = 0) {
         x = x + (rect.width - width) / 2 + frame_width;
         break;
       case "top":
-        y = y + frame_width;
+        y = y + frame_width + margin;
         break;
       case "bottom":
-        y = y + rect.height - height - frame_width;
+        y = y + rect.height - height - frame_width - margin;
         break;
       case "middle":
         y = y + (rect.height - height) / 2 + frame_width;
         break;
       default:
-        y = y + frame_width;
+        y = y + frame_width + margin;
         break;
     }
   }
@@ -75744,7 +75920,10 @@ var markerTypeCalculator2 = {
       const closeValue = seriesData.getByRawIndex("close", lastIndex);
       const openValue = seriesData.getByRawIndex("open", lastIndex);
       const sign = openValue > closeValue ? -1 : 1;
-      fill = dataItem.get(sign > 0 ? positiveBorderColorQuery : negativeBorderColorQuery);
+      fill = dataItem.get(sign > 0 ? positiveColorQuery : negativeColorQuery);
+      if (fill === "transparent") {
+        fill = dataItem.get(sign > 0 ? positiveBorderColorQuery : negativeBorderColorQuery);
+      }
     } else if (isPlot(seriesModel.subType)) {
       const isLinesPlot = seriesModel.subType === "linesPlot";
       const dataItem = seriesData.getItemModel(lastIndex, true);
@@ -75780,7 +75959,10 @@ var markerTypeCalculator2 = {
       const closeValue = seriesData.get("close", lastItem);
       const openValue = seriesData.get("open", lastItem);
       const sign = openValue > closeValue ? -1 : 1;
-      fill = dataItem.get(sign > 0 ? positiveBorderColorQuery : negativeBorderColorQuery);
+      fill = dataItem.get(sign > 0 ? positiveColorQuery : negativeColorQuery);
+      if (fill === "transparent") {
+        fill = dataItem.get(sign > 0 ? positiveBorderColorQuery : negativeBorderColorQuery);
+      }
     }
     return {
       value: seriesData.getByRawIndex(item.valueDim, lastIndex),