tvcharts 0.8.97 → 0.8.98

package/dist/echarts.js

@@ -2124,10 +2124,10 @@ var Handler = class extends Eventful_default {
         const rStep = 4;
         const thetaStep = Math.PI / 12;
         const PI210 = Math.PI * 2;
-        for (let r = 0; r < targetSizeHalf; r += rStep) {
+        for (let r2 = 0; r2 < targetSizeHalf; r2 += rStep) {
           for (let theta = 0; theta < PI210; theta += thetaStep) {
-            const x1 = x + r * Math.cos(theta);
-            const y1 = y + r * Math.sin(theta);
+            const x1 = x + r2 * Math.cos(theta);
+            const y1 = y + r2 * Math.sin(theta);
             setHoverTarget(candidates, out2, x1, y1, exclude);
             if (out2.target) {
               return out2;
@@ -2229,12 +2229,12 @@ var Handler_default = Handler;
 var DEFAULT_MIN_MERGE = 32;
 var DEFAULT_MIN_GALLOPING = 7;
 function minRunLength(n) {
-  var r = 0;
+  var r2 = 0;
   while (n >= DEFAULT_MIN_MERGE) {
-    r |= n & 1;
+    r2 |= n & 1;
     n >>= 1;
   }
-  return n + r;
+  return n + r2;
 }
 function makeAscendingRun(array, lo, hi, compare2) {
   var runHi = lo + 1;
@@ -3833,8 +3833,8 @@ function cssHueToRgb(m1, m2, h) {
 function lerpNumber(a, b, p) {
   return a + (b - a) * p;
 }
-function setRgba(out2, r, g, b, a) {
-  out2[0] = r;
+function setRgba(out2, r2, g, b, a) {
+  out2[0] = r2;
   out2[1] = g;
   out2[2] = b;
   out2[3] = a;
@@ -9355,7 +9355,7 @@ var PathProxy2 = class {
     this._yi = y2;
     return this;
   }
-  arc(cx, cy, r, startAngle, endAngle, anticlockwise) {
+  arc(cx, cy, r2, startAngle, endAngle, anticlockwise) {
     this._drawPendingPt();
     tmpAngles[0] = startAngle;
     tmpAngles[1] = endAngle;
@@ -9363,10 +9363,10 @@ var PathProxy2 = class {
     startAngle = tmpAngles[0];
     endAngle = tmpAngles[1];
     let delta = endAngle - startAngle;
-    this.addData(CMD.A, cx, cy, r, r, startAngle, delta, 0, anticlockwise ? 0 : 1);
-    this._ctx && this._ctx.arc(cx, cy, r, startAngle, endAngle, anticlockwise);
-    this._xi = mathCos2(endAngle) * r + cx;
-    this._yi = mathSin2(endAngle) * r + cy;
+    this.addData(CMD.A, cx, cy, r2, r2, startAngle, delta, 0, anticlockwise ? 0 : 1);
+    this._ctx && this._ctx.arc(cx, cy, r2, startAngle, endAngle, anticlockwise);
+    this._xi = mathCos2(endAngle) * r2 + cx;
+    this._yi = mathSin2(endAngle) * r2 + cy;
     return this;
   }
   arcTo(x1, y1, x2, y2, radius) {
@@ -9808,7 +9808,7 @@ var PathProxy2 = class {
             let delta = d[i++];
             const psi = d[i++];
             const anticlockwise = !d[i++];
-            const r = rx > ry ? rx : ry;
+            const r2 = rx > ry ? rx : ry;
             const isEllipse = mathAbs(rx - ry) > 1e-3;
             let endAngle = startAngle + delta;
             let breakBuild = false;
@@ -9823,7 +9823,7 @@ var PathProxy2 = class {
             if (isEllipse && ctx2.ellipse) {
               ctx2.ellipse(cx, cy, rx, ry, psi, startAngle, endAngle, anticlockwise);
             } else {
-              ctx2.arc(cx, cy, r, startAngle, endAngle, anticlockwise);
+              ctx2.arc(cx, cy, r2, startAngle, endAngle, anticlockwise);
             }
             if (breakBuild) {
               break lo;
@@ -9867,20 +9867,20 @@ var PathProxy2 = class {
             ctx2.rect(x, y, width, height);
             break;
           case CMD.F: {
-            const r2 = d[i++];
+            const r3 = d[i++];
             const g = d[i++];
             const b = d[i++];
             const a = d[i++];
-            ctx2.fillStyle = `rgba(${r2},${g},${b},${a})`;
+            ctx2.fillStyle = `rgba(${r3},${g},${b},${a})`;
             ctx2.fill();
             break;
           }
           case CMD.S: {
-            const r2 = d[i++];
+            const r3 = d[i++];
             const g = d[i++];
             const b = d[i++];
             const a = d[i++];
-            ctx2.strokeStyle = `rgba(${r2},${g},${b},${a})`;
+            ctx2.strokeStyle = `rgba(${r3},${g},${b},${a})`;
             ctx2.stroke();
             break;
           }
@@ -9983,7 +9983,7 @@ function normalizeRadian(angle) {
 
 // node_modules/tvrender/src/contain/arc.ts
 var PI24 = Math.PI * 2;
-function containStroke4(cx, cy, r, startAngle, endAngle, anticlockwise, lineWidth, x, y) {
+function containStroke4(cx, cy, r2, startAngle, endAngle, anticlockwise, lineWidth, x, y) {
   if (lineWidth === 0) {
     return false;
   }
@@ -9991,7 +9991,7 @@ function containStroke4(cx, cy, r, startAngle, endAngle, anticlockwise, lineWidt
   x -= cx;
   y -= cy;
   const d = Math.sqrt(x * x + y * y);
-  if (d - _l > r || d + _l < r) {
+  if (d - _l > r2 || d + _l < r2) {
     return false;
   }
   if (Math.abs(startAngle - endAngle) % PI24 < 1e-4) {
@@ -10129,12 +10129,12 @@ function windingQuadratic(x0, y0, x1, y1, x2, y2, x, y) {
     }
   }
 }
-function windingArc(cx, cy, r, startAngle, endAngle, anticlockwise, x, y) {
+function windingArc(cx, cy, r2, startAngle, endAngle, anticlockwise, x, y) {
   y -= cy;
-  if (y > r || y < -r) {
+  if (y > r2 || y < -r2) {
     return 0;
   }
-  const tmp = Math.sqrt(r * r - y * y);
+  const tmp = Math.sqrt(r2 * r2 - y * y);
   roots[0] = -tmp;
   roots[1] = tmp;
   const dTheta = Math.abs(startAngle - endAngle);
@@ -10818,9 +10818,9 @@ function buildPath(ctx2, shape) {
   let y = shape.y;
   let width = shape.width;
   let height = shape.height;
-  let r = shape.r;
+  let r2 = shape.r;
   let r1;
-  let r2;
+  let r22;
   let r3;
   let r4;
   if (width < 0) {
@@ -10831,41 +10831,41 @@ function buildPath(ctx2, shape) {
     y = y + height;
     height = -height;
   }
-  if (typeof r === "number") {
-    r1 = r2 = r3 = r4 = r;
-  } else if (r instanceof Array) {
-    if (r.length === 1) {
-      r1 = r2 = r3 = r4 = r[0];
-    } else if (r.length === 2) {
-      r1 = r3 = r[0];
-      r2 = r4 = r[1];
-    } else if (r.length === 3) {
-      r1 = r[0];
-      r2 = r4 = r[1];
-      r3 = r[2];
+  if (typeof r2 === "number") {
+    r1 = r22 = r3 = r4 = r2;
+  } else if (r2 instanceof Array) {
+    if (r2.length === 1) {
+      r1 = r22 = r3 = r4 = r2[0];
+    } else if (r2.length === 2) {
+      r1 = r3 = r2[0];
+      r22 = r4 = r2[1];
+    } else if (r2.length === 3) {
+      r1 = r2[0];
+      r22 = r4 = r2[1];
+      r3 = r2[2];
     } else {
-      r1 = r[0];
-      r2 = r[1];
-      r3 = r[2];
-      r4 = r[3];
+      r1 = r2[0];
+      r22 = r2[1];
+      r3 = r2[2];
+      r4 = r2[3];
     }
   } else {
-    r1 = r2 = r3 = r4 = 0;
+    r1 = r22 = r3 = r4 = 0;
   }
   let total;
-  if (r1 + r2 > width) {
-    total = r1 + r2;
+  if (r1 + r22 > width) {
+    total = r1 + r22;
     r1 *= width / total;
-    r2 *= width / total;
+    r22 *= width / total;
   }
   if (r3 + r4 > width) {
     total = r3 + r4;
     r3 *= width / total;
     r4 *= width / total;
   }
-  if (r2 + r3 > height) {
-    total = r2 + r3;
-    r2 *= height / total;
+  if (r22 + r3 > height) {
+    total = r22 + r3;
+    r22 *= height / total;
     r3 *= height / total;
   }
   if (r1 + r4 > height) {
@@ -10874,8 +10874,8 @@ function buildPath(ctx2, shape) {
     r4 *= height / total;
   }
   ctx2.moveTo(x + r1, y);
-  ctx2.lineTo(x + width - r2, y);
-  r2 !== 0 && ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
+  ctx2.lineTo(x + width - r22, y);
+  r22 !== 0 && ctx2.arc(x + width - r22, y + r22, r22, -Math.PI / 2, 0);
   ctx2.lineTo(x + width, y + height - r3);
   r3 !== 0 && ctx2.arc(x + width - r3, y + height - r3, r3, 0, Math.PI / 2);
   ctx2.lineTo(x + r4, y + height);
@@ -12791,9 +12791,9 @@ function computeCornerTangents(x0, y0, x1, y1, radius, cr, clockwise) {
   const dx = x10 - x11;
   const dy = y10 - y11;
   const d2 = dx * dx + dy * dy;
-  const r = radius - cr;
+  const r2 = radius - cr;
   const s = x11 * y10 - x10 * y11;
-  const d = (dy < 0 ? -1 : 1) * mathSqrt4(mathMax4(0, r * r * d2 - s * s));
+  const d = (dy < 0 ? -1 : 1) * mathSqrt4(mathMax4(0, r2 * r2 * d2 - s * s));
   let cx0 = (s * dy - dx * d) / d2;
   let cy0 = (-s * dx - dy * d) / d2;
   const cx1 = (s * dy + dx * d) / d2;
@@ -12811,8 +12811,8 @@ function computeCornerTangents(x0, y0, x1, y1, radius, cr, clockwise) {
     cy: cy0,
     x0: -ox,
     y0: -oy,
-    x1: cx0 * (radius / r - 1),
-    y1: cy0 * (radius / r - 1)
+    x1: cx0 * (radius / r2 - 1),
+    y1: cy0 * (radius / r2 - 1)
   };
 }
 function normalizeCornerRadius(cr) {
@@ -13344,14 +13344,14 @@ var Arc = class extends Path_default {
   buildPath(ctx2, shape) {
     const x = shape.cx;
     const y = shape.cy;
-    const r = Math.max(shape.r, 0);
+    const r2 = Math.max(shape.r, 0);
     const startAngle = shape.startAngle;
     const endAngle = shape.endAngle;
     const clockwise = shape.clockwise;
     const unitX = Math.cos(startAngle);
     const unitY = Math.sin(startAngle);
-    ctx2.moveTo(unitX * r + x, unitY * r + y);
-    ctx2.arc(x, y, r, startAngle, endAngle, !clockwise);
+    ctx2.moveTo(unitX * r2 + x, unitY * r2 + y);
+    ctx2.arc(x, y, r2, startAngle, endAngle, !clockwise);
   }
 };
 Arc.prototype.type = "arc";
@@ -13433,11 +13433,11 @@ var LinearGradient_default = LinearGradient;
 
 // node_modules/tvrender/src/graphic/RadialGradient.ts
 var RadialGradient = class extends Gradient_default {
-  constructor(x, y, r, colorStops, globalCoord) {
+  constructor(x, y, r2, colorStops, globalCoord) {
     super(colorStops);
     this.x = x == null ? 0.5 : x;
     this.y = y == null ? 0.5 : y;
-    this.r = r == null ? 0.5 : r;
+    this.r = r2 == null ? 0.5 : r2;
     this.type = "radial";
     this.global = globalCoord || false;
   }
@@ -21216,18 +21216,18 @@ function defaultLoading(api2, opts) {
   }
   group.resize = function() {
     const textWidth = textContent.getBoundingRect().width;
-    const r = opts.showSpinner ? opts.spinnerRadius : 0;
-    const cx = (api2.getWidth() - r * 2 - (opts.showSpinner && textWidth ? 10 : 0) - textWidth) / 2 - (opts.showSpinner && textWidth ? 0 : 5 + textWidth / 2) + (opts.showSpinner ? 0 : textWidth / 2) + (textWidth ? 0 : r);
+    const r2 = opts.showSpinner ? opts.spinnerRadius : 0;
+    const cx = (api2.getWidth() - r2 * 2 - (opts.showSpinner && textWidth ? 10 : 0) - textWidth) / 2 - (opts.showSpinner && textWidth ? 0 : 5 + textWidth / 2) + (opts.showSpinner ? 0 : textWidth / 2) + (textWidth ? 0 : r2);
     const cy = api2.getHeight() / 2;
     opts.showSpinner && arc2.setShape({
       cx,
       cy
     });
     labelRect.setShape({
-      x: cx - r,
-      y: cy - r,
-      width: r * 2,
-      height: r * 2
+      x: cx - r2,
+      y: cy - r2,
+      width: r2 * 2,
+      height: r2 * 2
     });
     mask.setShape({
       x: 0,
@@ -21907,6 +21907,31 @@ function findClosestTimestamp(arr, target) {
   ;
   return Math.abs(+leftClosest - +target) <= Math.abs(+rightClosest - +target) ? leftClosest : rightClosest;
 }
+function findClosestIndex(arr, target) {
+  let left = 0;
+  let right = arr.length - 1;
+  if (arr.length === 0) {
+    return -1;
+  }
+  ;
+  while (left < right) {
+    const mid = Math.floor((left + right) / 2);
+    if (arr[mid] === target) {
+      return mid;
+    } else if (arr[mid] < target) {
+      left = mid + 1;
+    } else {
+      right = mid;
+    }
+  }
+  const leftClosest = arr[left];
+  const rightClosest = left > 0 ? arr[left - 1] : void 0;
+  if (rightClosest === void 0) {
+    return left;
+  }
+  ;
+  return Math.abs(+leftClosest - +target) <= Math.abs(+rightClosest - +target) ? left : right;
+}
 
 // src/visual/symbol.ts
 var SYMBOL_PROPS_WITH_CB = [
@@ -22228,17 +22253,17 @@ var Pin = Path_default.extend({
     const y = shape.y;
     const w = shape.width / 5 * 3;
     const h = Math.max(w, shape.height);
-    const r = w / 2;
-    const dy = r * r / (h - r);
-    const cy = y - h + r + dy;
-    const angle = Math.asin(dy / r);
-    const dx = Math.cos(angle) * r;
+    const r2 = w / 2;
+    const dy = r2 * r2 / (h - r2);
+    const cy = y - h + r2 + dy;
+    const angle = Math.asin(dy / r2);
+    const dx = Math.cos(angle) * r2;
     const tanX = Math.sin(angle);
     const tanY = Math.cos(angle);
-    const cpLen = r * 0.6;
-    const cpLen2 = r * 0.7;
+    const cpLen = r2 * 0.6;
+    const cpLen2 = r2 * 0.7;
     path.moveTo(x - dx, cy + dy);
-    path.arc(x, cy, r, Math.PI - angle, Math.PI * 2 + angle);
+    path.arc(x, cy, r2, Math.PI - angle, Math.PI * 2 + angle);
     path.bezierCurveTo(x + dx - tanX * cpLen, cy + dy + tanY * cpLen, x, y - cpLen2, x, y);
     path.bezierCurveTo(x, y - cpLen2, x - dx + tanX * cpLen, cy + dy + tanY * cpLen, x - dx, cy + dy);
     path.closePath();
@@ -22308,20 +22333,20 @@ var LabelDown = Path_default.extend({
     triangleWidth: 0
   },
   buildPath: function(ctx2, shape) {
-    const {x, y, width, height, r, triangleWidth} = shape;
+    const {x, y, width, height, r: r2, triangleWidth} = shape;
     const triangleHeight = triangleWidth;
-    ctx2.moveTo(x + r, y);
-    ctx2.lineTo(x + width - r, y);
-    ctx2.arc(x + width - r, y + r, r, -Math.PI / 2, 0);
-    ctx2.lineTo(x + width, y + height - r);
-    ctx2.arc(x + width - r, y + height - r, r, 0, Math.PI / 2);
+    ctx2.moveTo(x + r2, y);
+    ctx2.lineTo(x + width - r2, y);
+    ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
+    ctx2.lineTo(x + width, y + height - r2);
+    ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
     ctx2.lineTo(x + width / 2 + triangleWidth, y + height);
     ctx2.lineTo(x + width / 2, y + height + triangleHeight);
     ctx2.lineTo(x + width / 2 - triangleWidth, y + height);
-    ctx2.lineTo(x + r, y + height);
-    ctx2.arc(x + r, y + height - r, r, Math.PI / 2, Math.PI);
-    ctx2.lineTo(x, y + r);
-    ctx2.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5);
+    ctx2.lineTo(x + r2, y + height);
+    ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
+    ctx2.lineTo(x, y + r2);
+    ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
   }
 });
 var LabelUp = Path_default.extend({
@@ -22335,20 +22360,20 @@ var LabelUp = Path_default.extend({
     triangleWidth: 0
   },
   buildPath: function(ctx2, shape) {
-    const {x, y, width, height, r, triangleWidth} = shape;
+    const {x, y, width, height, r: r2, triangleWidth} = shape;
     const triangleHeight = triangleWidth;
-    ctx2.moveTo(x + r, y);
+    ctx2.moveTo(x + r2, y);
     ctx2.lineTo(x + width / 2 - triangleWidth, y);
     ctx2.lineTo(x + width / 2, y - triangleHeight);
     ctx2.lineTo(x + width / 2 + triangleWidth, y);
-    ctx2.lineTo(x + width - r, y);
-    ctx2.arc(x + width - r, y + r, r, -Math.PI / 2, 0);
-    ctx2.lineTo(x + width, y + height - r);
-    ctx2.arc(x + width - r, y + height - r, r, 0, Math.PI / 2);
-    ctx2.lineTo(x + r, y + height);
-    ctx2.arc(x + r, y + height - r, r, Math.PI / 2, Math.PI);
-    ctx2.lineTo(x, y + r);
-    ctx2.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5);
+    ctx2.lineTo(x + width - r2, y);
+    ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
+    ctx2.lineTo(x + width, y + height - r2);
+    ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
+    ctx2.lineTo(x + r2, y + height);
+    ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
+    ctx2.lineTo(x, y + r2);
+    ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
   }
 });
 var LabelLeft = Path_default.extend({
@@ -22362,20 +22387,20 @@ var LabelLeft = Path_default.extend({
     triangleWidth: 0
   },
   buildPath: function(ctx2, shape) {
-    const {x, y, width, height, r, triangleWidth} = shape;
+    const {x, y, width, height, r: r2, triangleWidth} = shape;
     const triangleHeight = triangleWidth;
-    ctx2.moveTo(x + r, y);
-    ctx2.lineTo(x + width - r, y);
-    ctx2.arc(x + width - r, y + r, r, -Math.PI / 2, 0);
-    ctx2.lineTo(x + width, y + height - r);
-    ctx2.arc(x + width - r, y + height - r, r, 0, Math.PI / 2);
-    ctx2.lineTo(x + r, y + height);
-    ctx2.arc(x + r, y + height - r, r, Math.PI / 2, Math.PI);
+    ctx2.moveTo(x + r2, y);
+    ctx2.lineTo(x + width - r2, y);
+    ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
+    ctx2.lineTo(x + width, y + height - r2);
+    ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
+    ctx2.lineTo(x + r2, y + height);
+    ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
     ctx2.lineTo(x, y + height / 2 + triangleWidth);
     ctx2.lineTo(x - triangleHeight, y + height / 2);
     ctx2.lineTo(x, y + height / 2 - triangleWidth);
-    ctx2.lineTo(x, y + r);
-    ctx2.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5);
+    ctx2.lineTo(x, y + r2);
+    ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
   }
 });
 var LabelRight = Path_default.extend({
@@ -22389,20 +22414,20 @@ var LabelRight = Path_default.extend({
     triangleWidth: 0
   },
   buildPath: function(ctx2, shape) {
-    const {x, y, width, height, r, triangleWidth} = shape;
+    const {x, y, width, height, r: r2, triangleWidth} = shape;
     const triangleHeight = triangleWidth;
-    ctx2.moveTo(x + r, y);
-    ctx2.lineTo(x + width - r, y);
-    ctx2.arc(x + width - r, y + r, r, -Math.PI / 2, 0);
+    ctx2.moveTo(x + r2, y);
+    ctx2.lineTo(x + width - r2, y);
+    ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
     ctx2.lineTo(x + width, y + height / 2 - triangleWidth);
     ctx2.lineTo(x + width + triangleHeight, y + height / 2);
     ctx2.lineTo(x + width, y + height / 2 + triangleWidth);
-    ctx2.lineTo(x + width, y + height - r);
-    ctx2.arc(x + width - r, y + height - r, r, 0, Math.PI / 2);
-    ctx2.lineTo(x + r, y + height);
-    ctx2.arc(x + r, y + height - r, r, Math.PI / 2, Math.PI);
-    ctx2.lineTo(x, y + r);
-    ctx2.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5);
+    ctx2.lineTo(x + width, y + height - r2);
+    ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
+    ctx2.lineTo(x + r2, y + height);
+    ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
+    ctx2.lineTo(x, y + r2);
+    ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
   }
 });
 var LabelLowerLeft = Path_default.extend({
@@ -22422,20 +22447,20 @@ var LabelLowerLeft = Path_default.extend({
     const width = shape.width;
     const x = shape.x;
     const y = shape.y;
-    const r = shape.r;
+    const r2 = shape.r;
     const offsetY = shape.offsetY;
     const offsetX = shape.offsetX;
     const offsetWidth = shape.offsetWidth;
-    ctx2.moveTo(x + r, y);
-    ctx2.lineTo(x + width - r, y);
-    ctx2.arc(x + width - r, y + r, r, -Math.PI / 2, 0);
-    ctx2.lineTo(x + width, y + height - r);
-    ctx2.arc(x + width - r, y + height - r, r, 0, Math.PI / 2);
-    ctx2.lineTo(x + r, y + height);
+    ctx2.moveTo(x + r2, y);
+    ctx2.lineTo(x + width - r2, y);
+    ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
+    ctx2.lineTo(x + width, y + height - r2);
+    ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
+    ctx2.lineTo(x + r2, y + height);
     ctx2.lineTo(x - offsetWidth, y + height + offsetY);
     ctx2.lineTo(x, y + height - offsetX);
-    ctx2.lineTo(x, y + r);
-    ctx2.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5);
+    ctx2.lineTo(x, y + r2);
+    ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
   }
 });
 var LabelLowerRight = Path_default.extend({
@@ -22458,17 +22483,17 @@ var LabelLowerRight = Path_default.extend({
     const width = shape.width;
     const x = shape.x;
     const y = shape.y;
-    const r = shape.r;
-    ctx2.moveTo(x + r, y);
-    ctx2.lineTo(x + width - r, y);
-    ctx2.arc(x + width - r, y + r, r, -Math.PI / 2, 0);
+    const r2 = shape.r;
+    ctx2.moveTo(x + r2, y);
+    ctx2.lineTo(x + width - r2, y);
+    ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
     ctx2.lineTo(x + width, y + height - offsetWidth);
     ctx2.lineTo(x + width + offsetX, y + height + offsetY);
-    ctx2.lineTo(x + width - r, y + height);
-    ctx2.lineTo(x + r, y + height);
-    ctx2.arc(x + r, y + height - r, r, Math.PI / 2, Math.PI);
-    ctx2.lineTo(x, y + r);
-    ctx2.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5);
+    ctx2.lineTo(x + width - r2, y + height);
+    ctx2.lineTo(x + r2, y + height);
+    ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
+    ctx2.lineTo(x, y + r2);
+    ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
   }
 });
 var LabelUpperLeft = Path_default.extend({
@@ -22488,20 +22513,20 @@ var LabelUpperLeft = Path_default.extend({
     const width = shape.width;
     const x = shape.x;
     const y = shape.y;
-    const r = shape.r;
+    const r2 = shape.r;
     const offsetY = shape.offsetY;
     const offsetX = shape.offsetX;
     const offsetWidth = shape.offsetWidth;
-    ctx2.moveTo(x + r, y);
-    ctx2.lineTo(x + width - r, y);
-    ctx2.arc(x + width - r, y + r, r, -Math.PI / 2, 0);
-    ctx2.lineTo(x + width, y + height - r);
-    ctx2.arc(x + width - r, y + height - r, r, 0, Math.PI / 2);
-    ctx2.lineTo(x + r, y + height);
-    ctx2.arc(x + r, y + height - r, r, Math.PI / 2, Math.PI);
+    ctx2.moveTo(x + r2, y);
+    ctx2.lineTo(x + width - r2, y);
+    ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
+    ctx2.lineTo(x + width, y + height - r2);
+    ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
+    ctx2.lineTo(x + r2, y + height);
+    ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
     ctx2.lineTo(x, y + offsetWidth);
     ctx2.lineTo(x - offsetX, y - offsetY);
-    ctx2.lineTo(x + r, y);
+    ctx2.lineTo(x + r2, y);
   }
 });
 var LabelUpperRight = Path_default.extend({
@@ -22521,20 +22546,20 @@ var LabelUpperRight = Path_default.extend({
     const width = shape.width;
     const x = shape.x;
     const y = shape.y;
-    const r = shape.r;
+    const r2 = shape.r;
     const offsetY = shape.offsetY;
     const offsetX = shape.offsetX;
     const offsetWidth = shape.offsetWidth;
-    ctx2.moveTo(x + r, y);
-    ctx2.lineTo(x + width - r, y);
+    ctx2.moveTo(x + r2, y);
+    ctx2.lineTo(x + width - r2, y);
     ctx2.lineTo(x + width + offsetX, y - offsetY);
     ctx2.lineTo(x + width, y + offsetWidth);
-    ctx2.lineTo(x + width, y + height - r);
-    ctx2.arc(x + width - r, y + height - r, r, 0, Math.PI / 2);
-    ctx2.lineTo(x + r, y + height);
-    ctx2.arc(x + r, y + height - r, r, Math.PI / 2, Math.PI);
+    ctx2.lineTo(x + width, y + height - r2);
+    ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
+    ctx2.lineTo(x + r2, y + height);
+    ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
     ctx2.lineTo(x, y);
-    ctx2.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5);
+    ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
   }
 });
 var LabelCenter = Path_default.extend({
@@ -22551,16 +22576,16 @@ var LabelCenter = Path_default.extend({
     const width = shape.width;
     const x = shape.x;
     const y = shape.y;
-    const r = shape.r;
-    ctx2.moveTo(x + r, y);
-    ctx2.lineTo(x + width - r, y);
-    ctx2.arc(x + width - r, y + r, r, -Math.PI / 2, 0);
-    ctx2.lineTo(x + width, y + height - r);
-    ctx2.arc(x + width - r, y + height - r, r, 0, Math.PI / 2);
-    ctx2.lineTo(x + r, y + height);
-    ctx2.arc(x + r, y + height - r, r, Math.PI / 2, Math.PI);
+    const r2 = shape.r;
+    ctx2.moveTo(x + r2, y);
+    ctx2.lineTo(x + width - r2, y);
+    ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
+    ctx2.lineTo(x + width, y + height - r2);
+    ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
+    ctx2.lineTo(x + r2, y + height);
+    ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
     ctx2.lineTo(x, y);
-    ctx2.arc(x + r, y + r, r, Math.PI, Math.PI * 1.5);
+    ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
   }
 });
 var XCross = Path_default.extend({
@@ -22986,54 +23011,54 @@ var symbolShapeMakers = {
     shape.height = h;
   },
   labelCenter: function(x, y, w, h, shape) {
-    const r = 2;
+    const r2 = 2;
     const offset = 1;
     shape.x = x - w / 2 + offset;
     shape.y = y - h;
     shape.width = w;
     shape.height = h;
-    shape.r = r;
+    shape.r = r2;
   },
   labelDown: function(x, y, w, h, shape, parentShape) {
     const triangleWidth = parentShape.triangleWidth;
-    const r = 2;
+    const r2 = 2;
     const offset = 1;
     shape.triangleWidth = triangleWidth;
     shape.x = x - w / 2 + offset;
     shape.y = y - h - triangleWidth;
     shape.width = w;
     shape.height = h;
-    shape.r = r;
+    shape.r = r2;
   },
   labelUp: function(x, y, w, h, shape, parentShape) {
-    const r = 2;
+    const r2 = 2;
     const offset = 1;
     shape.x = x - w / 2 + offset;
     shape.triangleWidth = parentShape.triangleWidth;
     shape.y = y - h + parentShape.triangleWidth;
     shape.width = w;
     shape.height = h;
-    shape.r = r;
+    shape.r = r2;
   },
   labelLeft: function(x, y, w, h, shape, parentShape) {
     const triangleWidth = parentShape.triangleWidth;
-    const r = 2;
+    const r2 = 2;
     shape.triangleWidth = triangleWidth;
     shape.x = x + triangleWidth;
     shape.y = y - h / 2;
     shape.width = w;
     shape.height = h;
-    shape.r = r;
+    shape.r = r2;
   },
   labelRight: function(x, y, w, h, shape, parentShape) {
     const triangleWidth = parentShape.triangleWidth;
-    const r = 2;
+    const r2 = 2;
     shape.triangleWidth = triangleWidth;
     shape.x = x - w - triangleWidth;
     shape.y = y - h / 2;
     shape.width = w;
     shape.height = h;
-    shape.r = r;
+    shape.r = r2;
   },
   labelLowerLeft: function(x, y, w, h, shape, parentShape) {
     const offsetY = parentShape.offsetY;
@@ -23308,16 +23333,16 @@ function createRadialGradient(ctx2, obj, rect) {
   const min3 = Math.min(width, height);
   let x = obj.x == null ? 0.5 : obj.x;
   let y = obj.y == null ? 0.5 : obj.y;
-  let r = obj.r == null ? 0.5 : obj.r;
+  let r2 = obj.r == null ? 0.5 : obj.r;
   if (!obj.global) {
     x = x * width + rect.x;
     y = y * height + rect.y;
-    r = r * min3;
+    r2 = r2 * min3;
   }
   x = isSafeNum(x) ? x : 0.5;
   y = isSafeNum(y) ? y : 0.5;
-  r = r >= 0 && isSafeNum(r) ? r : 0.5;
-  const canvasGradient = ctx2.createRadialGradient(x, y, 0, x, y, r);
+  r2 = r2 >= 0 && isSafeNum(r2) ? r2 : 0.5;
+  const canvasGradient = ctx2.createRadialGradient(x, y, 0, x, y, r2);
   return canvasGradient;
 }
 function getCanvasGradient(ctx2, obj, rect) {
@@ -28665,6 +28690,20 @@ var OrdinalMeta = class {
     }
     return index;
   }
+  parseAndExtra(category) {
+    let index;
+    const needCollect = this._needCollect;
+    if (!isString(category) && !needCollect) {
+      return category;
+    }
+    const map9 = this._getOrCreateMap();
+    index = map9.get(category);
+    if (index == null) {
+      const idx = findClosestIndex(this.extraCategory, category);
+      return ~idx ? this.categories.length + idx : NaN;
+    }
+    return index;
+  }
   _getOrCreateMap() {
     return this._map || (this._map = createHashMap(this.categories));
   }
@@ -30851,27 +30890,27 @@ function parseColor(color2) {
       hex = hex.split("").map((c) => c + c).join("");
     }
     if (hex.length === 6 || hex.length === 8) {
-      const r = parseInt(hex.slice(0, 2), 16);
+      const r2 = 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 [r2, g, b];
     }
   }
   return [0, 0, 0];
 }
 function contrastColor2(color2) {
-  const [r, g, b] = parseColor(color2);
-  const brightness = (r * 299 + g * 587 + b * 114) / 1e3;
+  const [r2, g, b] = parseColor(color2);
+  const brightness = (r2 * 299 + g * 587 + b * 114) / 1e3;
   return brightness >= 130 ? "#000000" : "#ffffff";
 }
 function getIsLightColor(color2) {
-  const [r, g, b] = parseColor(color2);
-  const brightness = (r * 299 + g * 587 + b * 114) / 1e3;
+  const [r2, g, b] = parseColor(color2);
+  const brightness = (r2 * 299 + g * 587 + b * 114) / 1e3;
   return brightness >= 130;
 }
 function removeTransparency(color2) {
-  const [r, g, b] = parseColor(color2);
-  return `rgb(${r}, ${g}, ${b})`;
+  const [r2, g, b] = parseColor(color2);
+  return `rgb(${r2}, ${g}, ${b})`;
 }
 function isColorSimilarManhattan(rgbas1, rgbas2, threshold01 = 0.1, weightAlpha = 1) {
   const maxSum = threshold01 * 255 * 4;
@@ -30884,10 +30923,10 @@ function blendColors(foreground, background) {
   const fgAlpha = fg.a !== void 0 ? fg.a : 1;
   const bgAlpha = bg.a !== void 0 ? bg.a : 1;
   const alpha = fgAlpha + bgAlpha * (1 - fgAlpha);
-  const r = Math.round((fg.r * fgAlpha + bg.r * bgAlpha * (1 - fgAlpha)) / alpha);
+  const r2 = Math.round((fg.r * fgAlpha + bg.r * bgAlpha * (1 - fgAlpha)) / alpha);
   const g = Math.round((fg.g * fgAlpha + bg.g * bgAlpha * (1 - fgAlpha)) / alpha);
   const b = Math.round((fg.b * fgAlpha + bg.b * bgAlpha * (1 - fgAlpha)) / alpha);
-  return rgbToHex(r, g, b);
+  return rgbToHex(r2, g, b);
 }
 function parseColorToRgba(color2) {
   color2 = color2.trim().toLowerCase();
@@ -30907,10 +30946,10 @@ function parseColorToRgba(color2) {
     if (color2.length === 3) {
       color2 = color2[0] + color2[0] + color2[1] + color2[1] + color2[2] + color2[2];
     }
-    const r = parseInt(color2.substring(0, 2), 16);
+    const r2 = parseInt(color2.substring(0, 2), 16);
     const g = parseInt(color2.substring(2, 4), 16);
     const b = parseInt(color2.substring(4, 6), 16);
-    const result = {r, g, b};
+    const result = {r: r2, g, b};
     if (color2.length === 8) {
       result.a = parseInt(color2.substring(6, 8), 16) / 255;
     }
@@ -30918,8 +30957,8 @@ function parseColorToRgba(color2) {
   }
   throw new Error(`\u65E0\u6CD5\u89E3\u6790\u7684\u989C\u8272\u683C\u5F0F: ${color2}`);
 }
-function rgbToHex(r, g, b) {
-  return `#${Math.round(r).toString(16).padStart(2, "0")}${Math.round(g).toString(16).padStart(2, "0")}${Math.round(b).toString(16).padStart(2, "0")}`;
+function rgbToHex(r2, g, b) {
+  return `#${Math.round(r2).toString(16).padStart(2, "0")}${Math.round(g).toString(16).padStart(2, "0")}${Math.round(b).toString(16).padStart(2, "0")}`;
 }
 
 // src/data/scale-time/default-tick-mark-formatter.ts
@@ -31495,18 +31534,18 @@ function getCandidateAnchor(pos, distance2, rect, outPt, outDir) {
       break;
   }
 }
-function projectPointToArc(cx, cy, r, startAngle, endAngle, anticlockwise, x, y, out2) {
+function projectPointToArc(cx, cy, r2, startAngle, endAngle, anticlockwise, x, y, out2) {
   x -= cx;
   y -= cy;
   const d = Math.sqrt(x * x + y * y);
   x /= d;
   y /= d;
-  const ox = x * r + cx;
-  const oy = y * r + cy;
+  const ox = x * r2 + cx;
+  const oy = y * r2 + cy;
   if (Math.abs(startAngle - endAngle) % PI27 < 1e-4) {
     out2[0] = ox;
     out2[1] = oy;
-    return d - r;
+    return d - r2;
   }
   if (anticlockwise) {
     const tmp = startAngle;
@@ -31526,12 +31565,12 @@ function projectPointToArc(cx, cy, r, startAngle, endAngle, anticlockwise, x, y,
   if (angle >= startAngle && angle <= endAngle || angle + PI27 >= startAngle && angle + PI27 <= endAngle) {
     out2[0] = ox;
     out2[1] = oy;
-    return d - r;
+    return d - r2;
   }
-  const x1 = r * Math.cos(startAngle) + cx;
-  const y1 = r * Math.sin(startAngle) + cy;
-  const x2 = r * Math.cos(endAngle) + cx;
-  const y2 = r * Math.sin(endAngle) + cy;
+  const x1 = r2 * Math.cos(startAngle) + cx;
+  const y1 = r2 * Math.sin(startAngle) + cy;
+  const x2 = r2 * Math.cos(endAngle) + cx;
+  const y2 = r2 * Math.sin(endAngle) + cy;
   const d1 = (x1 - x) * (x1 - x) + (y1 - y) * (y1 - y);
   const d2 = (x2 - x) * (x2 - x) + (y2 - y) * (y2 - y);
   if (d1 < d2) {
@@ -32491,8 +32530,8 @@ var SVGPathRebuilder = class {
   quadraticCurveTo(x, y, x2, y2) {
     this._add("Q", x, y, x2, y2);
   }
-  arc(cx, cy, r, startAngle, endAngle, anticlockwise) {
-    this.ellipse(cx, cy, r, r, 0, startAngle, endAngle, anticlockwise);
+  arc(cx, cy, r2, startAngle, endAngle, anticlockwise) {
+    this.ellipse(cx, cy, r2, r2, 0, startAngle, endAngle, anticlockwise);
   }
   ellipse(cx, cy, rx, ry, psi, startAngle, endAngle, anticlockwise) {
     let dTheta = endAngle - startAngle;
@@ -34535,8 +34574,8 @@ var CanvasPainter = class {
         } else {
           const horizontalPixelRatio = this.horizontalPixelRatio;
           const verticalPixelRatio = this.verticalPixelRatio;
-          for (var r = 0; r < repaintRects.length; ++r) {
-            const rect = repaintRects[r];
+          for (var r2 = 0; r2 < repaintRects.length; ++r2) {
+            const rect = repaintRects[r2];
             ctx2.save();
             ctx2.beginPath();
             ctx2.rect(rect.x * horizontalPixelRatio, rect.y * verticalPixelRatio, rect.width * horizontalPixelRatio, rect.height * verticalPixelRatio);
@@ -35942,13 +35981,13 @@ function createGridClipPath(cartesian, hasAnimation, seriesModel, done, during)
 function createPolarClipPath(polar, hasAnimation, seriesModel) {
   const sectorArea = polar.getArea();
   const r0 = round(sectorArea.r0, 1);
-  const r = round(sectorArea.r, 1);
+  const r2 = round(sectorArea.r, 1);
   const clipPath = new Sector_default({
     shape: {
       cx: round(polar.cx, 1),
       cy: round(polar.cy, 1),
       r0,
-      r,
+      r: r2,
       startAngle: sectorArea.startAngle,
       endAngle: sectorArea.endAngle,
       clockwise: sectorArea.clockwise
@@ -35964,7 +36003,7 @@ function createPolarClipPath(polar, hasAnimation, seriesModel) {
     initProps(clipPath, {
       shape: {
         endAngle: sectorArea.endAngle,
-        r
+        r: r2
       }
     }, seriesModel);
   }
@@ -37260,8 +37299,8 @@ var SausagePath = class extends Path_default {
     const cx = shape.cx;
     const cy = shape.cy;
     const r0 = Math.max(shape.r0 || 0, 0);
-    const r = Math.max(shape.r, 0);
-    const dr = (r - r0) * 0.5;
+    const r2 = Math.max(shape.r, 0);
+    const dr = (r2 - r0) * 0.5;
     const rCenter = r0 + dr;
     let startAngle = shape.startAngle;
     const endAngle = shape.endAngle;
@@ -37279,9 +37318,9 @@ var SausagePath = class extends Path_default {
       ctx2.moveTo(unitStartX * r0 + cx, unitStartY * r0 + cy);
       ctx2.arc(unitStartX * rCenter + cx, unitStartY * rCenter + cy, dr, -Math.PI + startAngle, startAngle, !clockwise);
     } else {
-      ctx2.moveTo(unitStartX * r + cx, unitStartY * r + cy);
+      ctx2.moveTo(unitStartX * r2 + cx, unitStartY * r2 + cy);
     }
-    ctx2.arc(cx, cy, r, startAngle, endAngle, !clockwise);
+    ctx2.arc(cx, cy, r2, startAngle, endAngle, !clockwise);
     ctx2.arc(unitEndX * rCenter + cx, unitEndY * rCenter + cy, dr, endAngle - Math.PI * 2, endAngle - Math.PI, !clockwise);
     if (r0 !== 0) {
       ctx2.arc(cx, cy, r0, endAngle, startAngle, clockwise);
@@ -37304,17 +37343,17 @@ function createSectorCalculateTextPosition(positionMapping, opts) {
     const sector = this.shape;
     const cx = sector.cx;
     const cy = sector.cy;
-    const r = sector.r;
+    const r2 = sector.r;
     const r0 = sector.r0;
-    const middleR = (r + r0) / 2;
+    const middleR = (r2 + r0) / 2;
     const startAngle = sector.startAngle;
     const endAngle = sector.endAngle;
     const middleAngle = (startAngle + endAngle) / 2;
-    const extraDist = isRoundCap ? Math.abs(r - r0) / 2 : 0;
+    const extraDist = isRoundCap ? Math.abs(r2 - r0) / 2 : 0;
     const mathCos6 = Math.cos;
     const mathSin6 = Math.sin;
-    let x = cx + r * mathCos6(startAngle);
-    let y = cy + r * mathSin6(startAngle);
+    let x = cx + r2 * mathCos6(startAngle);
+    let y = cy + r2 * mathSin6(startAngle);
     let textAlign = "left";
     let textVerticalAlign = "top";
     switch (mappedSectorPosition) {
@@ -37349,14 +37388,14 @@ function createSectorCalculateTextPosition(positionMapping, opts) {
         textVerticalAlign = "middle";
         break;
       case "endArc":
-        x = cx + (r + distance2) * mathCos6(middleAngle);
-        y = cy + (r + distance2) * mathSin6(middleAngle);
+        x = cx + (r2 + distance2) * mathCos6(middleAngle);
+        y = cy + (r2 + distance2) * mathSin6(middleAngle);
         textAlign = "center";
         textVerticalAlign = "bottom";
         break;
       case "insideEndArc":
-        x = cx + (r - distance2) * mathCos6(middleAngle);
-        y = cy + (r - distance2) * mathSin6(middleAngle);
+        x = cx + (r2 - distance2) * mathCos6(middleAngle);
+        y = cy + (r2 - distance2) * mathSin6(middleAngle);
         textAlign = "center";
         textVerticalAlign = "top";
         break;
@@ -37839,11 +37878,11 @@ var clip = {
       layout18.r = layout18.r0;
       layout18.r0 = tmp;
     }
-    const r = mathMin7(layout18.r, coordSysClipArea.r);
+    const r2 = mathMin7(layout18.r, coordSysClipArea.r);
     const r0 = mathMax7(layout18.r0, coordSysClipArea.r0);
-    layout18.r = r;
+    layout18.r = r2;
     layout18.r0 = r0;
-    const clipped = r - r0 < 0;
+    const clipped = r2 - r0 < 0;
     if (signR < 0) {
       const tmp = layout18.r;
       layout18.r = layout18.r0;
@@ -38230,7 +38269,7 @@ function getBasicPieLayout(seriesModel, api2) {
   const height = parsePercent2(viewRect2.height, api2.getHeight());
   const size = Math.min(width, height);
   const r0 = parsePercent2(radius[0], size / 2);
-  const r = parsePercent2(radius[1], size / 2);
+  const r2 = parsePercent2(radius[1], size / 2);
   let cx;
   let cy;
   const coordSys = seriesModel.coordinateSystem;
@@ -38249,7 +38288,7 @@ function getBasicPieLayout(seriesModel, api2) {
     cx,
     cy,
     r0,
-    r
+    r: r2
   };
 }
 function pieLayout(seriesType2, ecModel, api2) {
@@ -38257,7 +38296,7 @@ function pieLayout(seriesType2, ecModel, api2) {
     const data = seriesModel.getData();
     const valueDim = data.mapDimension("value");
     const viewRect2 = getViewRect(seriesModel, api2);
-    const {cx, cy, r, r0} = getBasicPieLayout(seriesModel, api2);
+    const {cx, cy, r: r2, r0} = getBasicPieLayout(seriesModel, api2);
     let startAngle = -seriesModel.get("startAngle") * RADIAN;
     let endAngle = seriesModel.get("endAngle");
     const padAngle = seriesModel.get("padAngle") * RADIAN;
@@ -38288,7 +38327,7 @@ function pieLayout(seriesType2, ecModel, api2) {
     let restAngle = angleRange;
     let valueSumLargerThanMinAngle = 0;
     let currentAngle = startAngle;
-    data.setLayout({viewRect: viewRect2, r});
+    data.setLayout({viewRect: viewRect2, r: r2});
     data.each(valueDim, function(value, idx) {
       let angle;
       if (isNaN(value)) {
@@ -38300,7 +38339,7 @@ function pieLayout(seriesType2, ecModel, api2) {
           cx,
           cy,
           r0,
-          r: roseType ? NaN : r
+          r: roseType ? NaN : r2
         });
         return;
       }
@@ -38333,7 +38372,7 @@ function pieLayout(seriesType2, ecModel, api2) {
         cx,
         cy,
         r0,
-        r: roseType ? linearMap(value, extent3, [r0, r]) : r
+        r: roseType ? linearMap(value, extent3, [r0, r2]) : r2
       });
       currentAngle = endAngle2;
     });
@@ -38411,7 +38450,7 @@ function dataFilter(seriesType2) {
 
 // src/chart/pie/labelLayout.ts
 var RADIAN2 = Math.PI / 180;
-function adjustSingleSide(list, cx, cy, r, dir3, viewWidth, viewHeight, viewLeft, viewTop, farthestX) {
+function adjustSingleSide(list, cx, cy, r2, dir3, viewWidth, viewHeight, viewLeft, viewTop, farthestX) {
   if (list.length < 2) {
     return;
   }
@@ -38422,7 +38461,7 @@ function adjustSingleSide(list, cx, cy, r, dir3, viewWidth, viewHeight, viewLeft
     for (let i = 0; i < semi.list.length; i++) {
       const item = semi.list[i];
       const dy = Math.abs(item.label.y - cy);
-      const rA = r + item.len;
+      const rA = r2 + item.len;
       const rA2 = rA * rA;
       const dx = Math.sqrt((1 - Math.abs(dy * dy / rB2)) * rA2);
       const newX = cx + (dx + item.len2) * dir3;
@@ -38444,7 +38483,7 @@ function adjustSingleSide(list, cx, cy, r, dir3, viewWidth, viewHeight, viewLeft
       const dy = Math.abs(item.label.y - cy);
       if (dy >= semi.maxY) {
         const dx = item.label.x - cx - item.len2 * dir3;
-        const rA = r + item.len;
+        const rA = r2 + item.len;
         const rB = Math.abs(dx) < rA ? Math.sqrt(dy * dy / (1 - dx * dx / rA / rA)) : rA;
         semi.rB = rB;
         semi.maxY = dy;
@@ -38466,7 +38505,7 @@ function adjustSingleSide(list, cx, cy, r, dir3, viewWidth, viewHeight, viewLeft
     recalculateX(list);
   }
 }
-function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight, viewLeft, viewTop) {
+function avoidOverlap(labelLayoutList, cx, cy, r2, viewWidth, viewHeight, viewLeft, viewTop) {
   const leftList = [];
   const rightList = [];
   let leftmostX = Number.MAX_VALUE;
@@ -38516,8 +38555,8 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight, viewLef
       constrainTextWidth(layout18, targetTextWidth);
     }
   }
-  adjustSingleSide(rightList, cx, cy, r, 1, viewWidth, viewHeight, viewLeft, viewTop, rightmostX);
-  adjustSingleSide(leftList, cx, cy, r, -1, viewWidth, viewHeight, viewLeft, viewTop, leftmostX);
+  adjustSingleSide(rightList, cx, cy, r2, 1, viewWidth, viewHeight, viewLeft, viewTop, rightmostX);
+  adjustSingleSide(leftList, cx, cy, r2, -1, viewWidth, viewHeight, viewLeft, viewTop, leftmostX);
   for (let i = 0; i < labelLayoutList.length; i++) {
     const layout18 = labelLayoutList[i];
     if (!isPositionCenter(layout18) && layout18.linePoints) {
@@ -38590,7 +38629,7 @@ function pieLabelLayout(seriesModel) {
   let hasLabelRotate = false;
   const minShowLabelRadian = (seriesModel.get("minShowLabelAngle") || 0) * RADIAN2;
   const viewRect2 = data.getLayout("viewRect");
-  const r = data.getLayout("r");
+  const r2 = data.getLayout("r");
   const viewWidth = viewRect2.width;
   const viewLeft = viewRect2.x;
   const viewTop = viewRect2.y;
@@ -38658,8 +38697,8 @@ function pieLabelLayout(seriesModel) {
       textX = x1 + nx * 3;
       textY = y1 + ny * 3;
       if (!isLabelInside) {
-        const x2 = x1 + nx * (labelLineLen + r - sectorShape.r);
-        const y2 = y1 + ny * (labelLineLen + r - sectorShape.r);
+        const x2 = x1 + nx * (labelLineLen + r2 - sectorShape.r);
+        const y2 = y1 + ny * (labelLineLen + r2 - sectorShape.r);
         const x3 = x2 + (nx < 0 ? -1 : 1) * labelLineLen2;
         const y3 = y2;
         if (labelAlignTo === "edge") {
@@ -38740,7 +38779,7 @@ function pieLabelLayout(seriesModel) {
     });
   });
   if (!hasLabelRotate && seriesModel.get("avoidLabelOverlap")) {
-    avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight, viewLeft, viewTop);
+    avoidOverlap(labelLayoutList, cx, cy, r2, viewWidth, viewHeight, viewLeft, viewTop);
   }
   for (let i = 0; i < labelLayoutList.length; i++) {
     const layout18 = labelLayoutList[i];
@@ -40549,12 +40588,12 @@ var builders = {
       }], function(point, index) {
         if (arrows[index] !== "none" && arrows[index] != null) {
           const symbol = createSymbol(arrows[index], -symbolWidth / 2, -symbolHeight / 2, symbolWidth, symbolHeight, lineStyle.stroke, true);
-          const r = point.r + point.offset;
+          const r2 = point.r + point.offset;
           const pt = inverse ? pt22 : pt12;
           symbol.attr({
             rotation: point.rotate,
-            x: pt[0] + r * Math.cos(opt.rotation),
-            y: pt[1] - r * Math.sin(opt.rotation),
+            x: pt[0] + r2 * Math.cos(opt.rotation),
+            y: pt[1] - r2 * Math.sin(opt.rotation),
             silent: true,
             z2: 11
           });
@@ -42878,8 +42917,8 @@ var paintServerParsers = {
   radialgradient: function(xmlNode) {
     const cx = parseInt(xmlNode.getAttribute("cx") || "0", 10);
     const cy = parseInt(xmlNode.getAttribute("cy") || "0", 10);
-    const r = parseInt(xmlNode.getAttribute("r") || "0", 10);
-    const gradient = new RadialGradient_default(cx, cy, r);
+    const r2 = parseInt(xmlNode.getAttribute("r") || "0", 10);
+    const gradient = new RadialGradient_default(cx, cy, r2);
     parsePaintServerUnit(xmlNode, gradient);
     parseGradientColorStops(xmlNode, gradient);
     return gradient;
@@ -45176,11 +45215,11 @@ function secondWalk(node) {
 function separation(cb) {
   return arguments.length ? cb : defaultSeparation;
 }
-function radialCoordinate(rad, r) {
+function radialCoordinate(rad, r2) {
   rad -= Math.PI / 2;
   return {
-    x: r * Math.cos(rad),
-    y: r * Math.sin(rad)
+    x: r2 * Math.cos(rad),
+    y: r2 * Math.sin(rad)
   };
 }
 function getViewRect2(seriesModel, api2) {
@@ -48651,7 +48690,7 @@ function circularLayout(seriesModel, basedOn, draggingNode, pointer) {
   const graph = nodeData.graph;
   const cx = rect.width / 2 + rect.x;
   const cy = rect.height / 2 + rect.y;
-  const r = Math.min(rect.width, rect.height) / 2;
+  const r2 = Math.min(rect.width, rect.height) / 2;
   const count2 = nodeData.count();
   nodeData.setLayout({
     cx,
@@ -48664,12 +48703,12 @@ function circularLayout(seriesModel, basedOn, draggingNode, pointer) {
     const [tempX, tempY] = coordSys.pointToData(pointer);
     const v = [tempX - cx, tempY - cy];
     normalize(v, v);
-    scale(v, v, r);
+    scale(v, v, r2);
     draggingNode.setLayout([cx + v[0], cy + v[1]], true);
     const circularRotateLabel = seriesModel.get(["circular", "rotateLabel"]);
     rotateNodeLabel(draggingNode, circularRotateLabel, cx, cy);
   }
-  _layoutNodesBasedOn[basedOn](seriesModel, graph, nodeData, r, cx, cy, count2);
+  _layoutNodesBasedOn[basedOn](seriesModel, graph, nodeData, r2, cx, cy, count2);
   graph.eachEdge(function(edge, index) {
     let curveness = retrieve3(edge.getModel().get(["lineStyle", "curveness"]), getCurvenessForEdge(edge, seriesModel, index), 0);
     const p1 = clone2(edge.node1.getLayout());
@@ -48688,7 +48727,7 @@ function circularLayout(seriesModel, basedOn, draggingNode, pointer) {
   });
 }
 var _layoutNodesBasedOn = {
-  value(seriesModel, graph, nodeData, r, cx, cy, count2) {
+  value(seriesModel, graph, nodeData, r2, cx, cy, count2) {
     let angle = 0;
     const sum2 = nodeData.getSum("value");
     const unitAngle = Math.PI * 2 / (sum2 || count2);
@@ -48697,13 +48736,13 @@ var _layoutNodesBasedOn = {
       const radianHalf = unitAngle * (sum2 ? value : 1) / 2;
       angle += radianHalf;
       node.setLayout([
-        r * Math.cos(angle) + cx,
-        r * Math.sin(angle) + cy
+        r2 * Math.cos(angle) + cx,
+        r2 * Math.sin(angle) + cy
       ]);
       angle += radianHalf;
     });
   },
-  symbolSize(seriesModel, graph, nodeData, r, cx, cy, count2) {
+  symbolSize(seriesModel, graph, nodeData, r2, cx, cy, count2) {
     let sumRadian = 0;
     _symbolRadiansHalf.length = count2;
     const nodeScale = getNodeGlobalScale(seriesModel);
@@ -48712,7 +48751,7 @@ var _layoutNodesBasedOn = {
       isNaN(symbolSize) && (symbolSize = 2);
       symbolSize < 0 && (symbolSize = 0);
       symbolSize *= nodeScale;
-      let symbolRadianHalf = Math.asin(symbolSize / 2 / r);
+      let symbolRadianHalf = Math.asin(symbolSize / 2 / r2);
       isNaN(symbolRadianHalf) && (symbolRadianHalf = PI8 / 2);
       _symbolRadiansHalf[node.dataIndex] = symbolRadianHalf;
       sumRadian += symbolRadianHalf * 2;
@@ -48723,8 +48762,8 @@ var _layoutNodesBasedOn = {
       const radianHalf = halfRemainRadian + _symbolRadiansHalf[node.dataIndex];
       angle += radianHalf;
       (!node.getLayout() || !node.getLayout().fixed) && node.setLayout([
-        r * Math.cos(angle) + cx,
-        r * Math.sin(angle) + cy
+        r2 * Math.cos(angle) + cx,
+        r2 * Math.sin(angle) + cy
       ]);
       angle += radianHalf;
     });
@@ -50493,15 +50532,15 @@ var PointerPath = class extends Path_default {
   buildPath(ctx2, shape) {
     const mathCos6 = Math.cos;
     const mathSin6 = Math.sin;
-    const r = shape.r;
+    const r2 = shape.r;
     const width = shape.width;
     let angle = shape.angle;
-    const x = shape.x - mathCos6(angle) * width * (width >= r / 3 ? 1 : 2);
-    const y = shape.y - mathSin6(angle) * width * (width >= r / 3 ? 1 : 2);
+    const x = shape.x - mathCos6(angle) * width * (width >= r2 / 3 ? 1 : 2);
+    const y = shape.y - mathSin6(angle) * width * (width >= r2 / 3 ? 1 : 2);
     angle = shape.angle - Math.PI / 2;
     ctx2.moveTo(x, y);
     ctx2.lineTo(shape.x + mathCos6(angle) * width, shape.y + mathSin6(angle) * width);
-    ctx2.lineTo(shape.x + mathCos6(shape.angle) * r, shape.y + mathSin6(shape.angle) * r);
+    ctx2.lineTo(shape.x + mathCos6(shape.angle) * r2, shape.y + mathSin6(shape.angle) * r2);
     ctx2.lineTo(shape.x - mathCos6(angle) * width, shape.y - mathSin6(angle) * width);
     ctx2.lineTo(x, y);
   }
@@ -50516,11 +50555,11 @@ function parsePosition(seriesModel, api2) {
   const size = Math.min(width, height);
   const cx = parsePercent2(center3[0], api2.getWidth());
   const cy = parsePercent2(center3[1], api2.getHeight());
-  const r = parsePercent2(seriesModel.get("radius"), size / 2);
+  const r2 = parsePercent2(seriesModel.get("radius"), size / 2);
   return {
     cx,
     cy,
-    r
+    r: r2
   };
 }
 function formatLabel(value, labelFormatter) {
@@ -50611,7 +50650,7 @@ var GaugeView2 = class extends Chart_default {
     const group = this.group;
     const cx = posInfo.cx;
     const cy = posInfo.cy;
-    const r = posInfo.r;
+    const r2 = posInfo.r;
     const minVal = +seriesModel.get("min");
     const maxVal = +seriesModel.get("max");
     const splitLineModel = seriesModel.getModel("splitLine");
@@ -50619,8 +50658,8 @@ var GaugeView2 = class extends Chart_default {
     const labelModel = seriesModel.getModel("axisLabel");
     const splitNumber = seriesModel.get("splitNumber");
     const subSplitNumber = tickModel.get("splitNumber");
-    const splitLineLen = parsePercent2(splitLineModel.get("length"), r);
-    const tickLen = parsePercent2(tickModel.get("length"), r);
+    const splitLineLen = parsePercent2(splitLineModel.get("length"), r2);
+    const tickLen = parsePercent2(tickModel.get("length"), r2);
     let angle = startAngle;
     const step = (endAngle - startAngle) / splitNumber;
     const subStep = step / subSplitNumber;
@@ -50636,10 +50675,10 @@ var GaugeView2 = class extends Chart_default {
         const distance2 = splitLineDistance ? splitLineDistance + axisLineWidth : axisLineWidth;
         const splitLine = new Line_default({
           shape: {
-            x1: unitX * (r - distance2) + cx,
-            y1: unitY * (r - distance2) + cy,
-            x2: unitX * (r - splitLineLen - distance2) + cx,
-            y2: unitY * (r - splitLineLen - distance2) + cy
+            x1: unitX * (r2 - distance2) + cx,
+            y1: unitY * (r2 - distance2) + cy,
+            x2: unitX * (r2 - splitLineLen - distance2) + cx,
+            y2: unitY * (r2 - splitLineLen - distance2) + cy
           },
           style: splitLineStyle,
           silent: true
@@ -50655,8 +50694,8 @@ var GaugeView2 = class extends Chart_default {
         const distance2 = labelModel.get("distance") + splitLineDistance;
         const label = formatLabel(round(i / splitNumber * (maxVal - minVal) + minVal), labelModel.get("formatter"));
         const autoColor = getColor3(i / splitNumber);
-        const textStyleX = unitX * (r - splitLineLen - distance2) + cx;
-        const textStyleY = unitY * (r - splitLineLen - distance2) + cy;
+        const textStyleX = unitX * (r2 - splitLineLen - distance2) + cx;
+        const textStyleY = unitY * (r2 - splitLineLen - distance2) + cy;
         const rotateType = labelModel.get("rotate");
         let rotate2 = 0;
         if (rotateType === "radial") {
@@ -50708,10 +50747,10 @@ var GaugeView2 = class extends Chart_default {
           unitY = Math.sin(angle);
           const tickLine = new Line_default({
             shape: {
-              x1: unitX * (r - distance2) + cx,
-              y1: unitY * (r - distance2) + cy,
-              x2: unitX * (r - tickLen - distance2) + cx,
-              y2: unitY * (r - tickLen - distance2) + cy
+              x1: unitX * (r2 - distance2) + cx,
+              y1: unitY * (r2 - distance2) + cy,
+              x2: unitX * (r2 - tickLen - distance2) + cx,
+              y2: unitY * (r2 - tickLen - distance2) + cy
             },
             silent: true,
             style: tickLineStyle
@@ -50779,7 +50818,7 @@ var GaugeView2 = class extends Chart_default {
       const isOverlap = progressModel.get("overlap");
       const progressWidth = isOverlap ? progressModel.get("width") : axisLineWidth / data.count();
       const r0 = isOverlap ? posInfo.r - progressWidth : posInfo.r - (idx + 1) * progressWidth;
-      const r = isOverlap ? posInfo.r : posInfo.r - idx * progressWidth;
+      const r2 = isOverlap ? posInfo.r : posInfo.r - idx * progressWidth;
       const progress = new ProgressPath({
         shape: {
           startAngle,
@@ -50788,7 +50827,7 @@ var GaugeView2 = class extends Chart_default {
           cy: posInfo.cy,
           clockwise,
           r0,
-          r
+          r: r2
         }
       });
       isOverlap && (progress.z2 = maxVal - data.get(valueDim, idx) % maxVal);
@@ -62266,7 +62305,7 @@ var HeatmapLayer = class {
     const brush3 = this._getBrush();
     const gradientInRange = this._getGradient(colorFunc, "inRange");
     const gradientOutOfRange = this._getGradient(colorFunc, "outOfRange");
-    const r = this.pointSize + this.blurSize;
+    const r2 = this.pointSize + this.blurSize;
     const canvas2 = this.canvas;
     const ctx2 = canvas2.getContext("2d");
     const len2 = data.length;
@@ -62279,7 +62318,7 @@ var HeatmapLayer = class {
       const value = p[2];
       const alpha = normalize5(value);
       ctx2.globalAlpha = alpha;
-      ctx2.drawImage(brush3, x - r, y - r);
+      ctx2.drawImage(brush3, x - r2, y - r2);
     }
     if (!canvas2.width || !canvas2.height) {
       return canvas2;
@@ -62310,8 +62349,8 @@ var HeatmapLayer = class {
   }
   _getBrush() {
     const brushCanvas = this._brushCanvas || (this._brushCanvas = platformApi.createCanvas());
-    const r = this.pointSize + this.blurSize;
-    const d = r * 2;
+    const r2 = this.pointSize + this.blurSize;
+    const d = r2 * 2;
     brushCanvas.width = d;
     brushCanvas.height = d;
     const ctx2 = brushCanvas.getContext("2d");
@@ -62320,7 +62359,7 @@ var HeatmapLayer = class {
     ctx2.shadowBlur = this.blurSize;
     ctx2.shadowColor = "#000";
     ctx2.beginPath();
-    ctx2.arc(-r, r, this.pointSize, 0, Math.PI * 2, true);
+    ctx2.arc(-r2, r2, this.pointSize, 0, Math.PI * 2, true);
     ctx2.closePath();
     ctx2.fill();
     return brushCanvas;
@@ -63718,7 +63757,7 @@ var SunburstPiece = class extends Sector_default {
         outsideFill: labelStateModel.get("color") === "inherit" ? labelColor : null,
         inside: labelPosition !== "outside"
       };
-      let r;
+      let r2;
       const labelPadding = getLabelAttr(labelStateModel, "distance") || 0;
       let textAlign = getLabelAttr(labelStateModel, "align");
       const rotateType = getLabelAttr(labelStateModel, "rotate");
@@ -63727,28 +63766,28 @@ var SunburstPiece = class extends Sector_default {
       const midAngleNormal = normalizeRadian(rotateType === "tangential" ? Math.PI / 2 - midAngle : midAngle);
       const needsFlip = midAngleNormal > flipStartAngle && !isRadianAroundZero(midAngleNormal - flipStartAngle) && midAngleNormal < flipEndAngle;
       if (labelPosition === "outside") {
-        r = layout18.r + labelPadding;
+        r2 = layout18.r + labelPadding;
         textAlign = needsFlip ? "right" : "left";
       } else {
         if (!textAlign || textAlign === "center") {
           if (angle === 2 * Math.PI && layout18.r0 === 0) {
-            r = 0;
+            r2 = 0;
           } else {
-            r = (layout18.r + layout18.r0) / 2;
+            r2 = (layout18.r + layout18.r0) / 2;
           }
           textAlign = "center";
         } else if (textAlign === "left") {
-          r = layout18.r0 + labelPadding;
+          r2 = layout18.r0 + labelPadding;
           textAlign = needsFlip ? "right" : "left";
         } else if (textAlign === "right") {
-          r = layout18.r - labelPadding;
+          r2 = layout18.r - labelPadding;
           textAlign = needsFlip ? "left" : "right";
         }
       }
       state.style.align = textAlign;
       state.style.verticalAlign = getLabelAttr(labelStateModel, "verticalAlign") || "middle";
-      state.x = r * dx + layout18.cx;
-      state.y = r * dy + layout18.cy;
+      state.x = r2 * dx + layout18.cx;
+      state.y = r2 * dy + layout18.cy;
       let rotate2 = 0;
       if (rotateType === "radial") {
         rotate2 = normalizeRadian(-midAngle) + (needsFlip ? Math.PI : 0);
@@ -64087,7 +64126,7 @@ function sunburstLayout(seriesType2, ecModel, api2) {
     const cx = parsePercent2(center3[0], width);
     const cy = parsePercent2(center3[1], height);
     const r0 = parsePercent2(radius[0], size / 2);
-    const r = parsePercent2(radius[1], size / 2);
+    const r2 = parsePercent2(radius[1], size / 2);
     const startAngle = -seriesModel.get("startAngle") * RADIAN3;
     const minAngle = seriesModel.get("minAngle") * RADIAN3;
     const virtualRoot = seriesModel.getData().tree.root;
@@ -64105,7 +64144,7 @@ function sunburstLayout(seriesType2, ecModel, api2) {
     const unitRadian = Math.PI / (sum2 || validDataCount) * 2;
     const renderRollupNode = treeRoot.depth > 0;
     const levels = treeRoot.height - (renderRollupNode ? -1 : 1);
-    const rPerLevel = (r - r0) / (levels || 1);
+    const rPerLevel = (r2 - r0) / (levels || 1);
     const clockwise = seriesModel.get("clockwise");
     const stillShowZeroSum = seriesModel.get("stillShowZeroSum");
     const dir3 = clockwise ? 1 : -1;
@@ -64127,14 +64166,14 @@ function sunburstLayout(seriesType2, ecModel, api2) {
         const levelModel = seriesModel.getLevelModel(node);
         if (levelModel) {
           let r02 = levelModel.get("r0", true);
-          let r2 = levelModel.get("r", true);
+          let r3 = levelModel.get("r", true);
           const radius2 = levelModel.get("radius", true);
           if (radius2 != null) {
             r02 = radius2[0];
-            r2 = radius2[1];
+            r3 = radius2[1];
           }
           r02 != null && (rStart = parsePercent2(r02, size / 2));
-          r2 != null && (rEnd = parsePercent2(r2, size / 2));
+          r3 != null && (rEnd = parsePercent2(r3, size / 2));
         }
         node.setLayout({
           angle,
@@ -66355,12 +66394,12 @@ function makeRectShape(xy, wh, xDimIndex) {
     height: wh[1 - xDimIndex]
   };
 }
-function makeSectorShape(cx, cy, r0, r, startAngle, endAngle) {
+function makeSectorShape(cx, cy, r0, r2, startAngle, endAngle) {
   return {
     cx,
     cy,
     r0,
-    r,
+    r: r2,
     startAngle,
     endAngle,
     clockwise: true
@@ -67107,12 +67146,12 @@ function getLabelPosition(value, axisModel, axisPointerModel, polar, labelMargin
     align = labelLayout2.textAlign;
     verticalAlign = labelLayout2.textVerticalAlign;
   } else {
-    const r = radiusExtent[1];
-    position2 = polar.coordToPoint([r + labelMargin, coord]);
+    const r2 = radiusExtent[1];
+    position2 = polar.coordToPoint([r2 + labelMargin, coord]);
     const cx = polar.cx;
     const cy = polar.cy;
-    align = Math.abs(position2[0] - cx) / r < 0.3 ? "center" : position2[0] > cx ? "left" : "right";
-    verticalAlign = Math.abs(position2[1] - cy) / r < 0.3 ? "middle" : position2[1] > cy ? "top" : "bottom";
+    align = Math.abs(position2[0] - cx) / r2 < 0.3 ? "center" : position2[0] > cx ? "left" : "right";
+    verticalAlign = Math.abs(position2[1] - cy) / r2 < 0.3 ? "middle" : position2[1] > cy ? "top" : "bottom";
   }
   return {
     position: position2,
@@ -67368,9 +67407,9 @@ var Polar = class {
         const dx = x - this.cx;
         const dy = y - this.cy;
         const d2 = dx * dx + dy * dy - 1e-4;
-        const r = this.r;
+        const r2 = this.r;
         const r0 = this.r0;
-        return d2 <= r * r && d2 >= r0 * r0;
+        return d2 <= r2 * r2 && d2 >= r0 * r0;
       }
     };
   }
@@ -67639,12 +67678,12 @@ var angelAxisElementsBuilders = {
     each(labels, function(labelItem, idx) {
       let labelModel = commonLabelModel;
       const tickValue = labelItem.tickValue;
-      const r = radiusExtent[getRadiusIdx(polar)];
-      const p = polar.coordToPoint([r + labelMargin, labelItem.coord]);
+      const r2 = radiusExtent[getRadiusIdx(polar)];
+      const p = polar.coordToPoint([r2 + labelMargin, labelItem.coord]);
       const cx = polar.cx;
       const cy = polar.cy;
-      const labelTextAlign = Math.abs(p[0] - cx) / r < 0.3 ? "center" : p[0] > cx ? "left" : "right";
-      const labelTextVerticalAlign = Math.abs(p[1] - cy) / r < 0.3 ? "middle" : p[1] > cy ? "top" : "bottom";
+      const labelTextAlign = Math.abs(p[0] - cx) / r2 < 0.3 ? "center" : p[0] > cx ? "left" : "right";
+      const labelTextVerticalAlign = Math.abs(p[1] - cy) / r2 < 0.3 ? "middle" : p[1] > cy ? "top" : "bottom";
       if (rawCategoryData && rawCategoryData[tickValue]) {
         const rawCategoryItem = rawCategoryData[tickValue];
         if (isObject(rawCategoryItem) && rawCategoryItem.textStyle) {
@@ -67967,7 +68006,7 @@ function barLayoutPolar(seriesType2, ecModel, api2) {
         baseCoord = lastStackCoords[stackId][baseValue][sign];
       }
       let r0;
-      let r;
+      let r2;
       let startAngle;
       let endAngle;
       if (valueAxis2.dim === "radius") {
@@ -67977,10 +68016,10 @@ function barLayoutPolar(seriesType2, ecModel, api2) {
           radiusSpan = (radiusSpan < 0 ? -1 : 1) * barMinHeight;
         }
         r0 = baseCoord;
-        r = baseCoord + radiusSpan;
+        r2 = baseCoord + radiusSpan;
         startAngle = angle - columnOffset;
         endAngle = startAngle - columnWidth;
-        stacked && (lastStackCoords[stackId][baseValue][sign] = r);
+        stacked && (lastStackCoords[stackId][baseValue][sign] = r2);
       } else {
         let angleSpan = valueAxis2.dataToCoord(value, clampLayout) - valueAxisStart;
         const radius = baseAxis.dataToCoord(baseValue);
@@ -67988,7 +68027,7 @@ function barLayoutPolar(seriesType2, ecModel, api2) {
           angleSpan = (angleSpan < 0 ? -1 : 1) * barMinAngle;
         }
         r0 = radius + columnOffset;
-        r = r0 + columnWidth;
+        r2 = r0 + columnWidth;
         startAngle = baseCoord;
         endAngle = baseCoord + angleSpan;
         stacked && (lastStackCoords[stackId][baseValue][sign] = endAngle);
@@ -67997,7 +68036,7 @@ function barLayoutPolar(seriesType2, ecModel, api2) {
         cx,
         cy,
         r0,
-        r,
+        r: r2,
         startAngle: -startAngle * Math.PI / 180,
         endAngle: -endAngle * Math.PI / 180,
         clockwise: startAngle >= endAngle
@@ -68146,8 +68185,8 @@ function layout11(axisModel, opt) {
     orient === "vertical" ? positionMap.vertical[axisPosition] : rectBound[0],
     orient === "horizontal" ? positionMap.horizontal[axisPosition] : rectBound[3]
   ];
-  const r = {horizontal: 0, vertical: 1};
-  layout18.rotation = Math.PI / 2 * r[orient];
+  const r2 = {horizontal: 0, vertical: 1};
+  layout18.rotation = Math.PI / 2 * r2[orient];
   const directionMap = {top: -1, bottom: 1, right: 1, left: -1};
   layout18.labelDirection = layout18.tickDirection = layout18.nameDirection = directionMap[axisPosition];
   if (axisModel.get(["axisTick", "inside"])) {
@@ -74205,13 +74244,14 @@ var EventsModel2 = class extends Component_default {
   constructor() {
     super(...arguments);
     this.type = EventsModel2.type;
+    this.preventAutoZ = true;
     this.layoutMode = {type: "box", ignoreSize: true};
   }
 };
 var EventsModel = EventsModel2;
 EventsModel.type = "events";
 EventsModel.defaultOption = {
-  z: 6,
+  z: 1e3,
   show: true,
   data: [],
   lineVisible: true,
@@ -74219,10 +74259,12 @@ EventsModel.defaultOption = {
     color: "#82858f",
     width: 1,
     type: "solid"
-  }
+  },
+  selectedEventViewId: ""
 };
 
 // src/component/events/EventsView.ts
+var r = 15;
 var EventsView2 = class extends Component_default2 {
   constructor() {
     super(...arguments);
@@ -74259,25 +74301,29 @@ var EventsView2 = class extends Component_default2 {
     }
     const lineVisible = eventsModel.get("lineVisible");
     const lineStyle = eventsModel.get("lineStyle");
+    const z = eventsModel.get("z");
+    const selectedEventViewId = eventsModel.get("selectedEventViewId");
     const hoverEventId = this.hoverEventId;
     const lastPoint = this._lastPoint;
     const borderWidth = 2;
     for (let index = 0; index < data.length; index++) {
       const {time, list} = data[index];
-      const idx = ordinalMeta.parseAndCollect(time);
+      const idx = ordinalMeta.parseAndExtra(time);
       if (idx < startIndex) {
         continue;
       }
       if (idx > endIndex) {
         break;
       }
-      const x = xAxisModal.axis.dataToCoord(idx) + 5;
-      let y = rect.height - rect.x;
+      const x = xAxisModal.axis.dataToCoord(idx) - 15;
+      let y = rect.height - rect.x - 20;
       const z2 = data.length - index;
       each(list, function(item, i) {
         const yGap = 4 * (i + 1);
         const imgY = y - yGap;
         const id = `${time}_${item.id}`;
+        const isSelected = selectedEventViewId === id;
+        const renderZ = isSelected ? z + 1 : z;
         const img = new Image_default({
           style: {
             image: item.url,
@@ -74286,15 +74332,16 @@ var EventsView2 = class extends Component_default2 {
             width: 30,
             height: 20
           },
-          z2
+          z2,
+          z: renderZ
         });
         const clipPath = new Rect_default({
           shape: {
-            x: x + 5,
-            y: imgY,
-            width: 20,
-            height: 20,
-            r: 10
+            x: x + 6,
+            y: imgY + 1,
+            width: 18,
+            height: 18,
+            r
           }
         });
         img.setClipPath(clipPath);
@@ -74305,16 +74352,17 @@ var EventsView2 = class extends Component_default2 {
             y: imgY - borderWidth / 2,
             width: 20 + borderWidth,
             height: 20 + borderWidth,
-            r: 10
+            r
           },
           style: {
             stroke: "#ED544F",
             fill: "none"
           },
-          z2
+          z2,
+          z: renderZ
         });
-        if (hoverEventId === id) {
-          if (rect2.contain(lastPoint.x, lastPoint.y)) {
+        if (hoverEventId === id || isSelected) {
+          if (isSelected || rect2.contain(lastPoint.x, lastPoint.y)) {
             rect2.style.stroke = "#296bef";
           } else {
             this.hoverEventId = "";
@@ -74326,7 +74374,7 @@ var EventsView2 = class extends Component_default2 {
         }
         const mouseout = () => {
           this.hoverEventId = "";
-          rect2.attr("style", {stroke: "#ED544F"});
+          !isSelected && rect2.attr("style", {stroke: "#ED544F"});
         };
         const mouseover = () => {
           this.hoverEventId = id;
@@ -74341,6 +74389,7 @@ var EventsView2 = class extends Component_default2 {
           api2.trigger("events", {
             time,
             id: item.id,
+            selectedEventViewId: id,
             position: {
               x: rect2.shape.x,
               y: rect2.shape.y,
@@ -74371,14 +74420,13 @@ var EventsView2 = class extends Component_default2 {
             lineWidth: lineStyle.width,
             lineDash: lineStyle.type
           },
-          z2: 0
+          z2: 0,
+          z
         });
         group.add(line2);
       }
     }
   }
-  _clickEvent(e2, id) {
-  }
   _mouseMove(e2) {
     this._lastPoint = {
       x: e2.offsetX,
@@ -74434,14 +74482,14 @@ var CursorPointerView2 = class extends Component_default2 {
       return;
     }
     const backgroundColor2 = cursorPointerModel.get("backgroundColor");
-    const r = cursorPointerModel.get("r");
+    const r2 = cursorPointerModel.get("r");
     const element = this.element;
     element.attr({
       style: {
         fill: backgroundColor2
       },
       shape: {
-        r
+        r: r2
       },
       silent: true
     });
@@ -84614,12 +84662,12 @@ function getDividingGrids(dimSize, rowDim, count2) {
 }
 function divideSector(sectorShape, count2, outShapes) {
   const r0 = sectorShape.r0;
-  const r = sectorShape.r;
+  const r2 = sectorShape.r;
   const startAngle = sectorShape.startAngle;
   const endAngle = sectorShape.endAngle;
   const angle = Math.abs(endAngle - startAngle);
-  const arcLen = angle * r;
-  const deltaR = r - r0;
+  const arcLen = angle * r2;
+  const deltaR = r2 - r0;
   const isAngleRow = arcLen > Math.abs(deltaR);
   const grids = getDividingGrids([arcLen, deltaR], isAngleRow ? 0 : 1, count2);
   const rowSize = (isAngleRow ? angle : deltaR) / grids.length;