tvcharts 0.8.96 → 0.8.98
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/echarts.js +606 -353
- package/dist/echarts.js.map +3 -3
- package/index.js +2 -1
- package/lib/component/axisPointer/AxisPointerView.js +2 -1
- package/lib/component/events/EventsModel.js +74 -0
- package/lib/component/events/EventsView.js +249 -0
- package/lib/component/events/install.js +49 -0
- package/lib/core/echarts.js +1 -1
- package/lib/data/OrdinalMeta.js +16 -1
- package/lib/data/scale-time/find-time-range.js +32 -1
- package/lib/export/components.js +1 -0
- package/lib/model/Global.js +1 -0
- package/package.json +1 -1
- package/types/dist/components.d.ts +1 -1
- package/types/dist/echarts.d.ts +1 -0
- package/types/dist/renderers.d.ts +1 -1
- package/types/dist/shared.d.ts +4 -1
- package/types/src/component/events/EventsModel.d.ts +33 -0
- package/types/src/component/events/EventsView.d.ts +18 -0
- package/types/src/component/events/install.d.ts +2 -0
- package/types/src/data/OrdinalMeta.d.ts +1 -0
- package/types/src/data/scale-time/find-time-range.d.ts +2 -1
- package/types/src/export/components.d.ts +1 -0
package/dist/echarts.js
CHANGED
|
@@ -2124,10 +2124,10 @@ var Handler = class extends Eventful_default {
|
|
|
2124
2124
|
const rStep = 4;
|
|
2125
2125
|
const thetaStep = Math.PI / 12;
|
|
2126
2126
|
const PI210 = Math.PI * 2;
|
|
2127
|
-
for (let
|
|
2127
|
+
for (let r2 = 0; r2 < targetSizeHalf; r2 += rStep) {
|
|
2128
2128
|
for (let theta = 0; theta < PI210; theta += thetaStep) {
|
|
2129
|
-
const x1 = x +
|
|
2130
|
-
const y1 = y +
|
|
2129
|
+
const x1 = x + r2 * Math.cos(theta);
|
|
2130
|
+
const y1 = y + r2 * Math.sin(theta);
|
|
2131
2131
|
setHoverTarget(candidates, out2, x1, y1, exclude);
|
|
2132
2132
|
if (out2.target) {
|
|
2133
2133
|
return out2;
|
|
@@ -2229,12 +2229,12 @@ var Handler_default = Handler;
|
|
|
2229
2229
|
var DEFAULT_MIN_MERGE = 32;
|
|
2230
2230
|
var DEFAULT_MIN_GALLOPING = 7;
|
|
2231
2231
|
function minRunLength(n) {
|
|
2232
|
-
var
|
|
2232
|
+
var r2 = 0;
|
|
2233
2233
|
while (n >= DEFAULT_MIN_MERGE) {
|
|
2234
|
-
|
|
2234
|
+
r2 |= n & 1;
|
|
2235
2235
|
n >>= 1;
|
|
2236
2236
|
}
|
|
2237
|
-
return n +
|
|
2237
|
+
return n + r2;
|
|
2238
2238
|
}
|
|
2239
2239
|
function makeAscendingRun(array, lo, hi, compare2) {
|
|
2240
2240
|
var runHi = lo + 1;
|
|
@@ -3833,8 +3833,8 @@ function cssHueToRgb(m1, m2, h) {
|
|
|
3833
3833
|
function lerpNumber(a, b, p) {
|
|
3834
3834
|
return a + (b - a) * p;
|
|
3835
3835
|
}
|
|
3836
|
-
function setRgba(out2,
|
|
3837
|
-
out2[0] =
|
|
3836
|
+
function setRgba(out2, r2, g, b, a) {
|
|
3837
|
+
out2[0] = r2;
|
|
3838
3838
|
out2[1] = g;
|
|
3839
3839
|
out2[2] = b;
|
|
3840
3840
|
out2[3] = a;
|
|
@@ -9355,7 +9355,7 @@ var PathProxy2 = class {
|
|
|
9355
9355
|
this._yi = y2;
|
|
9356
9356
|
return this;
|
|
9357
9357
|
}
|
|
9358
|
-
arc(cx, cy,
|
|
9358
|
+
arc(cx, cy, r2, startAngle, endAngle, anticlockwise) {
|
|
9359
9359
|
this._drawPendingPt();
|
|
9360
9360
|
tmpAngles[0] = startAngle;
|
|
9361
9361
|
tmpAngles[1] = endAngle;
|
|
@@ -9363,10 +9363,10 @@ var PathProxy2 = class {
|
|
|
9363
9363
|
startAngle = tmpAngles[0];
|
|
9364
9364
|
endAngle = tmpAngles[1];
|
|
9365
9365
|
let delta = endAngle - startAngle;
|
|
9366
|
-
this.addData(CMD.A, cx, cy,
|
|
9367
|
-
this._ctx && this._ctx.arc(cx, cy,
|
|
9368
|
-
this._xi = mathCos2(endAngle) *
|
|
9369
|
-
this._yi = mathSin2(endAngle) *
|
|
9366
|
+
this.addData(CMD.A, cx, cy, r2, r2, startAngle, delta, 0, anticlockwise ? 0 : 1);
|
|
9367
|
+
this._ctx && this._ctx.arc(cx, cy, r2, startAngle, endAngle, anticlockwise);
|
|
9368
|
+
this._xi = mathCos2(endAngle) * r2 + cx;
|
|
9369
|
+
this._yi = mathSin2(endAngle) * r2 + cy;
|
|
9370
9370
|
return this;
|
|
9371
9371
|
}
|
|
9372
9372
|
arcTo(x1, y1, x2, y2, radius) {
|
|
@@ -9808,7 +9808,7 @@ var PathProxy2 = class {
|
|
|
9808
9808
|
let delta = d[i++];
|
|
9809
9809
|
const psi = d[i++];
|
|
9810
9810
|
const anticlockwise = !d[i++];
|
|
9811
|
-
const
|
|
9811
|
+
const r2 = rx > ry ? rx : ry;
|
|
9812
9812
|
const isEllipse = mathAbs(rx - ry) > 1e-3;
|
|
9813
9813
|
let endAngle = startAngle + delta;
|
|
9814
9814
|
let breakBuild = false;
|
|
@@ -9823,7 +9823,7 @@ var PathProxy2 = class {
|
|
|
9823
9823
|
if (isEllipse && ctx2.ellipse) {
|
|
9824
9824
|
ctx2.ellipse(cx, cy, rx, ry, psi, startAngle, endAngle, anticlockwise);
|
|
9825
9825
|
} else {
|
|
9826
|
-
ctx2.arc(cx, cy,
|
|
9826
|
+
ctx2.arc(cx, cy, r2, startAngle, endAngle, anticlockwise);
|
|
9827
9827
|
}
|
|
9828
9828
|
if (breakBuild) {
|
|
9829
9829
|
break lo;
|
|
@@ -9867,20 +9867,20 @@ var PathProxy2 = class {
|
|
|
9867
9867
|
ctx2.rect(x, y, width, height);
|
|
9868
9868
|
break;
|
|
9869
9869
|
case CMD.F: {
|
|
9870
|
-
const
|
|
9870
|
+
const r3 = d[i++];
|
|
9871
9871
|
const g = d[i++];
|
|
9872
9872
|
const b = d[i++];
|
|
9873
9873
|
const a = d[i++];
|
|
9874
|
-
ctx2.fillStyle = `rgba(${
|
|
9874
|
+
ctx2.fillStyle = `rgba(${r3},${g},${b},${a})`;
|
|
9875
9875
|
ctx2.fill();
|
|
9876
9876
|
break;
|
|
9877
9877
|
}
|
|
9878
9878
|
case CMD.S: {
|
|
9879
|
-
const
|
|
9879
|
+
const r3 = d[i++];
|
|
9880
9880
|
const g = d[i++];
|
|
9881
9881
|
const b = d[i++];
|
|
9882
9882
|
const a = d[i++];
|
|
9883
|
-
ctx2.strokeStyle = `rgba(${
|
|
9883
|
+
ctx2.strokeStyle = `rgba(${r3},${g},${b},${a})`;
|
|
9884
9884
|
ctx2.stroke();
|
|
9885
9885
|
break;
|
|
9886
9886
|
}
|
|
@@ -9983,7 +9983,7 @@ function normalizeRadian(angle) {
|
|
|
9983
9983
|
|
|
9984
9984
|
// node_modules/tvrender/src/contain/arc.ts
|
|
9985
9985
|
var PI24 = Math.PI * 2;
|
|
9986
|
-
function containStroke4(cx, cy,
|
|
9986
|
+
function containStroke4(cx, cy, r2, startAngle, endAngle, anticlockwise, lineWidth, x, y) {
|
|
9987
9987
|
if (lineWidth === 0) {
|
|
9988
9988
|
return false;
|
|
9989
9989
|
}
|
|
@@ -9991,7 +9991,7 @@ function containStroke4(cx, cy, r, startAngle, endAngle, anticlockwise, lineWidt
|
|
|
9991
9991
|
x -= cx;
|
|
9992
9992
|
y -= cy;
|
|
9993
9993
|
const d = Math.sqrt(x * x + y * y);
|
|
9994
|
-
if (d - _l >
|
|
9994
|
+
if (d - _l > r2 || d + _l < r2) {
|
|
9995
9995
|
return false;
|
|
9996
9996
|
}
|
|
9997
9997
|
if (Math.abs(startAngle - endAngle) % PI24 < 1e-4) {
|
|
@@ -10129,12 +10129,12 @@ function windingQuadratic(x0, y0, x1, y1, x2, y2, x, y) {
|
|
|
10129
10129
|
}
|
|
10130
10130
|
}
|
|
10131
10131
|
}
|
|
10132
|
-
function windingArc(cx, cy,
|
|
10132
|
+
function windingArc(cx, cy, r2, startAngle, endAngle, anticlockwise, x, y) {
|
|
10133
10133
|
y -= cy;
|
|
10134
|
-
if (y >
|
|
10134
|
+
if (y > r2 || y < -r2) {
|
|
10135
10135
|
return 0;
|
|
10136
10136
|
}
|
|
10137
|
-
const tmp = Math.sqrt(
|
|
10137
|
+
const tmp = Math.sqrt(r2 * r2 - y * y);
|
|
10138
10138
|
roots[0] = -tmp;
|
|
10139
10139
|
roots[1] = tmp;
|
|
10140
10140
|
const dTheta = Math.abs(startAngle - endAngle);
|
|
@@ -10818,9 +10818,9 @@ function buildPath(ctx2, shape) {
|
|
|
10818
10818
|
let y = shape.y;
|
|
10819
10819
|
let width = shape.width;
|
|
10820
10820
|
let height = shape.height;
|
|
10821
|
-
let
|
|
10821
|
+
let r2 = shape.r;
|
|
10822
10822
|
let r1;
|
|
10823
|
-
let
|
|
10823
|
+
let r22;
|
|
10824
10824
|
let r3;
|
|
10825
10825
|
let r4;
|
|
10826
10826
|
if (width < 0) {
|
|
@@ -10831,41 +10831,41 @@ function buildPath(ctx2, shape) {
|
|
|
10831
10831
|
y = y + height;
|
|
10832
10832
|
height = -height;
|
|
10833
10833
|
}
|
|
10834
|
-
if (typeof
|
|
10835
|
-
r1 =
|
|
10836
|
-
} else if (
|
|
10837
|
-
if (
|
|
10838
|
-
r1 =
|
|
10839
|
-
} else if (
|
|
10840
|
-
r1 = r3 =
|
|
10841
|
-
|
|
10842
|
-
} else if (
|
|
10843
|
-
r1 =
|
|
10844
|
-
|
|
10845
|
-
r3 =
|
|
10834
|
+
if (typeof r2 === "number") {
|
|
10835
|
+
r1 = r22 = r3 = r4 = r2;
|
|
10836
|
+
} else if (r2 instanceof Array) {
|
|
10837
|
+
if (r2.length === 1) {
|
|
10838
|
+
r1 = r22 = r3 = r4 = r2[0];
|
|
10839
|
+
} else if (r2.length === 2) {
|
|
10840
|
+
r1 = r3 = r2[0];
|
|
10841
|
+
r22 = r4 = r2[1];
|
|
10842
|
+
} else if (r2.length === 3) {
|
|
10843
|
+
r1 = r2[0];
|
|
10844
|
+
r22 = r4 = r2[1];
|
|
10845
|
+
r3 = r2[2];
|
|
10846
10846
|
} else {
|
|
10847
|
-
r1 =
|
|
10848
|
-
|
|
10849
|
-
r3 =
|
|
10850
|
-
r4 =
|
|
10847
|
+
r1 = r2[0];
|
|
10848
|
+
r22 = r2[1];
|
|
10849
|
+
r3 = r2[2];
|
|
10850
|
+
r4 = r2[3];
|
|
10851
10851
|
}
|
|
10852
10852
|
} else {
|
|
10853
|
-
r1 =
|
|
10853
|
+
r1 = r22 = r3 = r4 = 0;
|
|
10854
10854
|
}
|
|
10855
10855
|
let total;
|
|
10856
|
-
if (r1 +
|
|
10857
|
-
total = r1 +
|
|
10856
|
+
if (r1 + r22 > width) {
|
|
10857
|
+
total = r1 + r22;
|
|
10858
10858
|
r1 *= width / total;
|
|
10859
|
-
|
|
10859
|
+
r22 *= width / total;
|
|
10860
10860
|
}
|
|
10861
10861
|
if (r3 + r4 > width) {
|
|
10862
10862
|
total = r3 + r4;
|
|
10863
10863
|
r3 *= width / total;
|
|
10864
10864
|
r4 *= width / total;
|
|
10865
10865
|
}
|
|
10866
|
-
if (
|
|
10867
|
-
total =
|
|
10868
|
-
|
|
10866
|
+
if (r22 + r3 > height) {
|
|
10867
|
+
total = r22 + r3;
|
|
10868
|
+
r22 *= height / total;
|
|
10869
10869
|
r3 *= height / total;
|
|
10870
10870
|
}
|
|
10871
10871
|
if (r1 + r4 > height) {
|
|
@@ -10874,8 +10874,8 @@ function buildPath(ctx2, shape) {
|
|
|
10874
10874
|
r4 *= height / total;
|
|
10875
10875
|
}
|
|
10876
10876
|
ctx2.moveTo(x + r1, y);
|
|
10877
|
-
ctx2.lineTo(x + width -
|
|
10878
|
-
|
|
10877
|
+
ctx2.lineTo(x + width - r22, y);
|
|
10878
|
+
r22 !== 0 && ctx2.arc(x + width - r22, y + r22, r22, -Math.PI / 2, 0);
|
|
10879
10879
|
ctx2.lineTo(x + width, y + height - r3);
|
|
10880
10880
|
r3 !== 0 && ctx2.arc(x + width - r3, y + height - r3, r3, 0, Math.PI / 2);
|
|
10881
10881
|
ctx2.lineTo(x + r4, y + height);
|
|
@@ -12791,9 +12791,9 @@ function computeCornerTangents(x0, y0, x1, y1, radius, cr, clockwise) {
|
|
|
12791
12791
|
const dx = x10 - x11;
|
|
12792
12792
|
const dy = y10 - y11;
|
|
12793
12793
|
const d2 = dx * dx + dy * dy;
|
|
12794
|
-
const
|
|
12794
|
+
const r2 = radius - cr;
|
|
12795
12795
|
const s = x11 * y10 - x10 * y11;
|
|
12796
|
-
const d = (dy < 0 ? -1 : 1) * mathSqrt4(mathMax4(0,
|
|
12796
|
+
const d = (dy < 0 ? -1 : 1) * mathSqrt4(mathMax4(0, r2 * r2 * d2 - s * s));
|
|
12797
12797
|
let cx0 = (s * dy - dx * d) / d2;
|
|
12798
12798
|
let cy0 = (-s * dx - dy * d) / d2;
|
|
12799
12799
|
const cx1 = (s * dy + dx * d) / d2;
|
|
@@ -12811,8 +12811,8 @@ function computeCornerTangents(x0, y0, x1, y1, radius, cr, clockwise) {
|
|
|
12811
12811
|
cy: cy0,
|
|
12812
12812
|
x0: -ox,
|
|
12813
12813
|
y0: -oy,
|
|
12814
|
-
x1: cx0 * (radius /
|
|
12815
|
-
y1: cy0 * (radius /
|
|
12814
|
+
x1: cx0 * (radius / r2 - 1),
|
|
12815
|
+
y1: cy0 * (radius / r2 - 1)
|
|
12816
12816
|
};
|
|
12817
12817
|
}
|
|
12818
12818
|
function normalizeCornerRadius(cr) {
|
|
@@ -13344,14 +13344,14 @@ var Arc = class extends Path_default {
|
|
|
13344
13344
|
buildPath(ctx2, shape) {
|
|
13345
13345
|
const x = shape.cx;
|
|
13346
13346
|
const y = shape.cy;
|
|
13347
|
-
const
|
|
13347
|
+
const r2 = Math.max(shape.r, 0);
|
|
13348
13348
|
const startAngle = shape.startAngle;
|
|
13349
13349
|
const endAngle = shape.endAngle;
|
|
13350
13350
|
const clockwise = shape.clockwise;
|
|
13351
13351
|
const unitX = Math.cos(startAngle);
|
|
13352
13352
|
const unitY = Math.sin(startAngle);
|
|
13353
|
-
ctx2.moveTo(unitX *
|
|
13354
|
-
ctx2.arc(x, y,
|
|
13353
|
+
ctx2.moveTo(unitX * r2 + x, unitY * r2 + y);
|
|
13354
|
+
ctx2.arc(x, y, r2, startAngle, endAngle, !clockwise);
|
|
13355
13355
|
}
|
|
13356
13356
|
};
|
|
13357
13357
|
Arc.prototype.type = "arc";
|
|
@@ -13433,11 +13433,11 @@ var LinearGradient_default = LinearGradient;
|
|
|
13433
13433
|
|
|
13434
13434
|
// node_modules/tvrender/src/graphic/RadialGradient.ts
|
|
13435
13435
|
var RadialGradient = class extends Gradient_default {
|
|
13436
|
-
constructor(x, y,
|
|
13436
|
+
constructor(x, y, r2, colorStops, globalCoord) {
|
|
13437
13437
|
super(colorStops);
|
|
13438
13438
|
this.x = x == null ? 0.5 : x;
|
|
13439
13439
|
this.y = y == null ? 0.5 : y;
|
|
13440
|
-
this.r =
|
|
13440
|
+
this.r = r2 == null ? 0.5 : r2;
|
|
13441
13441
|
this.type = "radial";
|
|
13442
13442
|
this.global = globalCoord || false;
|
|
13443
13443
|
}
|
|
@@ -16432,6 +16432,7 @@ var BUITIN_COMPONENTS_MAP = {
|
|
|
16432
16432
|
axisPointer: "AxisPointerComponent",
|
|
16433
16433
|
brush: "BrushComponent",
|
|
16434
16434
|
title: "TitleComponent",
|
|
16435
|
+
events: "EventsComponent",
|
|
16435
16436
|
limitTip: "LimitTipComponent",
|
|
16436
16437
|
cursorPointer: "CursorPointerComponent",
|
|
16437
16438
|
table: "TableComponent",
|
|
@@ -21215,18 +21216,18 @@ function defaultLoading(api2, opts) {
|
|
|
21215
21216
|
}
|
|
21216
21217
|
group.resize = function() {
|
|
21217
21218
|
const textWidth = textContent.getBoundingRect().width;
|
|
21218
|
-
const
|
|
21219
|
-
const cx = (api2.getWidth() -
|
|
21219
|
+
const r2 = opts.showSpinner ? opts.spinnerRadius : 0;
|
|
21220
|
+
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);
|
|
21220
21221
|
const cy = api2.getHeight() / 2;
|
|
21221
21222
|
opts.showSpinner && arc2.setShape({
|
|
21222
21223
|
cx,
|
|
21223
21224
|
cy
|
|
21224
21225
|
});
|
|
21225
21226
|
labelRect.setShape({
|
|
21226
|
-
x: cx -
|
|
21227
|
-
y: cy -
|
|
21228
|
-
width:
|
|
21229
|
-
height:
|
|
21227
|
+
x: cx - r2,
|
|
21228
|
+
y: cy - r2,
|
|
21229
|
+
width: r2 * 2,
|
|
21230
|
+
height: r2 * 2
|
|
21230
21231
|
});
|
|
21231
21232
|
mask.setShape({
|
|
21232
21233
|
x: 0,
|
|
@@ -21906,6 +21907,31 @@ function findClosestTimestamp(arr, target) {
|
|
|
21906
21907
|
;
|
|
21907
21908
|
return Math.abs(+leftClosest - +target) <= Math.abs(+rightClosest - +target) ? leftClosest : rightClosest;
|
|
21908
21909
|
}
|
|
21910
|
+
function findClosestIndex(arr, target) {
|
|
21911
|
+
let left = 0;
|
|
21912
|
+
let right = arr.length - 1;
|
|
21913
|
+
if (arr.length === 0) {
|
|
21914
|
+
return -1;
|
|
21915
|
+
}
|
|
21916
|
+
;
|
|
21917
|
+
while (left < right) {
|
|
21918
|
+
const mid = Math.floor((left + right) / 2);
|
|
21919
|
+
if (arr[mid] === target) {
|
|
21920
|
+
return mid;
|
|
21921
|
+
} else if (arr[mid] < target) {
|
|
21922
|
+
left = mid + 1;
|
|
21923
|
+
} else {
|
|
21924
|
+
right = mid;
|
|
21925
|
+
}
|
|
21926
|
+
}
|
|
21927
|
+
const leftClosest = arr[left];
|
|
21928
|
+
const rightClosest = left > 0 ? arr[left - 1] : void 0;
|
|
21929
|
+
if (rightClosest === void 0) {
|
|
21930
|
+
return left;
|
|
21931
|
+
}
|
|
21932
|
+
;
|
|
21933
|
+
return Math.abs(+leftClosest - +target) <= Math.abs(+rightClosest - +target) ? left : right;
|
|
21934
|
+
}
|
|
21909
21935
|
|
|
21910
21936
|
// src/visual/symbol.ts
|
|
21911
21937
|
var SYMBOL_PROPS_WITH_CB = [
|
|
@@ -22227,17 +22253,17 @@ var Pin = Path_default.extend({
|
|
|
22227
22253
|
const y = shape.y;
|
|
22228
22254
|
const w = shape.width / 5 * 3;
|
|
22229
22255
|
const h = Math.max(w, shape.height);
|
|
22230
|
-
const
|
|
22231
|
-
const dy =
|
|
22232
|
-
const cy = y - h +
|
|
22233
|
-
const angle = Math.asin(dy /
|
|
22234
|
-
const dx = Math.cos(angle) *
|
|
22256
|
+
const r2 = w / 2;
|
|
22257
|
+
const dy = r2 * r2 / (h - r2);
|
|
22258
|
+
const cy = y - h + r2 + dy;
|
|
22259
|
+
const angle = Math.asin(dy / r2);
|
|
22260
|
+
const dx = Math.cos(angle) * r2;
|
|
22235
22261
|
const tanX = Math.sin(angle);
|
|
22236
22262
|
const tanY = Math.cos(angle);
|
|
22237
|
-
const cpLen =
|
|
22238
|
-
const cpLen2 =
|
|
22263
|
+
const cpLen = r2 * 0.6;
|
|
22264
|
+
const cpLen2 = r2 * 0.7;
|
|
22239
22265
|
path.moveTo(x - dx, cy + dy);
|
|
22240
|
-
path.arc(x, cy,
|
|
22266
|
+
path.arc(x, cy, r2, Math.PI - angle, Math.PI * 2 + angle);
|
|
22241
22267
|
path.bezierCurveTo(x + dx - tanX * cpLen, cy + dy + tanY * cpLen, x, y - cpLen2, x, y);
|
|
22242
22268
|
path.bezierCurveTo(x, y - cpLen2, x - dx + tanX * cpLen, cy + dy + tanY * cpLen, x - dx, cy + dy);
|
|
22243
22269
|
path.closePath();
|
|
@@ -22307,20 +22333,20 @@ var LabelDown = Path_default.extend({
|
|
|
22307
22333
|
triangleWidth: 0
|
|
22308
22334
|
},
|
|
22309
22335
|
buildPath: function(ctx2, shape) {
|
|
22310
|
-
const {x, y, width, height, r, triangleWidth} = shape;
|
|
22336
|
+
const {x, y, width, height, r: r2, triangleWidth} = shape;
|
|
22311
22337
|
const triangleHeight = triangleWidth;
|
|
22312
|
-
ctx2.moveTo(x +
|
|
22313
|
-
ctx2.lineTo(x + width -
|
|
22314
|
-
ctx2.arc(x + width -
|
|
22315
|
-
ctx2.lineTo(x + width, y + height -
|
|
22316
|
-
ctx2.arc(x + width -
|
|
22338
|
+
ctx2.moveTo(x + r2, y);
|
|
22339
|
+
ctx2.lineTo(x + width - r2, y);
|
|
22340
|
+
ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
|
|
22341
|
+
ctx2.lineTo(x + width, y + height - r2);
|
|
22342
|
+
ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
|
|
22317
22343
|
ctx2.lineTo(x + width / 2 + triangleWidth, y + height);
|
|
22318
22344
|
ctx2.lineTo(x + width / 2, y + height + triangleHeight);
|
|
22319
22345
|
ctx2.lineTo(x + width / 2 - triangleWidth, y + height);
|
|
22320
|
-
ctx2.lineTo(x +
|
|
22321
|
-
ctx2.arc(x +
|
|
22322
|
-
ctx2.lineTo(x, y +
|
|
22323
|
-
ctx2.arc(x +
|
|
22346
|
+
ctx2.lineTo(x + r2, y + height);
|
|
22347
|
+
ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
|
|
22348
|
+
ctx2.lineTo(x, y + r2);
|
|
22349
|
+
ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
|
|
22324
22350
|
}
|
|
22325
22351
|
});
|
|
22326
22352
|
var LabelUp = Path_default.extend({
|
|
@@ -22334,20 +22360,20 @@ var LabelUp = Path_default.extend({
|
|
|
22334
22360
|
triangleWidth: 0
|
|
22335
22361
|
},
|
|
22336
22362
|
buildPath: function(ctx2, shape) {
|
|
22337
|
-
const {x, y, width, height, r, triangleWidth} = shape;
|
|
22363
|
+
const {x, y, width, height, r: r2, triangleWidth} = shape;
|
|
22338
22364
|
const triangleHeight = triangleWidth;
|
|
22339
|
-
ctx2.moveTo(x +
|
|
22365
|
+
ctx2.moveTo(x + r2, y);
|
|
22340
22366
|
ctx2.lineTo(x + width / 2 - triangleWidth, y);
|
|
22341
22367
|
ctx2.lineTo(x + width / 2, y - triangleHeight);
|
|
22342
22368
|
ctx2.lineTo(x + width / 2 + triangleWidth, y);
|
|
22343
|
-
ctx2.lineTo(x + width -
|
|
22344
|
-
ctx2.arc(x + width -
|
|
22345
|
-
ctx2.lineTo(x + width, y + height -
|
|
22346
|
-
ctx2.arc(x + width -
|
|
22347
|
-
ctx2.lineTo(x +
|
|
22348
|
-
ctx2.arc(x +
|
|
22349
|
-
ctx2.lineTo(x, y +
|
|
22350
|
-
ctx2.arc(x +
|
|
22369
|
+
ctx2.lineTo(x + width - r2, y);
|
|
22370
|
+
ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
|
|
22371
|
+
ctx2.lineTo(x + width, y + height - r2);
|
|
22372
|
+
ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
|
|
22373
|
+
ctx2.lineTo(x + r2, y + height);
|
|
22374
|
+
ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
|
|
22375
|
+
ctx2.lineTo(x, y + r2);
|
|
22376
|
+
ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
|
|
22351
22377
|
}
|
|
22352
22378
|
});
|
|
22353
22379
|
var LabelLeft = Path_default.extend({
|
|
@@ -22361,20 +22387,20 @@ var LabelLeft = Path_default.extend({
|
|
|
22361
22387
|
triangleWidth: 0
|
|
22362
22388
|
},
|
|
22363
22389
|
buildPath: function(ctx2, shape) {
|
|
22364
|
-
const {x, y, width, height, r, triangleWidth} = shape;
|
|
22390
|
+
const {x, y, width, height, r: r2, triangleWidth} = shape;
|
|
22365
22391
|
const triangleHeight = triangleWidth;
|
|
22366
|
-
ctx2.moveTo(x +
|
|
22367
|
-
ctx2.lineTo(x + width -
|
|
22368
|
-
ctx2.arc(x + width -
|
|
22369
|
-
ctx2.lineTo(x + width, y + height -
|
|
22370
|
-
ctx2.arc(x + width -
|
|
22371
|
-
ctx2.lineTo(x +
|
|
22372
|
-
ctx2.arc(x +
|
|
22392
|
+
ctx2.moveTo(x + r2, y);
|
|
22393
|
+
ctx2.lineTo(x + width - r2, y);
|
|
22394
|
+
ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
|
|
22395
|
+
ctx2.lineTo(x + width, y + height - r2);
|
|
22396
|
+
ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
|
|
22397
|
+
ctx2.lineTo(x + r2, y + height);
|
|
22398
|
+
ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
|
|
22373
22399
|
ctx2.lineTo(x, y + height / 2 + triangleWidth);
|
|
22374
22400
|
ctx2.lineTo(x - triangleHeight, y + height / 2);
|
|
22375
22401
|
ctx2.lineTo(x, y + height / 2 - triangleWidth);
|
|
22376
|
-
ctx2.lineTo(x, y +
|
|
22377
|
-
ctx2.arc(x +
|
|
22402
|
+
ctx2.lineTo(x, y + r2);
|
|
22403
|
+
ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
|
|
22378
22404
|
}
|
|
22379
22405
|
});
|
|
22380
22406
|
var LabelRight = Path_default.extend({
|
|
@@ -22388,20 +22414,20 @@ var LabelRight = Path_default.extend({
|
|
|
22388
22414
|
triangleWidth: 0
|
|
22389
22415
|
},
|
|
22390
22416
|
buildPath: function(ctx2, shape) {
|
|
22391
|
-
const {x, y, width, height, r, triangleWidth} = shape;
|
|
22417
|
+
const {x, y, width, height, r: r2, triangleWidth} = shape;
|
|
22392
22418
|
const triangleHeight = triangleWidth;
|
|
22393
|
-
ctx2.moveTo(x +
|
|
22394
|
-
ctx2.lineTo(x + width -
|
|
22395
|
-
ctx2.arc(x + width -
|
|
22419
|
+
ctx2.moveTo(x + r2, y);
|
|
22420
|
+
ctx2.lineTo(x + width - r2, y);
|
|
22421
|
+
ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
|
|
22396
22422
|
ctx2.lineTo(x + width, y + height / 2 - triangleWidth);
|
|
22397
22423
|
ctx2.lineTo(x + width + triangleHeight, y + height / 2);
|
|
22398
22424
|
ctx2.lineTo(x + width, y + height / 2 + triangleWidth);
|
|
22399
|
-
ctx2.lineTo(x + width, y + height -
|
|
22400
|
-
ctx2.arc(x + width -
|
|
22401
|
-
ctx2.lineTo(x +
|
|
22402
|
-
ctx2.arc(x +
|
|
22403
|
-
ctx2.lineTo(x, y +
|
|
22404
|
-
ctx2.arc(x +
|
|
22425
|
+
ctx2.lineTo(x + width, y + height - r2);
|
|
22426
|
+
ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
|
|
22427
|
+
ctx2.lineTo(x + r2, y + height);
|
|
22428
|
+
ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
|
|
22429
|
+
ctx2.lineTo(x, y + r2);
|
|
22430
|
+
ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
|
|
22405
22431
|
}
|
|
22406
22432
|
});
|
|
22407
22433
|
var LabelLowerLeft = Path_default.extend({
|
|
@@ -22421,20 +22447,20 @@ var LabelLowerLeft = Path_default.extend({
|
|
|
22421
22447
|
const width = shape.width;
|
|
22422
22448
|
const x = shape.x;
|
|
22423
22449
|
const y = shape.y;
|
|
22424
|
-
const
|
|
22450
|
+
const r2 = shape.r;
|
|
22425
22451
|
const offsetY = shape.offsetY;
|
|
22426
22452
|
const offsetX = shape.offsetX;
|
|
22427
22453
|
const offsetWidth = shape.offsetWidth;
|
|
22428
|
-
ctx2.moveTo(x +
|
|
22429
|
-
ctx2.lineTo(x + width -
|
|
22430
|
-
ctx2.arc(x + width -
|
|
22431
|
-
ctx2.lineTo(x + width, y + height -
|
|
22432
|
-
ctx2.arc(x + width -
|
|
22433
|
-
ctx2.lineTo(x +
|
|
22454
|
+
ctx2.moveTo(x + r2, y);
|
|
22455
|
+
ctx2.lineTo(x + width - r2, y);
|
|
22456
|
+
ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
|
|
22457
|
+
ctx2.lineTo(x + width, y + height - r2);
|
|
22458
|
+
ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
|
|
22459
|
+
ctx2.lineTo(x + r2, y + height);
|
|
22434
22460
|
ctx2.lineTo(x - offsetWidth, y + height + offsetY);
|
|
22435
22461
|
ctx2.lineTo(x, y + height - offsetX);
|
|
22436
|
-
ctx2.lineTo(x, y +
|
|
22437
|
-
ctx2.arc(x +
|
|
22462
|
+
ctx2.lineTo(x, y + r2);
|
|
22463
|
+
ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
|
|
22438
22464
|
}
|
|
22439
22465
|
});
|
|
22440
22466
|
var LabelLowerRight = Path_default.extend({
|
|
@@ -22457,17 +22483,17 @@ var LabelLowerRight = Path_default.extend({
|
|
|
22457
22483
|
const width = shape.width;
|
|
22458
22484
|
const x = shape.x;
|
|
22459
22485
|
const y = shape.y;
|
|
22460
|
-
const
|
|
22461
|
-
ctx2.moveTo(x +
|
|
22462
|
-
ctx2.lineTo(x + width -
|
|
22463
|
-
ctx2.arc(x + width -
|
|
22486
|
+
const r2 = shape.r;
|
|
22487
|
+
ctx2.moveTo(x + r2, y);
|
|
22488
|
+
ctx2.lineTo(x + width - r2, y);
|
|
22489
|
+
ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
|
|
22464
22490
|
ctx2.lineTo(x + width, y + height - offsetWidth);
|
|
22465
22491
|
ctx2.lineTo(x + width + offsetX, y + height + offsetY);
|
|
22466
|
-
ctx2.lineTo(x + width -
|
|
22467
|
-
ctx2.lineTo(x +
|
|
22468
|
-
ctx2.arc(x +
|
|
22469
|
-
ctx2.lineTo(x, y +
|
|
22470
|
-
ctx2.arc(x +
|
|
22492
|
+
ctx2.lineTo(x + width - r2, y + height);
|
|
22493
|
+
ctx2.lineTo(x + r2, y + height);
|
|
22494
|
+
ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
|
|
22495
|
+
ctx2.lineTo(x, y + r2);
|
|
22496
|
+
ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
|
|
22471
22497
|
}
|
|
22472
22498
|
});
|
|
22473
22499
|
var LabelUpperLeft = Path_default.extend({
|
|
@@ -22487,20 +22513,20 @@ var LabelUpperLeft = Path_default.extend({
|
|
|
22487
22513
|
const width = shape.width;
|
|
22488
22514
|
const x = shape.x;
|
|
22489
22515
|
const y = shape.y;
|
|
22490
|
-
const
|
|
22516
|
+
const r2 = shape.r;
|
|
22491
22517
|
const offsetY = shape.offsetY;
|
|
22492
22518
|
const offsetX = shape.offsetX;
|
|
22493
22519
|
const offsetWidth = shape.offsetWidth;
|
|
22494
|
-
ctx2.moveTo(x +
|
|
22495
|
-
ctx2.lineTo(x + width -
|
|
22496
|
-
ctx2.arc(x + width -
|
|
22497
|
-
ctx2.lineTo(x + width, y + height -
|
|
22498
|
-
ctx2.arc(x + width -
|
|
22499
|
-
ctx2.lineTo(x +
|
|
22500
|
-
ctx2.arc(x +
|
|
22520
|
+
ctx2.moveTo(x + r2, y);
|
|
22521
|
+
ctx2.lineTo(x + width - r2, y);
|
|
22522
|
+
ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
|
|
22523
|
+
ctx2.lineTo(x + width, y + height - r2);
|
|
22524
|
+
ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
|
|
22525
|
+
ctx2.lineTo(x + r2, y + height);
|
|
22526
|
+
ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
|
|
22501
22527
|
ctx2.lineTo(x, y + offsetWidth);
|
|
22502
22528
|
ctx2.lineTo(x - offsetX, y - offsetY);
|
|
22503
|
-
ctx2.lineTo(x +
|
|
22529
|
+
ctx2.lineTo(x + r2, y);
|
|
22504
22530
|
}
|
|
22505
22531
|
});
|
|
22506
22532
|
var LabelUpperRight = Path_default.extend({
|
|
@@ -22520,20 +22546,20 @@ var LabelUpperRight = Path_default.extend({
|
|
|
22520
22546
|
const width = shape.width;
|
|
22521
22547
|
const x = shape.x;
|
|
22522
22548
|
const y = shape.y;
|
|
22523
|
-
const
|
|
22549
|
+
const r2 = shape.r;
|
|
22524
22550
|
const offsetY = shape.offsetY;
|
|
22525
22551
|
const offsetX = shape.offsetX;
|
|
22526
22552
|
const offsetWidth = shape.offsetWidth;
|
|
22527
|
-
ctx2.moveTo(x +
|
|
22528
|
-
ctx2.lineTo(x + width -
|
|
22553
|
+
ctx2.moveTo(x + r2, y);
|
|
22554
|
+
ctx2.lineTo(x + width - r2, y);
|
|
22529
22555
|
ctx2.lineTo(x + width + offsetX, y - offsetY);
|
|
22530
22556
|
ctx2.lineTo(x + width, y + offsetWidth);
|
|
22531
|
-
ctx2.lineTo(x + width, y + height -
|
|
22532
|
-
ctx2.arc(x + width -
|
|
22533
|
-
ctx2.lineTo(x +
|
|
22534
|
-
ctx2.arc(x +
|
|
22557
|
+
ctx2.lineTo(x + width, y + height - r2);
|
|
22558
|
+
ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
|
|
22559
|
+
ctx2.lineTo(x + r2, y + height);
|
|
22560
|
+
ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
|
|
22535
22561
|
ctx2.lineTo(x, y);
|
|
22536
|
-
ctx2.arc(x +
|
|
22562
|
+
ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
|
|
22537
22563
|
}
|
|
22538
22564
|
});
|
|
22539
22565
|
var LabelCenter = Path_default.extend({
|
|
@@ -22550,16 +22576,16 @@ var LabelCenter = Path_default.extend({
|
|
|
22550
22576
|
const width = shape.width;
|
|
22551
22577
|
const x = shape.x;
|
|
22552
22578
|
const y = shape.y;
|
|
22553
|
-
const
|
|
22554
|
-
ctx2.moveTo(x +
|
|
22555
|
-
ctx2.lineTo(x + width -
|
|
22556
|
-
ctx2.arc(x + width -
|
|
22557
|
-
ctx2.lineTo(x + width, y + height -
|
|
22558
|
-
ctx2.arc(x + width -
|
|
22559
|
-
ctx2.lineTo(x +
|
|
22560
|
-
ctx2.arc(x +
|
|
22579
|
+
const r2 = shape.r;
|
|
22580
|
+
ctx2.moveTo(x + r2, y);
|
|
22581
|
+
ctx2.lineTo(x + width - r2, y);
|
|
22582
|
+
ctx2.arc(x + width - r2, y + r2, r2, -Math.PI / 2, 0);
|
|
22583
|
+
ctx2.lineTo(x + width, y + height - r2);
|
|
22584
|
+
ctx2.arc(x + width - r2, y + height - r2, r2, 0, Math.PI / 2);
|
|
22585
|
+
ctx2.lineTo(x + r2, y + height);
|
|
22586
|
+
ctx2.arc(x + r2, y + height - r2, r2, Math.PI / 2, Math.PI);
|
|
22561
22587
|
ctx2.lineTo(x, y);
|
|
22562
|
-
ctx2.arc(x +
|
|
22588
|
+
ctx2.arc(x + r2, y + r2, r2, Math.PI, Math.PI * 1.5);
|
|
22563
22589
|
}
|
|
22564
22590
|
});
|
|
22565
22591
|
var XCross = Path_default.extend({
|
|
@@ -22985,54 +23011,54 @@ var symbolShapeMakers = {
|
|
|
22985
23011
|
shape.height = h;
|
|
22986
23012
|
},
|
|
22987
23013
|
labelCenter: function(x, y, w, h, shape) {
|
|
22988
|
-
const
|
|
23014
|
+
const r2 = 2;
|
|
22989
23015
|
const offset = 1;
|
|
22990
23016
|
shape.x = x - w / 2 + offset;
|
|
22991
23017
|
shape.y = y - h;
|
|
22992
23018
|
shape.width = w;
|
|
22993
23019
|
shape.height = h;
|
|
22994
|
-
shape.r =
|
|
23020
|
+
shape.r = r2;
|
|
22995
23021
|
},
|
|
22996
23022
|
labelDown: function(x, y, w, h, shape, parentShape) {
|
|
22997
23023
|
const triangleWidth = parentShape.triangleWidth;
|
|
22998
|
-
const
|
|
23024
|
+
const r2 = 2;
|
|
22999
23025
|
const offset = 1;
|
|
23000
23026
|
shape.triangleWidth = triangleWidth;
|
|
23001
23027
|
shape.x = x - w / 2 + offset;
|
|
23002
23028
|
shape.y = y - h - triangleWidth;
|
|
23003
23029
|
shape.width = w;
|
|
23004
23030
|
shape.height = h;
|
|
23005
|
-
shape.r =
|
|
23031
|
+
shape.r = r2;
|
|
23006
23032
|
},
|
|
23007
23033
|
labelUp: function(x, y, w, h, shape, parentShape) {
|
|
23008
|
-
const
|
|
23034
|
+
const r2 = 2;
|
|
23009
23035
|
const offset = 1;
|
|
23010
23036
|
shape.x = x - w / 2 + offset;
|
|
23011
23037
|
shape.triangleWidth = parentShape.triangleWidth;
|
|
23012
23038
|
shape.y = y - h + parentShape.triangleWidth;
|
|
23013
23039
|
shape.width = w;
|
|
23014
23040
|
shape.height = h;
|
|
23015
|
-
shape.r =
|
|
23041
|
+
shape.r = r2;
|
|
23016
23042
|
},
|
|
23017
23043
|
labelLeft: function(x, y, w, h, shape, parentShape) {
|
|
23018
23044
|
const triangleWidth = parentShape.triangleWidth;
|
|
23019
|
-
const
|
|
23045
|
+
const r2 = 2;
|
|
23020
23046
|
shape.triangleWidth = triangleWidth;
|
|
23021
23047
|
shape.x = x + triangleWidth;
|
|
23022
23048
|
shape.y = y - h / 2;
|
|
23023
23049
|
shape.width = w;
|
|
23024
23050
|
shape.height = h;
|
|
23025
|
-
shape.r =
|
|
23051
|
+
shape.r = r2;
|
|
23026
23052
|
},
|
|
23027
23053
|
labelRight: function(x, y, w, h, shape, parentShape) {
|
|
23028
23054
|
const triangleWidth = parentShape.triangleWidth;
|
|
23029
|
-
const
|
|
23055
|
+
const r2 = 2;
|
|
23030
23056
|
shape.triangleWidth = triangleWidth;
|
|
23031
23057
|
shape.x = x - w - triangleWidth;
|
|
23032
23058
|
shape.y = y - h / 2;
|
|
23033
23059
|
shape.width = w;
|
|
23034
23060
|
shape.height = h;
|
|
23035
|
-
shape.r =
|
|
23061
|
+
shape.r = r2;
|
|
23036
23062
|
},
|
|
23037
23063
|
labelLowerLeft: function(x, y, w, h, shape, parentShape) {
|
|
23038
23064
|
const offsetY = parentShape.offsetY;
|
|
@@ -23307,16 +23333,16 @@ function createRadialGradient(ctx2, obj, rect) {
|
|
|
23307
23333
|
const min3 = Math.min(width, height);
|
|
23308
23334
|
let x = obj.x == null ? 0.5 : obj.x;
|
|
23309
23335
|
let y = obj.y == null ? 0.5 : obj.y;
|
|
23310
|
-
let
|
|
23336
|
+
let r2 = obj.r == null ? 0.5 : obj.r;
|
|
23311
23337
|
if (!obj.global) {
|
|
23312
23338
|
x = x * width + rect.x;
|
|
23313
23339
|
y = y * height + rect.y;
|
|
23314
|
-
|
|
23340
|
+
r2 = r2 * min3;
|
|
23315
23341
|
}
|
|
23316
23342
|
x = isSafeNum(x) ? x : 0.5;
|
|
23317
23343
|
y = isSafeNum(y) ? y : 0.5;
|
|
23318
|
-
|
|
23319
|
-
const canvasGradient = ctx2.createRadialGradient(x, y, 0, x, y,
|
|
23344
|
+
r2 = r2 >= 0 && isSafeNum(r2) ? r2 : 0.5;
|
|
23345
|
+
const canvasGradient = ctx2.createRadialGradient(x, y, 0, x, y, r2);
|
|
23320
23346
|
return canvasGradient;
|
|
23321
23347
|
}
|
|
23322
23348
|
function getCanvasGradient(ctx2, obj, rect) {
|
|
@@ -25011,7 +25037,8 @@ var ECharts = class extends Eventful_default {
|
|
|
25011
25037
|
"selectidchanged",
|
|
25012
25038
|
"playbackselected",
|
|
25013
25039
|
"snapshotzoom",
|
|
25014
|
-
"playbackorder"
|
|
25040
|
+
"playbackorder",
|
|
25041
|
+
"events"
|
|
25015
25042
|
], (eventType) => {
|
|
25016
25043
|
this._messageCenter.on(eventType, function(event) {
|
|
25017
25044
|
this.trigger(eventType, event);
|
|
@@ -28663,6 +28690,20 @@ var OrdinalMeta = class {
|
|
|
28663
28690
|
}
|
|
28664
28691
|
return index;
|
|
28665
28692
|
}
|
|
28693
|
+
parseAndExtra(category) {
|
|
28694
|
+
let index;
|
|
28695
|
+
const needCollect = this._needCollect;
|
|
28696
|
+
if (!isString(category) && !needCollect) {
|
|
28697
|
+
return category;
|
|
28698
|
+
}
|
|
28699
|
+
const map9 = this._getOrCreateMap();
|
|
28700
|
+
index = map9.get(category);
|
|
28701
|
+
if (index == null) {
|
|
28702
|
+
const idx = findClosestIndex(this.extraCategory, category);
|
|
28703
|
+
return ~idx ? this.categories.length + idx : NaN;
|
|
28704
|
+
}
|
|
28705
|
+
return index;
|
|
28706
|
+
}
|
|
28666
28707
|
_getOrCreateMap() {
|
|
28667
28708
|
return this._map || (this._map = createHashMap(this.categories));
|
|
28668
28709
|
}
|
|
@@ -30849,27 +30890,27 @@ function parseColor(color2) {
|
|
|
30849
30890
|
hex = hex.split("").map((c) => c + c).join("");
|
|
30850
30891
|
}
|
|
30851
30892
|
if (hex.length === 6 || hex.length === 8) {
|
|
30852
|
-
const
|
|
30893
|
+
const r2 = parseInt(hex.slice(0, 2), 16);
|
|
30853
30894
|
const g = parseInt(hex.slice(2, 4), 16);
|
|
30854
30895
|
const b = parseInt(hex.slice(4, 6), 16);
|
|
30855
|
-
return [
|
|
30896
|
+
return [r2, g, b];
|
|
30856
30897
|
}
|
|
30857
30898
|
}
|
|
30858
30899
|
return [0, 0, 0];
|
|
30859
30900
|
}
|
|
30860
30901
|
function contrastColor2(color2) {
|
|
30861
|
-
const [
|
|
30862
|
-
const brightness = (
|
|
30902
|
+
const [r2, g, b] = parseColor(color2);
|
|
30903
|
+
const brightness = (r2 * 299 + g * 587 + b * 114) / 1e3;
|
|
30863
30904
|
return brightness >= 130 ? "#000000" : "#ffffff";
|
|
30864
30905
|
}
|
|
30865
30906
|
function getIsLightColor(color2) {
|
|
30866
|
-
const [
|
|
30867
|
-
const brightness = (
|
|
30907
|
+
const [r2, g, b] = parseColor(color2);
|
|
30908
|
+
const brightness = (r2 * 299 + g * 587 + b * 114) / 1e3;
|
|
30868
30909
|
return brightness >= 130;
|
|
30869
30910
|
}
|
|
30870
30911
|
function removeTransparency(color2) {
|
|
30871
|
-
const [
|
|
30872
|
-
return `rgb(${
|
|
30912
|
+
const [r2, g, b] = parseColor(color2);
|
|
30913
|
+
return `rgb(${r2}, ${g}, ${b})`;
|
|
30873
30914
|
}
|
|
30874
30915
|
function isColorSimilarManhattan(rgbas1, rgbas2, threshold01 = 0.1, weightAlpha = 1) {
|
|
30875
30916
|
const maxSum = threshold01 * 255 * 4;
|
|
@@ -30882,10 +30923,10 @@ function blendColors(foreground, background) {
|
|
|
30882
30923
|
const fgAlpha = fg.a !== void 0 ? fg.a : 1;
|
|
30883
30924
|
const bgAlpha = bg.a !== void 0 ? bg.a : 1;
|
|
30884
30925
|
const alpha = fgAlpha + bgAlpha * (1 - fgAlpha);
|
|
30885
|
-
const
|
|
30926
|
+
const r2 = Math.round((fg.r * fgAlpha + bg.r * bgAlpha * (1 - fgAlpha)) / alpha);
|
|
30886
30927
|
const g = Math.round((fg.g * fgAlpha + bg.g * bgAlpha * (1 - fgAlpha)) / alpha);
|
|
30887
30928
|
const b = Math.round((fg.b * fgAlpha + bg.b * bgAlpha * (1 - fgAlpha)) / alpha);
|
|
30888
|
-
return rgbToHex(
|
|
30929
|
+
return rgbToHex(r2, g, b);
|
|
30889
30930
|
}
|
|
30890
30931
|
function parseColorToRgba(color2) {
|
|
30891
30932
|
color2 = color2.trim().toLowerCase();
|
|
@@ -30905,10 +30946,10 @@ function parseColorToRgba(color2) {
|
|
|
30905
30946
|
if (color2.length === 3) {
|
|
30906
30947
|
color2 = color2[0] + color2[0] + color2[1] + color2[1] + color2[2] + color2[2];
|
|
30907
30948
|
}
|
|
30908
|
-
const
|
|
30949
|
+
const r2 = parseInt(color2.substring(0, 2), 16);
|
|
30909
30950
|
const g = parseInt(color2.substring(2, 4), 16);
|
|
30910
30951
|
const b = parseInt(color2.substring(4, 6), 16);
|
|
30911
|
-
const result = {r, g, b};
|
|
30952
|
+
const result = {r: r2, g, b};
|
|
30912
30953
|
if (color2.length === 8) {
|
|
30913
30954
|
result.a = parseInt(color2.substring(6, 8), 16) / 255;
|
|
30914
30955
|
}
|
|
@@ -30916,8 +30957,8 @@ function parseColorToRgba(color2) {
|
|
|
30916
30957
|
}
|
|
30917
30958
|
throw new Error(`\u65E0\u6CD5\u89E3\u6790\u7684\u989C\u8272\u683C\u5F0F: ${color2}`);
|
|
30918
30959
|
}
|
|
30919
|
-
function rgbToHex(
|
|
30920
|
-
return `#${Math.round(
|
|
30960
|
+
function rgbToHex(r2, g, b) {
|
|
30961
|
+
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")}`;
|
|
30921
30962
|
}
|
|
30922
30963
|
|
|
30923
30964
|
// src/data/scale-time/default-tick-mark-formatter.ts
|
|
@@ -31493,18 +31534,18 @@ function getCandidateAnchor(pos, distance2, rect, outPt, outDir) {
|
|
|
31493
31534
|
break;
|
|
31494
31535
|
}
|
|
31495
31536
|
}
|
|
31496
|
-
function projectPointToArc(cx, cy,
|
|
31537
|
+
function projectPointToArc(cx, cy, r2, startAngle, endAngle, anticlockwise, x, y, out2) {
|
|
31497
31538
|
x -= cx;
|
|
31498
31539
|
y -= cy;
|
|
31499
31540
|
const d = Math.sqrt(x * x + y * y);
|
|
31500
31541
|
x /= d;
|
|
31501
31542
|
y /= d;
|
|
31502
|
-
const ox = x *
|
|
31503
|
-
const oy = y *
|
|
31543
|
+
const ox = x * r2 + cx;
|
|
31544
|
+
const oy = y * r2 + cy;
|
|
31504
31545
|
if (Math.abs(startAngle - endAngle) % PI27 < 1e-4) {
|
|
31505
31546
|
out2[0] = ox;
|
|
31506
31547
|
out2[1] = oy;
|
|
31507
|
-
return d -
|
|
31548
|
+
return d - r2;
|
|
31508
31549
|
}
|
|
31509
31550
|
if (anticlockwise) {
|
|
31510
31551
|
const tmp = startAngle;
|
|
@@ -31524,12 +31565,12 @@ function projectPointToArc(cx, cy, r, startAngle, endAngle, anticlockwise, x, y,
|
|
|
31524
31565
|
if (angle >= startAngle && angle <= endAngle || angle + PI27 >= startAngle && angle + PI27 <= endAngle) {
|
|
31525
31566
|
out2[0] = ox;
|
|
31526
31567
|
out2[1] = oy;
|
|
31527
|
-
return d -
|
|
31568
|
+
return d - r2;
|
|
31528
31569
|
}
|
|
31529
|
-
const x1 =
|
|
31530
|
-
const y1 =
|
|
31531
|
-
const x2 =
|
|
31532
|
-
const y2 =
|
|
31570
|
+
const x1 = r2 * Math.cos(startAngle) + cx;
|
|
31571
|
+
const y1 = r2 * Math.sin(startAngle) + cy;
|
|
31572
|
+
const x2 = r2 * Math.cos(endAngle) + cx;
|
|
31573
|
+
const y2 = r2 * Math.sin(endAngle) + cy;
|
|
31533
31574
|
const d1 = (x1 - x) * (x1 - x) + (y1 - y) * (y1 - y);
|
|
31534
31575
|
const d2 = (x2 - x) * (x2 - x) + (y2 - y) * (y2 - y);
|
|
31535
31576
|
if (d1 < d2) {
|
|
@@ -32489,8 +32530,8 @@ var SVGPathRebuilder = class {
|
|
|
32489
32530
|
quadraticCurveTo(x, y, x2, y2) {
|
|
32490
32531
|
this._add("Q", x, y, x2, y2);
|
|
32491
32532
|
}
|
|
32492
|
-
arc(cx, cy,
|
|
32493
|
-
this.ellipse(cx, cy,
|
|
32533
|
+
arc(cx, cy, r2, startAngle, endAngle, anticlockwise) {
|
|
32534
|
+
this.ellipse(cx, cy, r2, r2, 0, startAngle, endAngle, anticlockwise);
|
|
32494
32535
|
}
|
|
32495
32536
|
ellipse(cx, cy, rx, ry, psi, startAngle, endAngle, anticlockwise) {
|
|
32496
32537
|
let dTheta = endAngle - startAngle;
|
|
@@ -34533,8 +34574,8 @@ var CanvasPainter = class {
|
|
|
34533
34574
|
} else {
|
|
34534
34575
|
const horizontalPixelRatio = this.horizontalPixelRatio;
|
|
34535
34576
|
const verticalPixelRatio = this.verticalPixelRatio;
|
|
34536
|
-
for (var
|
|
34537
|
-
const rect = repaintRects[
|
|
34577
|
+
for (var r2 = 0; r2 < repaintRects.length; ++r2) {
|
|
34578
|
+
const rect = repaintRects[r2];
|
|
34538
34579
|
ctx2.save();
|
|
34539
34580
|
ctx2.beginPath();
|
|
34540
34581
|
ctx2.rect(rect.x * horizontalPixelRatio, rect.y * verticalPixelRatio, rect.width * horizontalPixelRatio, rect.height * verticalPixelRatio);
|
|
@@ -35940,13 +35981,13 @@ function createGridClipPath(cartesian, hasAnimation, seriesModel, done, during)
|
|
|
35940
35981
|
function createPolarClipPath(polar, hasAnimation, seriesModel) {
|
|
35941
35982
|
const sectorArea = polar.getArea();
|
|
35942
35983
|
const r0 = round(sectorArea.r0, 1);
|
|
35943
|
-
const
|
|
35984
|
+
const r2 = round(sectorArea.r, 1);
|
|
35944
35985
|
const clipPath = new Sector_default({
|
|
35945
35986
|
shape: {
|
|
35946
35987
|
cx: round(polar.cx, 1),
|
|
35947
35988
|
cy: round(polar.cy, 1),
|
|
35948
35989
|
r0,
|
|
35949
|
-
r,
|
|
35990
|
+
r: r2,
|
|
35950
35991
|
startAngle: sectorArea.startAngle,
|
|
35951
35992
|
endAngle: sectorArea.endAngle,
|
|
35952
35993
|
clockwise: sectorArea.clockwise
|
|
@@ -35962,7 +36003,7 @@ function createPolarClipPath(polar, hasAnimation, seriesModel) {
|
|
|
35962
36003
|
initProps(clipPath, {
|
|
35963
36004
|
shape: {
|
|
35964
36005
|
endAngle: sectorArea.endAngle,
|
|
35965
|
-
r
|
|
36006
|
+
r: r2
|
|
35966
36007
|
}
|
|
35967
36008
|
}, seriesModel);
|
|
35968
36009
|
}
|
|
@@ -37258,8 +37299,8 @@ var SausagePath = class extends Path_default {
|
|
|
37258
37299
|
const cx = shape.cx;
|
|
37259
37300
|
const cy = shape.cy;
|
|
37260
37301
|
const r0 = Math.max(shape.r0 || 0, 0);
|
|
37261
|
-
const
|
|
37262
|
-
const dr = (
|
|
37302
|
+
const r2 = Math.max(shape.r, 0);
|
|
37303
|
+
const dr = (r2 - r0) * 0.5;
|
|
37263
37304
|
const rCenter = r0 + dr;
|
|
37264
37305
|
let startAngle = shape.startAngle;
|
|
37265
37306
|
const endAngle = shape.endAngle;
|
|
@@ -37277,9 +37318,9 @@ var SausagePath = class extends Path_default {
|
|
|
37277
37318
|
ctx2.moveTo(unitStartX * r0 + cx, unitStartY * r0 + cy);
|
|
37278
37319
|
ctx2.arc(unitStartX * rCenter + cx, unitStartY * rCenter + cy, dr, -Math.PI + startAngle, startAngle, !clockwise);
|
|
37279
37320
|
} else {
|
|
37280
|
-
ctx2.moveTo(unitStartX *
|
|
37321
|
+
ctx2.moveTo(unitStartX * r2 + cx, unitStartY * r2 + cy);
|
|
37281
37322
|
}
|
|
37282
|
-
ctx2.arc(cx, cy,
|
|
37323
|
+
ctx2.arc(cx, cy, r2, startAngle, endAngle, !clockwise);
|
|
37283
37324
|
ctx2.arc(unitEndX * rCenter + cx, unitEndY * rCenter + cy, dr, endAngle - Math.PI * 2, endAngle - Math.PI, !clockwise);
|
|
37284
37325
|
if (r0 !== 0) {
|
|
37285
37326
|
ctx2.arc(cx, cy, r0, endAngle, startAngle, clockwise);
|
|
@@ -37302,17 +37343,17 @@ function createSectorCalculateTextPosition(positionMapping, opts) {
|
|
|
37302
37343
|
const sector = this.shape;
|
|
37303
37344
|
const cx = sector.cx;
|
|
37304
37345
|
const cy = sector.cy;
|
|
37305
|
-
const
|
|
37346
|
+
const r2 = sector.r;
|
|
37306
37347
|
const r0 = sector.r0;
|
|
37307
|
-
const middleR = (
|
|
37348
|
+
const middleR = (r2 + r0) / 2;
|
|
37308
37349
|
const startAngle = sector.startAngle;
|
|
37309
37350
|
const endAngle = sector.endAngle;
|
|
37310
37351
|
const middleAngle = (startAngle + endAngle) / 2;
|
|
37311
|
-
const extraDist = isRoundCap ? Math.abs(
|
|
37352
|
+
const extraDist = isRoundCap ? Math.abs(r2 - r0) / 2 : 0;
|
|
37312
37353
|
const mathCos6 = Math.cos;
|
|
37313
37354
|
const mathSin6 = Math.sin;
|
|
37314
|
-
let x = cx +
|
|
37315
|
-
let y = cy +
|
|
37355
|
+
let x = cx + r2 * mathCos6(startAngle);
|
|
37356
|
+
let y = cy + r2 * mathSin6(startAngle);
|
|
37316
37357
|
let textAlign = "left";
|
|
37317
37358
|
let textVerticalAlign = "top";
|
|
37318
37359
|
switch (mappedSectorPosition) {
|
|
@@ -37347,14 +37388,14 @@ function createSectorCalculateTextPosition(positionMapping, opts) {
|
|
|
37347
37388
|
textVerticalAlign = "middle";
|
|
37348
37389
|
break;
|
|
37349
37390
|
case "endArc":
|
|
37350
|
-
x = cx + (
|
|
37351
|
-
y = cy + (
|
|
37391
|
+
x = cx + (r2 + distance2) * mathCos6(middleAngle);
|
|
37392
|
+
y = cy + (r2 + distance2) * mathSin6(middleAngle);
|
|
37352
37393
|
textAlign = "center";
|
|
37353
37394
|
textVerticalAlign = "bottom";
|
|
37354
37395
|
break;
|
|
37355
37396
|
case "insideEndArc":
|
|
37356
|
-
x = cx + (
|
|
37357
|
-
y = cy + (
|
|
37397
|
+
x = cx + (r2 - distance2) * mathCos6(middleAngle);
|
|
37398
|
+
y = cy + (r2 - distance2) * mathSin6(middleAngle);
|
|
37358
37399
|
textAlign = "center";
|
|
37359
37400
|
textVerticalAlign = "top";
|
|
37360
37401
|
break;
|
|
@@ -37837,11 +37878,11 @@ var clip = {
|
|
|
37837
37878
|
layout18.r = layout18.r0;
|
|
37838
37879
|
layout18.r0 = tmp;
|
|
37839
37880
|
}
|
|
37840
|
-
const
|
|
37881
|
+
const r2 = mathMin7(layout18.r, coordSysClipArea.r);
|
|
37841
37882
|
const r0 = mathMax7(layout18.r0, coordSysClipArea.r0);
|
|
37842
|
-
layout18.r =
|
|
37883
|
+
layout18.r = r2;
|
|
37843
37884
|
layout18.r0 = r0;
|
|
37844
|
-
const clipped =
|
|
37885
|
+
const clipped = r2 - r0 < 0;
|
|
37845
37886
|
if (signR < 0) {
|
|
37846
37887
|
const tmp = layout18.r;
|
|
37847
37888
|
layout18.r = layout18.r0;
|
|
@@ -38228,7 +38269,7 @@ function getBasicPieLayout(seriesModel, api2) {
|
|
|
38228
38269
|
const height = parsePercent2(viewRect2.height, api2.getHeight());
|
|
38229
38270
|
const size = Math.min(width, height);
|
|
38230
38271
|
const r0 = parsePercent2(radius[0], size / 2);
|
|
38231
|
-
const
|
|
38272
|
+
const r2 = parsePercent2(radius[1], size / 2);
|
|
38232
38273
|
let cx;
|
|
38233
38274
|
let cy;
|
|
38234
38275
|
const coordSys = seriesModel.coordinateSystem;
|
|
@@ -38247,7 +38288,7 @@ function getBasicPieLayout(seriesModel, api2) {
|
|
|
38247
38288
|
cx,
|
|
38248
38289
|
cy,
|
|
38249
38290
|
r0,
|
|
38250
|
-
r
|
|
38291
|
+
r: r2
|
|
38251
38292
|
};
|
|
38252
38293
|
}
|
|
38253
38294
|
function pieLayout(seriesType2, ecModel, api2) {
|
|
@@ -38255,7 +38296,7 @@ function pieLayout(seriesType2, ecModel, api2) {
|
|
|
38255
38296
|
const data = seriesModel.getData();
|
|
38256
38297
|
const valueDim = data.mapDimension("value");
|
|
38257
38298
|
const viewRect2 = getViewRect(seriesModel, api2);
|
|
38258
|
-
const {cx, cy, r, r0} = getBasicPieLayout(seriesModel, api2);
|
|
38299
|
+
const {cx, cy, r: r2, r0} = getBasicPieLayout(seriesModel, api2);
|
|
38259
38300
|
let startAngle = -seriesModel.get("startAngle") * RADIAN;
|
|
38260
38301
|
let endAngle = seriesModel.get("endAngle");
|
|
38261
38302
|
const padAngle = seriesModel.get("padAngle") * RADIAN;
|
|
@@ -38286,7 +38327,7 @@ function pieLayout(seriesType2, ecModel, api2) {
|
|
|
38286
38327
|
let restAngle = angleRange;
|
|
38287
38328
|
let valueSumLargerThanMinAngle = 0;
|
|
38288
38329
|
let currentAngle = startAngle;
|
|
38289
|
-
data.setLayout({viewRect: viewRect2, r});
|
|
38330
|
+
data.setLayout({viewRect: viewRect2, r: r2});
|
|
38290
38331
|
data.each(valueDim, function(value, idx) {
|
|
38291
38332
|
let angle;
|
|
38292
38333
|
if (isNaN(value)) {
|
|
@@ -38298,7 +38339,7 @@ function pieLayout(seriesType2, ecModel, api2) {
|
|
|
38298
38339
|
cx,
|
|
38299
38340
|
cy,
|
|
38300
38341
|
r0,
|
|
38301
|
-
r: roseType ? NaN :
|
|
38342
|
+
r: roseType ? NaN : r2
|
|
38302
38343
|
});
|
|
38303
38344
|
return;
|
|
38304
38345
|
}
|
|
@@ -38331,7 +38372,7 @@ function pieLayout(seriesType2, ecModel, api2) {
|
|
|
38331
38372
|
cx,
|
|
38332
38373
|
cy,
|
|
38333
38374
|
r0,
|
|
38334
|
-
r: roseType ? linearMap(value, extent3, [r0,
|
|
38375
|
+
r: roseType ? linearMap(value, extent3, [r0, r2]) : r2
|
|
38335
38376
|
});
|
|
38336
38377
|
currentAngle = endAngle2;
|
|
38337
38378
|
});
|
|
@@ -38409,7 +38450,7 @@ function dataFilter(seriesType2) {
|
|
|
38409
38450
|
|
|
38410
38451
|
// src/chart/pie/labelLayout.ts
|
|
38411
38452
|
var RADIAN2 = Math.PI / 180;
|
|
38412
|
-
function adjustSingleSide(list, cx, cy,
|
|
38453
|
+
function adjustSingleSide(list, cx, cy, r2, dir3, viewWidth, viewHeight, viewLeft, viewTop, farthestX) {
|
|
38413
38454
|
if (list.length < 2) {
|
|
38414
38455
|
return;
|
|
38415
38456
|
}
|
|
@@ -38420,7 +38461,7 @@ function adjustSingleSide(list, cx, cy, r, dir3, viewWidth, viewHeight, viewLeft
|
|
|
38420
38461
|
for (let i = 0; i < semi.list.length; i++) {
|
|
38421
38462
|
const item = semi.list[i];
|
|
38422
38463
|
const dy = Math.abs(item.label.y - cy);
|
|
38423
|
-
const rA =
|
|
38464
|
+
const rA = r2 + item.len;
|
|
38424
38465
|
const rA2 = rA * rA;
|
|
38425
38466
|
const dx = Math.sqrt((1 - Math.abs(dy * dy / rB2)) * rA2);
|
|
38426
38467
|
const newX = cx + (dx + item.len2) * dir3;
|
|
@@ -38442,7 +38483,7 @@ function adjustSingleSide(list, cx, cy, r, dir3, viewWidth, viewHeight, viewLeft
|
|
|
38442
38483
|
const dy = Math.abs(item.label.y - cy);
|
|
38443
38484
|
if (dy >= semi.maxY) {
|
|
38444
38485
|
const dx = item.label.x - cx - item.len2 * dir3;
|
|
38445
|
-
const rA =
|
|
38486
|
+
const rA = r2 + item.len;
|
|
38446
38487
|
const rB = Math.abs(dx) < rA ? Math.sqrt(dy * dy / (1 - dx * dx / rA / rA)) : rA;
|
|
38447
38488
|
semi.rB = rB;
|
|
38448
38489
|
semi.maxY = dy;
|
|
@@ -38464,7 +38505,7 @@ function adjustSingleSide(list, cx, cy, r, dir3, viewWidth, viewHeight, viewLeft
|
|
|
38464
38505
|
recalculateX(list);
|
|
38465
38506
|
}
|
|
38466
38507
|
}
|
|
38467
|
-
function avoidOverlap(labelLayoutList, cx, cy,
|
|
38508
|
+
function avoidOverlap(labelLayoutList, cx, cy, r2, viewWidth, viewHeight, viewLeft, viewTop) {
|
|
38468
38509
|
const leftList = [];
|
|
38469
38510
|
const rightList = [];
|
|
38470
38511
|
let leftmostX = Number.MAX_VALUE;
|
|
@@ -38514,8 +38555,8 @@ function avoidOverlap(labelLayoutList, cx, cy, r, viewWidth, viewHeight, viewLef
|
|
|
38514
38555
|
constrainTextWidth(layout18, targetTextWidth);
|
|
38515
38556
|
}
|
|
38516
38557
|
}
|
|
38517
|
-
adjustSingleSide(rightList, cx, cy,
|
|
38518
|
-
adjustSingleSide(leftList, cx, cy,
|
|
38558
|
+
adjustSingleSide(rightList, cx, cy, r2, 1, viewWidth, viewHeight, viewLeft, viewTop, rightmostX);
|
|
38559
|
+
adjustSingleSide(leftList, cx, cy, r2, -1, viewWidth, viewHeight, viewLeft, viewTop, leftmostX);
|
|
38519
38560
|
for (let i = 0; i < labelLayoutList.length; i++) {
|
|
38520
38561
|
const layout18 = labelLayoutList[i];
|
|
38521
38562
|
if (!isPositionCenter(layout18) && layout18.linePoints) {
|
|
@@ -38588,7 +38629,7 @@ function pieLabelLayout(seriesModel) {
|
|
|
38588
38629
|
let hasLabelRotate = false;
|
|
38589
38630
|
const minShowLabelRadian = (seriesModel.get("minShowLabelAngle") || 0) * RADIAN2;
|
|
38590
38631
|
const viewRect2 = data.getLayout("viewRect");
|
|
38591
|
-
const
|
|
38632
|
+
const r2 = data.getLayout("r");
|
|
38592
38633
|
const viewWidth = viewRect2.width;
|
|
38593
38634
|
const viewLeft = viewRect2.x;
|
|
38594
38635
|
const viewTop = viewRect2.y;
|
|
@@ -38656,8 +38697,8 @@ function pieLabelLayout(seriesModel) {
|
|
|
38656
38697
|
textX = x1 + nx * 3;
|
|
38657
38698
|
textY = y1 + ny * 3;
|
|
38658
38699
|
if (!isLabelInside) {
|
|
38659
|
-
const x2 = x1 + nx * (labelLineLen +
|
|
38660
|
-
const y2 = y1 + ny * (labelLineLen +
|
|
38700
|
+
const x2 = x1 + nx * (labelLineLen + r2 - sectorShape.r);
|
|
38701
|
+
const y2 = y1 + ny * (labelLineLen + r2 - sectorShape.r);
|
|
38661
38702
|
const x3 = x2 + (nx < 0 ? -1 : 1) * labelLineLen2;
|
|
38662
38703
|
const y3 = y2;
|
|
38663
38704
|
if (labelAlignTo === "edge") {
|
|
@@ -38738,7 +38779,7 @@ function pieLabelLayout(seriesModel) {
|
|
|
38738
38779
|
});
|
|
38739
38780
|
});
|
|
38740
38781
|
if (!hasLabelRotate && seriesModel.get("avoidLabelOverlap")) {
|
|
38741
|
-
avoidOverlap(labelLayoutList, cx, cy,
|
|
38782
|
+
avoidOverlap(labelLayoutList, cx, cy, r2, viewWidth, viewHeight, viewLeft, viewTop);
|
|
38742
38783
|
}
|
|
38743
38784
|
for (let i = 0; i < labelLayoutList.length; i++) {
|
|
38744
38785
|
const layout18 = labelLayoutList[i];
|
|
@@ -40547,12 +40588,12 @@ var builders = {
|
|
|
40547
40588
|
}], function(point, index) {
|
|
40548
40589
|
if (arrows[index] !== "none" && arrows[index] != null) {
|
|
40549
40590
|
const symbol = createSymbol(arrows[index], -symbolWidth / 2, -symbolHeight / 2, symbolWidth, symbolHeight, lineStyle.stroke, true);
|
|
40550
|
-
const
|
|
40591
|
+
const r2 = point.r + point.offset;
|
|
40551
40592
|
const pt = inverse ? pt22 : pt12;
|
|
40552
40593
|
symbol.attr({
|
|
40553
40594
|
rotation: point.rotate,
|
|
40554
|
-
x: pt[0] +
|
|
40555
|
-
y: pt[1] -
|
|
40595
|
+
x: pt[0] + r2 * Math.cos(opt.rotation),
|
|
40596
|
+
y: pt[1] - r2 * Math.sin(opt.rotation),
|
|
40556
40597
|
silent: true,
|
|
40557
40598
|
z2: 11
|
|
40558
40599
|
});
|
|
@@ -42876,8 +42917,8 @@ var paintServerParsers = {
|
|
|
42876
42917
|
radialgradient: function(xmlNode) {
|
|
42877
42918
|
const cx = parseInt(xmlNode.getAttribute("cx") || "0", 10);
|
|
42878
42919
|
const cy = parseInt(xmlNode.getAttribute("cy") || "0", 10);
|
|
42879
|
-
const
|
|
42880
|
-
const gradient = new RadialGradient_default(cx, cy,
|
|
42920
|
+
const r2 = parseInt(xmlNode.getAttribute("r") || "0", 10);
|
|
42921
|
+
const gradient = new RadialGradient_default(cx, cy, r2);
|
|
42881
42922
|
parsePaintServerUnit(xmlNode, gradient);
|
|
42882
42923
|
parseGradientColorStops(xmlNode, gradient);
|
|
42883
42924
|
return gradient;
|
|
@@ -45174,11 +45215,11 @@ function secondWalk(node) {
|
|
|
45174
45215
|
function separation(cb) {
|
|
45175
45216
|
return arguments.length ? cb : defaultSeparation;
|
|
45176
45217
|
}
|
|
45177
|
-
function radialCoordinate(rad,
|
|
45218
|
+
function radialCoordinate(rad, r2) {
|
|
45178
45219
|
rad -= Math.PI / 2;
|
|
45179
45220
|
return {
|
|
45180
|
-
x:
|
|
45181
|
-
y:
|
|
45221
|
+
x: r2 * Math.cos(rad),
|
|
45222
|
+
y: r2 * Math.sin(rad)
|
|
45182
45223
|
};
|
|
45183
45224
|
}
|
|
45184
45225
|
function getViewRect2(seriesModel, api2) {
|
|
@@ -48649,7 +48690,7 @@ function circularLayout(seriesModel, basedOn, draggingNode, pointer) {
|
|
|
48649
48690
|
const graph = nodeData.graph;
|
|
48650
48691
|
const cx = rect.width / 2 + rect.x;
|
|
48651
48692
|
const cy = rect.height / 2 + rect.y;
|
|
48652
|
-
const
|
|
48693
|
+
const r2 = Math.min(rect.width, rect.height) / 2;
|
|
48653
48694
|
const count2 = nodeData.count();
|
|
48654
48695
|
nodeData.setLayout({
|
|
48655
48696
|
cx,
|
|
@@ -48662,12 +48703,12 @@ function circularLayout(seriesModel, basedOn, draggingNode, pointer) {
|
|
|
48662
48703
|
const [tempX, tempY] = coordSys.pointToData(pointer);
|
|
48663
48704
|
const v = [tempX - cx, tempY - cy];
|
|
48664
48705
|
normalize(v, v);
|
|
48665
|
-
scale(v, v,
|
|
48706
|
+
scale(v, v, r2);
|
|
48666
48707
|
draggingNode.setLayout([cx + v[0], cy + v[1]], true);
|
|
48667
48708
|
const circularRotateLabel = seriesModel.get(["circular", "rotateLabel"]);
|
|
48668
48709
|
rotateNodeLabel(draggingNode, circularRotateLabel, cx, cy);
|
|
48669
48710
|
}
|
|
48670
|
-
_layoutNodesBasedOn[basedOn](seriesModel, graph, nodeData,
|
|
48711
|
+
_layoutNodesBasedOn[basedOn](seriesModel, graph, nodeData, r2, cx, cy, count2);
|
|
48671
48712
|
graph.eachEdge(function(edge, index) {
|
|
48672
48713
|
let curveness = retrieve3(edge.getModel().get(["lineStyle", "curveness"]), getCurvenessForEdge(edge, seriesModel, index), 0);
|
|
48673
48714
|
const p1 = clone2(edge.node1.getLayout());
|
|
@@ -48686,7 +48727,7 @@ function circularLayout(seriesModel, basedOn, draggingNode, pointer) {
|
|
|
48686
48727
|
});
|
|
48687
48728
|
}
|
|
48688
48729
|
var _layoutNodesBasedOn = {
|
|
48689
|
-
value(seriesModel, graph, nodeData,
|
|
48730
|
+
value(seriesModel, graph, nodeData, r2, cx, cy, count2) {
|
|
48690
48731
|
let angle = 0;
|
|
48691
48732
|
const sum2 = nodeData.getSum("value");
|
|
48692
48733
|
const unitAngle = Math.PI * 2 / (sum2 || count2);
|
|
@@ -48695,13 +48736,13 @@ var _layoutNodesBasedOn = {
|
|
|
48695
48736
|
const radianHalf = unitAngle * (sum2 ? value : 1) / 2;
|
|
48696
48737
|
angle += radianHalf;
|
|
48697
48738
|
node.setLayout([
|
|
48698
|
-
|
|
48699
|
-
|
|
48739
|
+
r2 * Math.cos(angle) + cx,
|
|
48740
|
+
r2 * Math.sin(angle) + cy
|
|
48700
48741
|
]);
|
|
48701
48742
|
angle += radianHalf;
|
|
48702
48743
|
});
|
|
48703
48744
|
},
|
|
48704
|
-
symbolSize(seriesModel, graph, nodeData,
|
|
48745
|
+
symbolSize(seriesModel, graph, nodeData, r2, cx, cy, count2) {
|
|
48705
48746
|
let sumRadian = 0;
|
|
48706
48747
|
_symbolRadiansHalf.length = count2;
|
|
48707
48748
|
const nodeScale = getNodeGlobalScale(seriesModel);
|
|
@@ -48710,7 +48751,7 @@ var _layoutNodesBasedOn = {
|
|
|
48710
48751
|
isNaN(symbolSize) && (symbolSize = 2);
|
|
48711
48752
|
symbolSize < 0 && (symbolSize = 0);
|
|
48712
48753
|
symbolSize *= nodeScale;
|
|
48713
|
-
let symbolRadianHalf = Math.asin(symbolSize / 2 /
|
|
48754
|
+
let symbolRadianHalf = Math.asin(symbolSize / 2 / r2);
|
|
48714
48755
|
isNaN(symbolRadianHalf) && (symbolRadianHalf = PI8 / 2);
|
|
48715
48756
|
_symbolRadiansHalf[node.dataIndex] = symbolRadianHalf;
|
|
48716
48757
|
sumRadian += symbolRadianHalf * 2;
|
|
@@ -48721,8 +48762,8 @@ var _layoutNodesBasedOn = {
|
|
|
48721
48762
|
const radianHalf = halfRemainRadian + _symbolRadiansHalf[node.dataIndex];
|
|
48722
48763
|
angle += radianHalf;
|
|
48723
48764
|
(!node.getLayout() || !node.getLayout().fixed) && node.setLayout([
|
|
48724
|
-
|
|
48725
|
-
|
|
48765
|
+
r2 * Math.cos(angle) + cx,
|
|
48766
|
+
r2 * Math.sin(angle) + cy
|
|
48726
48767
|
]);
|
|
48727
48768
|
angle += radianHalf;
|
|
48728
48769
|
});
|
|
@@ -50491,15 +50532,15 @@ var PointerPath = class extends Path_default {
|
|
|
50491
50532
|
buildPath(ctx2, shape) {
|
|
50492
50533
|
const mathCos6 = Math.cos;
|
|
50493
50534
|
const mathSin6 = Math.sin;
|
|
50494
|
-
const
|
|
50535
|
+
const r2 = shape.r;
|
|
50495
50536
|
const width = shape.width;
|
|
50496
50537
|
let angle = shape.angle;
|
|
50497
|
-
const x = shape.x - mathCos6(angle) * width * (width >=
|
|
50498
|
-
const y = shape.y - mathSin6(angle) * width * (width >=
|
|
50538
|
+
const x = shape.x - mathCos6(angle) * width * (width >= r2 / 3 ? 1 : 2);
|
|
50539
|
+
const y = shape.y - mathSin6(angle) * width * (width >= r2 / 3 ? 1 : 2);
|
|
50499
50540
|
angle = shape.angle - Math.PI / 2;
|
|
50500
50541
|
ctx2.moveTo(x, y);
|
|
50501
50542
|
ctx2.lineTo(shape.x + mathCos6(angle) * width, shape.y + mathSin6(angle) * width);
|
|
50502
|
-
ctx2.lineTo(shape.x + mathCos6(shape.angle) *
|
|
50543
|
+
ctx2.lineTo(shape.x + mathCos6(shape.angle) * r2, shape.y + mathSin6(shape.angle) * r2);
|
|
50503
50544
|
ctx2.lineTo(shape.x - mathCos6(angle) * width, shape.y - mathSin6(angle) * width);
|
|
50504
50545
|
ctx2.lineTo(x, y);
|
|
50505
50546
|
}
|
|
@@ -50514,11 +50555,11 @@ function parsePosition(seriesModel, api2) {
|
|
|
50514
50555
|
const size = Math.min(width, height);
|
|
50515
50556
|
const cx = parsePercent2(center3[0], api2.getWidth());
|
|
50516
50557
|
const cy = parsePercent2(center3[1], api2.getHeight());
|
|
50517
|
-
const
|
|
50558
|
+
const r2 = parsePercent2(seriesModel.get("radius"), size / 2);
|
|
50518
50559
|
return {
|
|
50519
50560
|
cx,
|
|
50520
50561
|
cy,
|
|
50521
|
-
r
|
|
50562
|
+
r: r2
|
|
50522
50563
|
};
|
|
50523
50564
|
}
|
|
50524
50565
|
function formatLabel(value, labelFormatter) {
|
|
@@ -50609,7 +50650,7 @@ var GaugeView2 = class extends Chart_default {
|
|
|
50609
50650
|
const group = this.group;
|
|
50610
50651
|
const cx = posInfo.cx;
|
|
50611
50652
|
const cy = posInfo.cy;
|
|
50612
|
-
const
|
|
50653
|
+
const r2 = posInfo.r;
|
|
50613
50654
|
const minVal = +seriesModel.get("min");
|
|
50614
50655
|
const maxVal = +seriesModel.get("max");
|
|
50615
50656
|
const splitLineModel = seriesModel.getModel("splitLine");
|
|
@@ -50617,8 +50658,8 @@ var GaugeView2 = class extends Chart_default {
|
|
|
50617
50658
|
const labelModel = seriesModel.getModel("axisLabel");
|
|
50618
50659
|
const splitNumber = seriesModel.get("splitNumber");
|
|
50619
50660
|
const subSplitNumber = tickModel.get("splitNumber");
|
|
50620
|
-
const splitLineLen = parsePercent2(splitLineModel.get("length"),
|
|
50621
|
-
const tickLen = parsePercent2(tickModel.get("length"),
|
|
50661
|
+
const splitLineLen = parsePercent2(splitLineModel.get("length"), r2);
|
|
50662
|
+
const tickLen = parsePercent2(tickModel.get("length"), r2);
|
|
50622
50663
|
let angle = startAngle;
|
|
50623
50664
|
const step = (endAngle - startAngle) / splitNumber;
|
|
50624
50665
|
const subStep = step / subSplitNumber;
|
|
@@ -50634,10 +50675,10 @@ var GaugeView2 = class extends Chart_default {
|
|
|
50634
50675
|
const distance2 = splitLineDistance ? splitLineDistance + axisLineWidth : axisLineWidth;
|
|
50635
50676
|
const splitLine = new Line_default({
|
|
50636
50677
|
shape: {
|
|
50637
|
-
x1: unitX * (
|
|
50638
|
-
y1: unitY * (
|
|
50639
|
-
x2: unitX * (
|
|
50640
|
-
y2: unitY * (
|
|
50678
|
+
x1: unitX * (r2 - distance2) + cx,
|
|
50679
|
+
y1: unitY * (r2 - distance2) + cy,
|
|
50680
|
+
x2: unitX * (r2 - splitLineLen - distance2) + cx,
|
|
50681
|
+
y2: unitY * (r2 - splitLineLen - distance2) + cy
|
|
50641
50682
|
},
|
|
50642
50683
|
style: splitLineStyle,
|
|
50643
50684
|
silent: true
|
|
@@ -50653,8 +50694,8 @@ var GaugeView2 = class extends Chart_default {
|
|
|
50653
50694
|
const distance2 = labelModel.get("distance") + splitLineDistance;
|
|
50654
50695
|
const label = formatLabel(round(i / splitNumber * (maxVal - minVal) + minVal), labelModel.get("formatter"));
|
|
50655
50696
|
const autoColor = getColor3(i / splitNumber);
|
|
50656
|
-
const textStyleX = unitX * (
|
|
50657
|
-
const textStyleY = unitY * (
|
|
50697
|
+
const textStyleX = unitX * (r2 - splitLineLen - distance2) + cx;
|
|
50698
|
+
const textStyleY = unitY * (r2 - splitLineLen - distance2) + cy;
|
|
50658
50699
|
const rotateType = labelModel.get("rotate");
|
|
50659
50700
|
let rotate2 = 0;
|
|
50660
50701
|
if (rotateType === "radial") {
|
|
@@ -50706,10 +50747,10 @@ var GaugeView2 = class extends Chart_default {
|
|
|
50706
50747
|
unitY = Math.sin(angle);
|
|
50707
50748
|
const tickLine = new Line_default({
|
|
50708
50749
|
shape: {
|
|
50709
|
-
x1: unitX * (
|
|
50710
|
-
y1: unitY * (
|
|
50711
|
-
x2: unitX * (
|
|
50712
|
-
y2: unitY * (
|
|
50750
|
+
x1: unitX * (r2 - distance2) + cx,
|
|
50751
|
+
y1: unitY * (r2 - distance2) + cy,
|
|
50752
|
+
x2: unitX * (r2 - tickLen - distance2) + cx,
|
|
50753
|
+
y2: unitY * (r2 - tickLen - distance2) + cy
|
|
50713
50754
|
},
|
|
50714
50755
|
silent: true,
|
|
50715
50756
|
style: tickLineStyle
|
|
@@ -50777,7 +50818,7 @@ var GaugeView2 = class extends Chart_default {
|
|
|
50777
50818
|
const isOverlap = progressModel.get("overlap");
|
|
50778
50819
|
const progressWidth = isOverlap ? progressModel.get("width") : axisLineWidth / data.count();
|
|
50779
50820
|
const r0 = isOverlap ? posInfo.r - progressWidth : posInfo.r - (idx + 1) * progressWidth;
|
|
50780
|
-
const
|
|
50821
|
+
const r2 = isOverlap ? posInfo.r : posInfo.r - idx * progressWidth;
|
|
50781
50822
|
const progress = new ProgressPath({
|
|
50782
50823
|
shape: {
|
|
50783
50824
|
startAngle,
|
|
@@ -50786,7 +50827,7 @@ var GaugeView2 = class extends Chart_default {
|
|
|
50786
50827
|
cy: posInfo.cy,
|
|
50787
50828
|
clockwise,
|
|
50788
50829
|
r0,
|
|
50789
|
-
r
|
|
50830
|
+
r: r2
|
|
50790
50831
|
}
|
|
50791
50832
|
});
|
|
50792
50833
|
isOverlap && (progress.z2 = maxVal - data.get(valueDim, idx) % maxVal);
|
|
@@ -62264,7 +62305,7 @@ var HeatmapLayer = class {
|
|
|
62264
62305
|
const brush3 = this._getBrush();
|
|
62265
62306
|
const gradientInRange = this._getGradient(colorFunc, "inRange");
|
|
62266
62307
|
const gradientOutOfRange = this._getGradient(colorFunc, "outOfRange");
|
|
62267
|
-
const
|
|
62308
|
+
const r2 = this.pointSize + this.blurSize;
|
|
62268
62309
|
const canvas2 = this.canvas;
|
|
62269
62310
|
const ctx2 = canvas2.getContext("2d");
|
|
62270
62311
|
const len2 = data.length;
|
|
@@ -62277,7 +62318,7 @@ var HeatmapLayer = class {
|
|
|
62277
62318
|
const value = p[2];
|
|
62278
62319
|
const alpha = normalize5(value);
|
|
62279
62320
|
ctx2.globalAlpha = alpha;
|
|
62280
|
-
ctx2.drawImage(brush3, x -
|
|
62321
|
+
ctx2.drawImage(brush3, x - r2, y - r2);
|
|
62281
62322
|
}
|
|
62282
62323
|
if (!canvas2.width || !canvas2.height) {
|
|
62283
62324
|
return canvas2;
|
|
@@ -62308,8 +62349,8 @@ var HeatmapLayer = class {
|
|
|
62308
62349
|
}
|
|
62309
62350
|
_getBrush() {
|
|
62310
62351
|
const brushCanvas = this._brushCanvas || (this._brushCanvas = platformApi.createCanvas());
|
|
62311
|
-
const
|
|
62312
|
-
const d =
|
|
62352
|
+
const r2 = this.pointSize + this.blurSize;
|
|
62353
|
+
const d = r2 * 2;
|
|
62313
62354
|
brushCanvas.width = d;
|
|
62314
62355
|
brushCanvas.height = d;
|
|
62315
62356
|
const ctx2 = brushCanvas.getContext("2d");
|
|
@@ -62318,7 +62359,7 @@ var HeatmapLayer = class {
|
|
|
62318
62359
|
ctx2.shadowBlur = this.blurSize;
|
|
62319
62360
|
ctx2.shadowColor = "#000";
|
|
62320
62361
|
ctx2.beginPath();
|
|
62321
|
-
ctx2.arc(-
|
|
62362
|
+
ctx2.arc(-r2, r2, this.pointSize, 0, Math.PI * 2, true);
|
|
62322
62363
|
ctx2.closePath();
|
|
62323
62364
|
ctx2.fill();
|
|
62324
62365
|
return brushCanvas;
|
|
@@ -63716,7 +63757,7 @@ var SunburstPiece = class extends Sector_default {
|
|
|
63716
63757
|
outsideFill: labelStateModel.get("color") === "inherit" ? labelColor : null,
|
|
63717
63758
|
inside: labelPosition !== "outside"
|
|
63718
63759
|
};
|
|
63719
|
-
let
|
|
63760
|
+
let r2;
|
|
63720
63761
|
const labelPadding = getLabelAttr(labelStateModel, "distance") || 0;
|
|
63721
63762
|
let textAlign = getLabelAttr(labelStateModel, "align");
|
|
63722
63763
|
const rotateType = getLabelAttr(labelStateModel, "rotate");
|
|
@@ -63725,28 +63766,28 @@ var SunburstPiece = class extends Sector_default {
|
|
|
63725
63766
|
const midAngleNormal = normalizeRadian(rotateType === "tangential" ? Math.PI / 2 - midAngle : midAngle);
|
|
63726
63767
|
const needsFlip = midAngleNormal > flipStartAngle && !isRadianAroundZero(midAngleNormal - flipStartAngle) && midAngleNormal < flipEndAngle;
|
|
63727
63768
|
if (labelPosition === "outside") {
|
|
63728
|
-
|
|
63769
|
+
r2 = layout18.r + labelPadding;
|
|
63729
63770
|
textAlign = needsFlip ? "right" : "left";
|
|
63730
63771
|
} else {
|
|
63731
63772
|
if (!textAlign || textAlign === "center") {
|
|
63732
63773
|
if (angle === 2 * Math.PI && layout18.r0 === 0) {
|
|
63733
|
-
|
|
63774
|
+
r2 = 0;
|
|
63734
63775
|
} else {
|
|
63735
|
-
|
|
63776
|
+
r2 = (layout18.r + layout18.r0) / 2;
|
|
63736
63777
|
}
|
|
63737
63778
|
textAlign = "center";
|
|
63738
63779
|
} else if (textAlign === "left") {
|
|
63739
|
-
|
|
63780
|
+
r2 = layout18.r0 + labelPadding;
|
|
63740
63781
|
textAlign = needsFlip ? "right" : "left";
|
|
63741
63782
|
} else if (textAlign === "right") {
|
|
63742
|
-
|
|
63783
|
+
r2 = layout18.r - labelPadding;
|
|
63743
63784
|
textAlign = needsFlip ? "left" : "right";
|
|
63744
63785
|
}
|
|
63745
63786
|
}
|
|
63746
63787
|
state.style.align = textAlign;
|
|
63747
63788
|
state.style.verticalAlign = getLabelAttr(labelStateModel, "verticalAlign") || "middle";
|
|
63748
|
-
state.x =
|
|
63749
|
-
state.y =
|
|
63789
|
+
state.x = r2 * dx + layout18.cx;
|
|
63790
|
+
state.y = r2 * dy + layout18.cy;
|
|
63750
63791
|
let rotate2 = 0;
|
|
63751
63792
|
if (rotateType === "radial") {
|
|
63752
63793
|
rotate2 = normalizeRadian(-midAngle) + (needsFlip ? Math.PI : 0);
|
|
@@ -64085,7 +64126,7 @@ function sunburstLayout(seriesType2, ecModel, api2) {
|
|
|
64085
64126
|
const cx = parsePercent2(center3[0], width);
|
|
64086
64127
|
const cy = parsePercent2(center3[1], height);
|
|
64087
64128
|
const r0 = parsePercent2(radius[0], size / 2);
|
|
64088
|
-
const
|
|
64129
|
+
const r2 = parsePercent2(radius[1], size / 2);
|
|
64089
64130
|
const startAngle = -seriesModel.get("startAngle") * RADIAN3;
|
|
64090
64131
|
const minAngle = seriesModel.get("minAngle") * RADIAN3;
|
|
64091
64132
|
const virtualRoot = seriesModel.getData().tree.root;
|
|
@@ -64103,7 +64144,7 @@ function sunburstLayout(seriesType2, ecModel, api2) {
|
|
|
64103
64144
|
const unitRadian = Math.PI / (sum2 || validDataCount) * 2;
|
|
64104
64145
|
const renderRollupNode = treeRoot.depth > 0;
|
|
64105
64146
|
const levels = treeRoot.height - (renderRollupNode ? -1 : 1);
|
|
64106
|
-
const rPerLevel = (
|
|
64147
|
+
const rPerLevel = (r2 - r0) / (levels || 1);
|
|
64107
64148
|
const clockwise = seriesModel.get("clockwise");
|
|
64108
64149
|
const stillShowZeroSum = seriesModel.get("stillShowZeroSum");
|
|
64109
64150
|
const dir3 = clockwise ? 1 : -1;
|
|
@@ -64125,14 +64166,14 @@ function sunburstLayout(seriesType2, ecModel, api2) {
|
|
|
64125
64166
|
const levelModel = seriesModel.getLevelModel(node);
|
|
64126
64167
|
if (levelModel) {
|
|
64127
64168
|
let r02 = levelModel.get("r0", true);
|
|
64128
|
-
let
|
|
64169
|
+
let r3 = levelModel.get("r", true);
|
|
64129
64170
|
const radius2 = levelModel.get("radius", true);
|
|
64130
64171
|
if (radius2 != null) {
|
|
64131
64172
|
r02 = radius2[0];
|
|
64132
|
-
|
|
64173
|
+
r3 = radius2[1];
|
|
64133
64174
|
}
|
|
64134
64175
|
r02 != null && (rStart = parsePercent2(r02, size / 2));
|
|
64135
|
-
|
|
64176
|
+
r3 != null && (rEnd = parsePercent2(r3, size / 2));
|
|
64136
64177
|
}
|
|
64137
64178
|
node.setLayout({
|
|
64138
64179
|
angle,
|
|
@@ -66353,12 +66394,12 @@ function makeRectShape(xy, wh, xDimIndex) {
|
|
|
66353
66394
|
height: wh[1 - xDimIndex]
|
|
66354
66395
|
};
|
|
66355
66396
|
}
|
|
66356
|
-
function makeSectorShape(cx, cy, r0,
|
|
66397
|
+
function makeSectorShape(cx, cy, r0, r2, startAngle, endAngle) {
|
|
66357
66398
|
return {
|
|
66358
66399
|
cx,
|
|
66359
66400
|
cy,
|
|
66360
66401
|
r0,
|
|
66361
|
-
r,
|
|
66402
|
+
r: r2,
|
|
66362
66403
|
startAngle,
|
|
66363
66404
|
endAngle,
|
|
66364
66405
|
clockwise: true
|
|
@@ -66622,7 +66663,7 @@ var AxisPointerView2 = class extends Component_default2 {
|
|
|
66622
66663
|
this.xLock = false;
|
|
66623
66664
|
}
|
|
66624
66665
|
const updatePointDisable = globalTooltipModel && globalTooltipModel.option.updatePointDisable;
|
|
66625
|
-
if (updatePointDisable || playbackSelectModel?.option.show || globalAxisPointerModel.option.updatePointDisable) {
|
|
66666
|
+
if (e2?.preventAxisPointer || updatePointDisable || playbackSelectModel?.option.show || globalAxisPointerModel.option.updatePointDisable) {
|
|
66626
66667
|
return;
|
|
66627
66668
|
}
|
|
66628
66669
|
if (triggerOn !== "none" && (currTrigger === "leave" || triggerOn.indexOf(currTrigger) >= 0)) {
|
|
@@ -67105,12 +67146,12 @@ function getLabelPosition(value, axisModel, axisPointerModel, polar, labelMargin
|
|
|
67105
67146
|
align = labelLayout2.textAlign;
|
|
67106
67147
|
verticalAlign = labelLayout2.textVerticalAlign;
|
|
67107
67148
|
} else {
|
|
67108
|
-
const
|
|
67109
|
-
position2 = polar.coordToPoint([
|
|
67149
|
+
const r2 = radiusExtent[1];
|
|
67150
|
+
position2 = polar.coordToPoint([r2 + labelMargin, coord]);
|
|
67110
67151
|
const cx = polar.cx;
|
|
67111
67152
|
const cy = polar.cy;
|
|
67112
|
-
align = Math.abs(position2[0] - cx) /
|
|
67113
|
-
verticalAlign = Math.abs(position2[1] - cy) /
|
|
67153
|
+
align = Math.abs(position2[0] - cx) / r2 < 0.3 ? "center" : position2[0] > cx ? "left" : "right";
|
|
67154
|
+
verticalAlign = Math.abs(position2[1] - cy) / r2 < 0.3 ? "middle" : position2[1] > cy ? "top" : "bottom";
|
|
67114
67155
|
}
|
|
67115
67156
|
return {
|
|
67116
67157
|
position: position2,
|
|
@@ -67366,9 +67407,9 @@ var Polar = class {
|
|
|
67366
67407
|
const dx = x - this.cx;
|
|
67367
67408
|
const dy = y - this.cy;
|
|
67368
67409
|
const d2 = dx * dx + dy * dy - 1e-4;
|
|
67369
|
-
const
|
|
67410
|
+
const r2 = this.r;
|
|
67370
67411
|
const r0 = this.r0;
|
|
67371
|
-
return d2 <=
|
|
67412
|
+
return d2 <= r2 * r2 && d2 >= r0 * r0;
|
|
67372
67413
|
}
|
|
67373
67414
|
};
|
|
67374
67415
|
}
|
|
@@ -67637,12 +67678,12 @@ var angelAxisElementsBuilders = {
|
|
|
67637
67678
|
each(labels, function(labelItem, idx) {
|
|
67638
67679
|
let labelModel = commonLabelModel;
|
|
67639
67680
|
const tickValue = labelItem.tickValue;
|
|
67640
|
-
const
|
|
67641
|
-
const p = polar.coordToPoint([
|
|
67681
|
+
const r2 = radiusExtent[getRadiusIdx(polar)];
|
|
67682
|
+
const p = polar.coordToPoint([r2 + labelMargin, labelItem.coord]);
|
|
67642
67683
|
const cx = polar.cx;
|
|
67643
67684
|
const cy = polar.cy;
|
|
67644
|
-
const labelTextAlign = Math.abs(p[0] - cx) /
|
|
67645
|
-
const labelTextVerticalAlign = Math.abs(p[1] - cy) /
|
|
67685
|
+
const labelTextAlign = Math.abs(p[0] - cx) / r2 < 0.3 ? "center" : p[0] > cx ? "left" : "right";
|
|
67686
|
+
const labelTextVerticalAlign = Math.abs(p[1] - cy) / r2 < 0.3 ? "middle" : p[1] > cy ? "top" : "bottom";
|
|
67646
67687
|
if (rawCategoryData && rawCategoryData[tickValue]) {
|
|
67647
67688
|
const rawCategoryItem = rawCategoryData[tickValue];
|
|
67648
67689
|
if (isObject(rawCategoryItem) && rawCategoryItem.textStyle) {
|
|
@@ -67965,7 +68006,7 @@ function barLayoutPolar(seriesType2, ecModel, api2) {
|
|
|
67965
68006
|
baseCoord = lastStackCoords[stackId][baseValue][sign];
|
|
67966
68007
|
}
|
|
67967
68008
|
let r0;
|
|
67968
|
-
let
|
|
68009
|
+
let r2;
|
|
67969
68010
|
let startAngle;
|
|
67970
68011
|
let endAngle;
|
|
67971
68012
|
if (valueAxis2.dim === "radius") {
|
|
@@ -67975,10 +68016,10 @@ function barLayoutPolar(seriesType2, ecModel, api2) {
|
|
|
67975
68016
|
radiusSpan = (radiusSpan < 0 ? -1 : 1) * barMinHeight;
|
|
67976
68017
|
}
|
|
67977
68018
|
r0 = baseCoord;
|
|
67978
|
-
|
|
68019
|
+
r2 = baseCoord + radiusSpan;
|
|
67979
68020
|
startAngle = angle - columnOffset;
|
|
67980
68021
|
endAngle = startAngle - columnWidth;
|
|
67981
|
-
stacked && (lastStackCoords[stackId][baseValue][sign] =
|
|
68022
|
+
stacked && (lastStackCoords[stackId][baseValue][sign] = r2);
|
|
67982
68023
|
} else {
|
|
67983
68024
|
let angleSpan = valueAxis2.dataToCoord(value, clampLayout) - valueAxisStart;
|
|
67984
68025
|
const radius = baseAxis.dataToCoord(baseValue);
|
|
@@ -67986,7 +68027,7 @@ function barLayoutPolar(seriesType2, ecModel, api2) {
|
|
|
67986
68027
|
angleSpan = (angleSpan < 0 ? -1 : 1) * barMinAngle;
|
|
67987
68028
|
}
|
|
67988
68029
|
r0 = radius + columnOffset;
|
|
67989
|
-
|
|
68030
|
+
r2 = r0 + columnWidth;
|
|
67990
68031
|
startAngle = baseCoord;
|
|
67991
68032
|
endAngle = baseCoord + angleSpan;
|
|
67992
68033
|
stacked && (lastStackCoords[stackId][baseValue][sign] = endAngle);
|
|
@@ -67995,7 +68036,7 @@ function barLayoutPolar(seriesType2, ecModel, api2) {
|
|
|
67995
68036
|
cx,
|
|
67996
68037
|
cy,
|
|
67997
68038
|
r0,
|
|
67998
|
-
r,
|
|
68039
|
+
r: r2,
|
|
67999
68040
|
startAngle: -startAngle * Math.PI / 180,
|
|
68000
68041
|
endAngle: -endAngle * Math.PI / 180,
|
|
68001
68042
|
clockwise: startAngle >= endAngle
|
|
@@ -68144,8 +68185,8 @@ function layout11(axisModel, opt) {
|
|
|
68144
68185
|
orient === "vertical" ? positionMap.vertical[axisPosition] : rectBound[0],
|
|
68145
68186
|
orient === "horizontal" ? positionMap.horizontal[axisPosition] : rectBound[3]
|
|
68146
68187
|
];
|
|
68147
|
-
const
|
|
68148
|
-
layout18.rotation = Math.PI / 2 *
|
|
68188
|
+
const r2 = {horizontal: 0, vertical: 1};
|
|
68189
|
+
layout18.rotation = Math.PI / 2 * r2[orient];
|
|
68149
68190
|
const directionMap = {top: -1, bottom: 1, right: 1, left: -1};
|
|
68150
68191
|
layout18.labelDirection = layout18.tickDirection = layout18.nameDirection = directionMap[axisPosition];
|
|
68151
68192
|
if (axisModel.get(["axisTick", "inside"])) {
|
|
@@ -69318,8 +69359,8 @@ var GraphicComponentView2 = class extends Component_default2 {
|
|
|
69318
69359
|
if (elOption.style) {
|
|
69319
69360
|
el.attr("style", elOption.style);
|
|
69320
69361
|
}
|
|
69321
|
-
if (elOption.x || elOption.y) {
|
|
69322
|
-
el.attr({x: elOption.x, y: elOption.y});
|
|
69362
|
+
if (elOption.x || elOption.y || elOption.rotation) {
|
|
69363
|
+
el.attr({x: elOption.x, y: elOption.y, rotation: elOption.rotation});
|
|
69323
69364
|
}
|
|
69324
69365
|
if (elOption.shape) {
|
|
69325
69366
|
el.attr("shape", elOption.shape);
|
|
@@ -74198,6 +74239,217 @@ function install54(registers) {
|
|
|
74198
74239
|
registers.registerComponentView(TitleView);
|
|
74199
74240
|
}
|
|
74200
74241
|
|
|
74242
|
+
// src/component/events/EventsModel.ts
|
|
74243
|
+
var EventsModel2 = class extends Component_default {
|
|
74244
|
+
constructor() {
|
|
74245
|
+
super(...arguments);
|
|
74246
|
+
this.type = EventsModel2.type;
|
|
74247
|
+
this.preventAutoZ = true;
|
|
74248
|
+
this.layoutMode = {type: "box", ignoreSize: true};
|
|
74249
|
+
}
|
|
74250
|
+
};
|
|
74251
|
+
var EventsModel = EventsModel2;
|
|
74252
|
+
EventsModel.type = "events";
|
|
74253
|
+
EventsModel.defaultOption = {
|
|
74254
|
+
z: 1e3,
|
|
74255
|
+
show: true,
|
|
74256
|
+
data: [],
|
|
74257
|
+
lineVisible: true,
|
|
74258
|
+
lineStyle: {
|
|
74259
|
+
color: "#82858f",
|
|
74260
|
+
width: 1,
|
|
74261
|
+
type: "solid"
|
|
74262
|
+
},
|
|
74263
|
+
selectedEventViewId: ""
|
|
74264
|
+
};
|
|
74265
|
+
|
|
74266
|
+
// src/component/events/EventsView.ts
|
|
74267
|
+
var r = 15;
|
|
74268
|
+
var EventsView2 = class extends Component_default2 {
|
|
74269
|
+
constructor() {
|
|
74270
|
+
super(...arguments);
|
|
74271
|
+
this.type = EventsView2.type;
|
|
74272
|
+
this._lastPoint = {
|
|
74273
|
+
x: 0,
|
|
74274
|
+
y: 0
|
|
74275
|
+
};
|
|
74276
|
+
}
|
|
74277
|
+
init(ecModel, api2) {
|
|
74278
|
+
this._api = api2;
|
|
74279
|
+
}
|
|
74280
|
+
render(eventsModel, ecModel, api2) {
|
|
74281
|
+
this.group.removeAll();
|
|
74282
|
+
if (!eventsModel.get("show")) {
|
|
74283
|
+
return;
|
|
74284
|
+
}
|
|
74285
|
+
const group = this.group;
|
|
74286
|
+
const data = eventsModel.get("data");
|
|
74287
|
+
const xAxisModal = ecModel.getComponent("xAxis", 0);
|
|
74288
|
+
if (!xAxisModal) {
|
|
74289
|
+
return;
|
|
74290
|
+
}
|
|
74291
|
+
const scale4 = xAxisModal.axis.scale;
|
|
74292
|
+
const ordinalMeta = scale4.getOrdinalMeta();
|
|
74293
|
+
const [startIndex, endIndex] = scale4.getExtent();
|
|
74294
|
+
let rect;
|
|
74295
|
+
const gird = ecModel.getComponent("grid", 0);
|
|
74296
|
+
if (gird && gird.coordinateSystem) {
|
|
74297
|
+
rect = gird.coordinateSystem.getRect();
|
|
74298
|
+
}
|
|
74299
|
+
if (!rect) {
|
|
74300
|
+
return;
|
|
74301
|
+
}
|
|
74302
|
+
const lineVisible = eventsModel.get("lineVisible");
|
|
74303
|
+
const lineStyle = eventsModel.get("lineStyle");
|
|
74304
|
+
const z = eventsModel.get("z");
|
|
74305
|
+
const selectedEventViewId = eventsModel.get("selectedEventViewId");
|
|
74306
|
+
const hoverEventId = this.hoverEventId;
|
|
74307
|
+
const lastPoint = this._lastPoint;
|
|
74308
|
+
const borderWidth = 2;
|
|
74309
|
+
for (let index = 0; index < data.length; index++) {
|
|
74310
|
+
const {time, list} = data[index];
|
|
74311
|
+
const idx = ordinalMeta.parseAndExtra(time);
|
|
74312
|
+
if (idx < startIndex) {
|
|
74313
|
+
continue;
|
|
74314
|
+
}
|
|
74315
|
+
if (idx > endIndex) {
|
|
74316
|
+
break;
|
|
74317
|
+
}
|
|
74318
|
+
const x = xAxisModal.axis.dataToCoord(idx) - 15;
|
|
74319
|
+
let y = rect.height - rect.x - 20;
|
|
74320
|
+
const z2 = data.length - index;
|
|
74321
|
+
each(list, function(item, i) {
|
|
74322
|
+
const yGap = 4 * (i + 1);
|
|
74323
|
+
const imgY = y - yGap;
|
|
74324
|
+
const id = `${time}_${item.id}`;
|
|
74325
|
+
const isSelected = selectedEventViewId === id;
|
|
74326
|
+
const renderZ = isSelected ? z + 1 : z;
|
|
74327
|
+
const img = new Image_default({
|
|
74328
|
+
style: {
|
|
74329
|
+
image: item.url,
|
|
74330
|
+
x,
|
|
74331
|
+
y: imgY,
|
|
74332
|
+
width: 30,
|
|
74333
|
+
height: 20
|
|
74334
|
+
},
|
|
74335
|
+
z2,
|
|
74336
|
+
z: renderZ
|
|
74337
|
+
});
|
|
74338
|
+
const clipPath = new Rect_default({
|
|
74339
|
+
shape: {
|
|
74340
|
+
x: x + 6,
|
|
74341
|
+
y: imgY + 1,
|
|
74342
|
+
width: 18,
|
|
74343
|
+
height: 18,
|
|
74344
|
+
r
|
|
74345
|
+
}
|
|
74346
|
+
});
|
|
74347
|
+
img.setClipPath(clipPath);
|
|
74348
|
+
group.add(img);
|
|
74349
|
+
const rect2 = new Rect_default({
|
|
74350
|
+
shape: {
|
|
74351
|
+
x: x + 5 - borderWidth / 2,
|
|
74352
|
+
y: imgY - borderWidth / 2,
|
|
74353
|
+
width: 20 + borderWidth,
|
|
74354
|
+
height: 20 + borderWidth,
|
|
74355
|
+
r
|
|
74356
|
+
},
|
|
74357
|
+
style: {
|
|
74358
|
+
stroke: "#ED544F",
|
|
74359
|
+
fill: "none"
|
|
74360
|
+
},
|
|
74361
|
+
z2,
|
|
74362
|
+
z: renderZ
|
|
74363
|
+
});
|
|
74364
|
+
if (hoverEventId === id || isSelected) {
|
|
74365
|
+
if (isSelected || rect2.contain(lastPoint.x, lastPoint.y)) {
|
|
74366
|
+
rect2.style.stroke = "#296bef";
|
|
74367
|
+
} else {
|
|
74368
|
+
this.hoverEventId = "";
|
|
74369
|
+
}
|
|
74370
|
+
}
|
|
74371
|
+
group.add(rect2);
|
|
74372
|
+
if (i !== list.length - 1) {
|
|
74373
|
+
y = y - 24;
|
|
74374
|
+
}
|
|
74375
|
+
const mouseout = () => {
|
|
74376
|
+
this.hoverEventId = "";
|
|
74377
|
+
!isSelected && rect2.attr("style", {stroke: "#ED544F"});
|
|
74378
|
+
};
|
|
74379
|
+
const mouseover = () => {
|
|
74380
|
+
this.hoverEventId = id;
|
|
74381
|
+
rect2.attr("style", {stroke: "#296bef"});
|
|
74382
|
+
api2.dispatchAction({
|
|
74383
|
+
type: "updateAxisPointer",
|
|
74384
|
+
currTrigger: "globalout"
|
|
74385
|
+
});
|
|
74386
|
+
};
|
|
74387
|
+
const click = (e2) => {
|
|
74388
|
+
e2.preventAxisPointer = true;
|
|
74389
|
+
api2.trigger("events", {
|
|
74390
|
+
time,
|
|
74391
|
+
id: item.id,
|
|
74392
|
+
selectedEventViewId: id,
|
|
74393
|
+
position: {
|
|
74394
|
+
x: rect2.shape.x,
|
|
74395
|
+
y: rect2.shape.y,
|
|
74396
|
+
rect: api2.getDom().getBoundingClientRect()
|
|
74397
|
+
}
|
|
74398
|
+
});
|
|
74399
|
+
};
|
|
74400
|
+
img.onmouseout = mouseout;
|
|
74401
|
+
img.onmousemove = this._mouseMove;
|
|
74402
|
+
img.onmouseover = mouseover;
|
|
74403
|
+
img.onclick = click;
|
|
74404
|
+
rect2.onmouseout = mouseout;
|
|
74405
|
+
rect2.onmousemove = this._mouseMove;
|
|
74406
|
+
rect2.onmouseover = mouseover;
|
|
74407
|
+
rect2.onclick = click;
|
|
74408
|
+
}, this);
|
|
74409
|
+
if (lineVisible && list.length) {
|
|
74410
|
+
const line2 = new Line_default({
|
|
74411
|
+
shape: {
|
|
74412
|
+
x1: x + 15,
|
|
74413
|
+
y1: 0,
|
|
74414
|
+
x2: x + 15,
|
|
74415
|
+
y2: y
|
|
74416
|
+
},
|
|
74417
|
+
silent: true,
|
|
74418
|
+
style: {
|
|
74419
|
+
stroke: lineStyle.color,
|
|
74420
|
+
lineWidth: lineStyle.width,
|
|
74421
|
+
lineDash: lineStyle.type
|
|
74422
|
+
},
|
|
74423
|
+
z2: 0,
|
|
74424
|
+
z
|
|
74425
|
+
});
|
|
74426
|
+
group.add(line2);
|
|
74427
|
+
}
|
|
74428
|
+
}
|
|
74429
|
+
}
|
|
74430
|
+
_mouseMove(e2) {
|
|
74431
|
+
this._lastPoint = {
|
|
74432
|
+
x: e2.offsetX,
|
|
74433
|
+
y: e2.offsetY
|
|
74434
|
+
};
|
|
74435
|
+
e2.preventAxisPointer = true;
|
|
74436
|
+
}
|
|
74437
|
+
dispose() {
|
|
74438
|
+
this._lastPoint = {
|
|
74439
|
+
x: 0,
|
|
74440
|
+
y: 0
|
|
74441
|
+
};
|
|
74442
|
+
}
|
|
74443
|
+
};
|
|
74444
|
+
var EventsView = EventsView2;
|
|
74445
|
+
EventsView.type = "events";
|
|
74446
|
+
|
|
74447
|
+
// src/component/events/install.ts
|
|
74448
|
+
function install55(registers) {
|
|
74449
|
+
registers.registerComponentModel(EventsModel);
|
|
74450
|
+
registers.registerComponentView(EventsView);
|
|
74451
|
+
}
|
|
74452
|
+
|
|
74201
74453
|
// src/component/cursorPointer/install.ts
|
|
74202
74454
|
var CursorPointerModel2 = class extends Component_default {
|
|
74203
74455
|
constructor() {
|
|
@@ -74230,14 +74482,14 @@ var CursorPointerView2 = class extends Component_default2 {
|
|
|
74230
74482
|
return;
|
|
74231
74483
|
}
|
|
74232
74484
|
const backgroundColor2 = cursorPointerModel.get("backgroundColor");
|
|
74233
|
-
const
|
|
74485
|
+
const r2 = cursorPointerModel.get("r");
|
|
74234
74486
|
const element = this.element;
|
|
74235
74487
|
element.attr({
|
|
74236
74488
|
style: {
|
|
74237
74489
|
fill: backgroundColor2
|
|
74238
74490
|
},
|
|
74239
74491
|
shape: {
|
|
74240
|
-
r
|
|
74492
|
+
r: r2
|
|
74241
74493
|
},
|
|
74242
74494
|
silent: true
|
|
74243
74495
|
});
|
|
@@ -74269,7 +74521,7 @@ var CursorPointerView2 = class extends Component_default2 {
|
|
|
74269
74521
|
};
|
|
74270
74522
|
var CursorPointerView = CursorPointerView2;
|
|
74271
74523
|
CursorPointerView.type = "cursorPointer";
|
|
74272
|
-
function
|
|
74524
|
+
function install56(registers) {
|
|
74273
74525
|
registers.registerComponentModel(CursorPointerModel);
|
|
74274
74526
|
registers.registerComponentView(CursorPointerView);
|
|
74275
74527
|
}
|
|
@@ -74686,7 +74938,7 @@ TableView.type = "table";
|
|
|
74686
74938
|
var TableView_default = TableView;
|
|
74687
74939
|
|
|
74688
74940
|
// src/component/table/install.ts
|
|
74689
|
-
function
|
|
74941
|
+
function install57(registers) {
|
|
74690
74942
|
registers.registerComponentModel(TableModel_default);
|
|
74691
74943
|
registers.registerComponentView(TableView_default);
|
|
74692
74944
|
}
|
|
@@ -75145,7 +75397,7 @@ AlarmModel.defaultOption = {
|
|
|
75145
75397
|
var AlarmModel_default = AlarmModel;
|
|
75146
75398
|
|
|
75147
75399
|
// src/component/alarm/install.ts
|
|
75148
|
-
function
|
|
75400
|
+
function install58(registers) {
|
|
75149
75401
|
registers.registerComponentView(AlarmView_default);
|
|
75150
75402
|
registers.registerComponentModel(AlarmModel_default);
|
|
75151
75403
|
registers.registerAction({type: "alarm", event: "alarm", update: "updateVisual"}, function(payload, ecModel) {
|
|
@@ -75223,7 +75475,7 @@ var BgRectView2 = class extends Component_default2 {
|
|
|
75223
75475
|
};
|
|
75224
75476
|
var BgRectView = BgRectView2;
|
|
75225
75477
|
BgRectView.type = "bgRect";
|
|
75226
|
-
function
|
|
75478
|
+
function install59(registers) {
|
|
75227
75479
|
registers.registerComponentModel(BgRectModel);
|
|
75228
75480
|
registers.registerComponentView(BgRectView);
|
|
75229
75481
|
}
|
|
@@ -76699,7 +76951,7 @@ var PlaybackOrderView3 = PlaybackOrderView4;
|
|
|
76699
76951
|
PlaybackOrderView3.type = "playbackOrder";
|
|
76700
76952
|
|
|
76701
76953
|
// src/component/playback/install.ts
|
|
76702
|
-
function
|
|
76954
|
+
function install60(registers) {
|
|
76703
76955
|
registers.registerComponentModel(PlaybackSelectModel);
|
|
76704
76956
|
registers.registerComponentView(PlaybackSelectView);
|
|
76705
76957
|
registers.registerComponentModel(PlaybackOrderModel);
|
|
@@ -76767,7 +77019,7 @@ var LogoView2 = class extends Component_default2 {
|
|
|
76767
77019
|
};
|
|
76768
77020
|
var LogoView = LogoView2;
|
|
76769
77021
|
LogoView.type = "logo";
|
|
76770
|
-
function
|
|
77022
|
+
function install61(registers) {
|
|
76771
77023
|
registers.registerComponentModel(LogoModel);
|
|
76772
77024
|
registers.registerComponentView(LogoView);
|
|
76773
77025
|
}
|
|
@@ -77621,7 +77873,7 @@ function has(obj, attr) {
|
|
|
77621
77873
|
}
|
|
77622
77874
|
|
|
77623
77875
|
// src/component/timeline/install.ts
|
|
77624
|
-
function
|
|
77876
|
+
function install62(registers) {
|
|
77625
77877
|
registers.registerComponentModel(SliderTimelineModel_default);
|
|
77626
77878
|
registers.registerComponentView(SliderTimelineView_default);
|
|
77627
77879
|
registers.registerSubTypeDefaulter("timeline", function() {
|
|
@@ -78062,7 +78314,7 @@ function createData(coordSys, seriesModel, mpModel) {
|
|
|
78062
78314
|
var MarkPointView_default = MarkPointView;
|
|
78063
78315
|
|
|
78064
78316
|
// src/component/marker/installMarkPoint.ts
|
|
78065
|
-
function
|
|
78317
|
+
function install63(registers) {
|
|
78066
78318
|
registers.registerComponentModel(MarkPointModel_default);
|
|
78067
78319
|
registers.registerComponentView(MarkPointView_default);
|
|
78068
78320
|
registers.registerPreprocessor(function(opt) {
|
|
@@ -78380,7 +78632,7 @@ function createList2(coordSys, seriesModel, mlModel) {
|
|
|
78380
78632
|
var MarkLineView_default = MarkLineView;
|
|
78381
78633
|
|
|
78382
78634
|
// src/component/marker/installMarkLine.ts
|
|
78383
|
-
function
|
|
78635
|
+
function install64(registers) {
|
|
78384
78636
|
registers.registerComponentModel(MarkLineModel_default);
|
|
78385
78637
|
registers.registerComponentView(MarkLineView_default);
|
|
78386
78638
|
registers.registerPreprocessor(function(opt) {
|
|
@@ -78694,7 +78946,7 @@ function createList3(coordSys, seriesModel, maModel) {
|
|
|
78694
78946
|
var MarkAreaView_default = MarkAreaView;
|
|
78695
78947
|
|
|
78696
78948
|
// src/component/marker/installMarkArea.ts
|
|
78697
|
-
function
|
|
78949
|
+
function install65(registers) {
|
|
78698
78950
|
registers.registerComponentModel(MarkAreaModel_default);
|
|
78699
78951
|
registers.registerComponentView(MarkAreaView_default);
|
|
78700
78952
|
registers.registerPreprocessor(function(opt) {
|
|
@@ -79446,7 +79698,7 @@ function updateLabel({x, y, labelData, markerModel, gridRect, position: position
|
|
|
79446
79698
|
var MarkLabelView_default = MarkLabelView;
|
|
79447
79699
|
|
|
79448
79700
|
// src/component/marker/installMarkLabel.ts
|
|
79449
|
-
function
|
|
79701
|
+
function install66(registers) {
|
|
79450
79702
|
registers.registerComponentModel(MarkLabelModal_default);
|
|
79451
79703
|
registers.registerComponentView(MarkLabelView_default);
|
|
79452
79704
|
registers.registerPreprocessor(function(opt) {
|
|
@@ -79512,7 +79764,7 @@ var LimitTipView2 = class extends Component_default2 {
|
|
|
79512
79764
|
};
|
|
79513
79765
|
var LimitTipView = LimitTipView2;
|
|
79514
79766
|
LimitTipView.type = "limitTip";
|
|
79515
|
-
function
|
|
79767
|
+
function install67(registers) {
|
|
79516
79768
|
registers.registerComponentModel(LimitTipModel);
|
|
79517
79769
|
registers.registerComponentView(LimitTipView);
|
|
79518
79770
|
}
|
|
@@ -80189,7 +80441,7 @@ function installLegendAction(registers) {
|
|
|
80189
80441
|
}
|
|
80190
80442
|
|
|
80191
80443
|
// src/component/legend/installLegendPlain.ts
|
|
80192
|
-
function
|
|
80444
|
+
function install68(registers) {
|
|
80193
80445
|
registers.registerComponentModel(LegendModel_default);
|
|
80194
80446
|
registers.registerComponentView(LegendView_default);
|
|
80195
80447
|
registers.registerProcessor(registers.PRIORITY.PROCESSOR.SERIES_FILTER, legendFilter);
|
|
@@ -80519,17 +80771,17 @@ function installScrollableLegendAction(registers) {
|
|
|
80519
80771
|
}
|
|
80520
80772
|
|
|
80521
80773
|
// src/component/legend/installLegendScroll.ts
|
|
80522
|
-
function
|
|
80523
|
-
use(
|
|
80774
|
+
function install69(registers) {
|
|
80775
|
+
use(install68);
|
|
80524
80776
|
registers.registerComponentModel(ScrollableLegendModel_default);
|
|
80525
80777
|
registers.registerComponentView(ScrollableLegendView_default);
|
|
80526
80778
|
installScrollableLegendAction(registers);
|
|
80527
80779
|
}
|
|
80528
80780
|
|
|
80529
80781
|
// src/component/legend/install.ts
|
|
80530
|
-
function
|
|
80531
|
-
use(install67);
|
|
80782
|
+
function install70(registers) {
|
|
80532
80783
|
use(install68);
|
|
80784
|
+
use(install69);
|
|
80533
80785
|
}
|
|
80534
80786
|
|
|
80535
80787
|
// src/component/dataZoom/InsideZoomModel.ts
|
|
@@ -81128,7 +81380,7 @@ var getDirectionInfo = {
|
|
|
81128
81380
|
var InsideZoomView_default = InsideZoomView;
|
|
81129
81381
|
|
|
81130
81382
|
// src/component/dataZoom/installDataZoomInside.ts
|
|
81131
|
-
function
|
|
81383
|
+
function install71(registers) {
|
|
81132
81384
|
installCommon(registers);
|
|
81133
81385
|
registers.registerComponentModel(InsideZoomModel_default);
|
|
81134
81386
|
registers.registerComponentView(InsideZoomView_default);
|
|
@@ -81884,16 +82136,16 @@ function getCursor(orient) {
|
|
|
81884
82136
|
var SliderZoomView_default = SliderZoomView;
|
|
81885
82137
|
|
|
81886
82138
|
// src/component/dataZoom/installDataZoomSlider.ts
|
|
81887
|
-
function
|
|
82139
|
+
function install72(registers) {
|
|
81888
82140
|
registers.registerComponentModel(SliderZoomModel_default);
|
|
81889
82141
|
registers.registerComponentView(SliderZoomView_default);
|
|
81890
82142
|
installCommon(registers);
|
|
81891
82143
|
}
|
|
81892
82144
|
|
|
81893
82145
|
// src/component/dataZoom/install.ts
|
|
81894
|
-
function
|
|
81895
|
-
use(install70);
|
|
82146
|
+
function install73(registers) {
|
|
81896
82147
|
use(install71);
|
|
82148
|
+
use(install72);
|
|
81897
82149
|
}
|
|
81898
82150
|
|
|
81899
82151
|
// src/visual/visualDefault.ts
|
|
@@ -83158,7 +83410,7 @@ function installCommon2(registers) {
|
|
|
83158
83410
|
}
|
|
83159
83411
|
|
|
83160
83412
|
// src/component/visualMap/installVisualMapContinuous.ts
|
|
83161
|
-
function
|
|
83413
|
+
function install74(registers) {
|
|
83162
83414
|
registers.registerComponentModel(ContinuousModel_default);
|
|
83163
83415
|
registers.registerComponentView(ContinuousView_default);
|
|
83164
83416
|
installCommon2(registers);
|
|
@@ -83598,16 +83850,16 @@ PiecewiseVisualMapView.type = "visualMap.piecewise";
|
|
|
83598
83850
|
var PiecewiseView_default = PiecewiseVisualMapView;
|
|
83599
83851
|
|
|
83600
83852
|
// src/component/visualMap/installVisualMapPiecewise.ts
|
|
83601
|
-
function
|
|
83853
|
+
function install75(registers) {
|
|
83602
83854
|
registers.registerComponentModel(PiecewiseModel_default);
|
|
83603
83855
|
registers.registerComponentView(PiecewiseView_default);
|
|
83604
83856
|
installCommon2(registers);
|
|
83605
83857
|
}
|
|
83606
83858
|
|
|
83607
83859
|
// src/component/visualMap/install.ts
|
|
83608
|
-
function
|
|
83609
|
-
use(install73);
|
|
83860
|
+
function install76(registers) {
|
|
83610
83861
|
use(install74);
|
|
83862
|
+
use(install75);
|
|
83611
83863
|
}
|
|
83612
83864
|
|
|
83613
83865
|
// src/visual/aria.ts
|
|
@@ -83803,7 +84055,7 @@ function ariaPreprocessor(option) {
|
|
|
83803
84055
|
}
|
|
83804
84056
|
|
|
83805
84057
|
// src/component/aria/install.ts
|
|
83806
|
-
function
|
|
84058
|
+
function install77(registers) {
|
|
83807
84059
|
registers.registerPreprocessor(ariaPreprocessor);
|
|
83808
84060
|
registers.registerVisual(registers.PRIORITY.VISUAL.ARIA, ariaVisual);
|
|
83809
84061
|
}
|
|
@@ -84141,7 +84393,7 @@ var sortTransform = {
|
|
|
84141
84393
|
};
|
|
84142
84394
|
|
|
84143
84395
|
// src/component/transform/install.ts
|
|
84144
|
-
function
|
|
84396
|
+
function install78(registers) {
|
|
84145
84397
|
registers.registerTransform(filterTransform);
|
|
84146
84398
|
registers.registerTransform(sortTransform);
|
|
84147
84399
|
}
|
|
@@ -84179,7 +84431,7 @@ var DatasetView = class extends Component_default2 {
|
|
|
84179
84431
|
}
|
|
84180
84432
|
};
|
|
84181
84433
|
DatasetView.type = "dataset";
|
|
84182
|
-
function
|
|
84434
|
+
function install79(registers) {
|
|
84183
84435
|
registers.registerComponentModel(DatasetModel);
|
|
84184
84436
|
registers.registerComponentView(DatasetView);
|
|
84185
84437
|
}
|
|
@@ -84410,12 +84662,12 @@ function getDividingGrids(dimSize, rowDim, count2) {
|
|
|
84410
84662
|
}
|
|
84411
84663
|
function divideSector(sectorShape, count2, outShapes) {
|
|
84412
84664
|
const r0 = sectorShape.r0;
|
|
84413
|
-
const
|
|
84665
|
+
const r2 = sectorShape.r;
|
|
84414
84666
|
const startAngle = sectorShape.startAngle;
|
|
84415
84667
|
const endAngle = sectorShape.endAngle;
|
|
84416
84668
|
const angle = Math.abs(endAngle - startAngle);
|
|
84417
|
-
const arcLen = angle *
|
|
84418
|
-
const deltaR =
|
|
84669
|
+
const arcLen = angle * r2;
|
|
84670
|
+
const deltaR = r2 - r0;
|
|
84419
84671
|
const isAngleRow = arcLen > Math.abs(deltaR);
|
|
84420
84672
|
const grids = getDividingGrids([arcLen, deltaR], isAngleRow ? 0 : 1, count2);
|
|
84421
84673
|
const rowSize = (isAngleRow ? angle : deltaR) / grids.length;
|
|
@@ -85933,8 +86185,8 @@ use(install52);
|
|
|
85933
86185
|
use(install44);
|
|
85934
86186
|
use(install53);
|
|
85935
86187
|
use(install54);
|
|
85936
|
-
use(install66);
|
|
85937
86188
|
use(install55);
|
|
86189
|
+
use(install67);
|
|
85938
86190
|
use(install56);
|
|
85939
86191
|
use(install57);
|
|
85940
86192
|
use(install58);
|
|
@@ -85945,16 +86197,17 @@ use(install62);
|
|
|
85945
86197
|
use(install63);
|
|
85946
86198
|
use(install64);
|
|
85947
86199
|
use(install65);
|
|
85948
|
-
use(
|
|
85949
|
-
use(install72);
|
|
86200
|
+
use(install66);
|
|
85950
86201
|
use(install70);
|
|
85951
|
-
use(install71);
|
|
85952
|
-
use(install75);
|
|
85953
86202
|
use(install73);
|
|
85954
|
-
use(
|
|
86203
|
+
use(install71);
|
|
86204
|
+
use(install72);
|
|
85955
86205
|
use(install76);
|
|
86206
|
+
use(install74);
|
|
86207
|
+
use(install75);
|
|
85956
86208
|
use(install77);
|
|
85957
86209
|
use(install78);
|
|
86210
|
+
use(install79);
|
|
85958
86211
|
use(installUniversalTransition);
|
|
85959
86212
|
use(installLabelLayout);
|
|
85960
86213
|
|