@visactor/vchart 1.12.9 → 1.12.10-alpha.2
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/build/es5/index.js +1 -1
- package/build/index.js +375 -398
- package/build/index.min.js +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/cjs/animation/utils.js +1 -1
- package/cjs/animation/utils.js.map +1 -1
- package/cjs/compile/compilable-base.js +1 -2
- package/cjs/compile/compiler.js +2 -1
- package/cjs/compile/compiler.js.map +1 -1
- package/cjs/compile/interface/compiler.d.ts +14 -0
- package/cjs/compile/interface/compiler.js.map +1 -1
- package/cjs/compile/mark/compilable-mark.d.ts +6 -35
- package/cjs/compile/mark/compilable-mark.js +15 -78
- package/cjs/compile/mark/compilable-mark.js.map +1 -1
- package/cjs/compile/mark/interface.d.ts +4 -23
- package/cjs/compile/mark/interface.js.map +1 -1
- package/cjs/compile/util.js +2 -1
- package/cjs/component/axis/base-axis.js +24 -10
- package/cjs/component/axis/base-axis.js.map +1 -1
- package/cjs/component/data-zoom/data-filter-base-component.js +3 -1
- package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
- package/cjs/component/geo/geo-coordinate.d.ts +7 -0
- package/cjs/component/geo/geo-coordinate.js +5 -0
- package/cjs/component/geo/geo-coordinate.js.map +1 -1
- package/cjs/component/label/label.js +11 -7
- package/cjs/component/label/label.js.map +1 -1
- package/cjs/component/label/total-label.js +2 -1
- package/cjs/component/label/total-label.js.map +1 -1
- package/cjs/component/title/interface/theme.d.ts +1 -1
- package/cjs/component/title/interface/theme.js.map +1 -1
- package/cjs/component/tooltip/interface/spec.d.ts +12 -2
- package/cjs/component/tooltip/interface/spec.js.map +1 -1
- package/cjs/component/tooltip/tooltip.js +29 -15
- package/cjs/component/tooltip/tooltip.js.map +1 -1
- package/cjs/core/factory.js +3 -1
- package/cjs/core/factory.js.map +1 -1
- package/cjs/core/index.d.ts +1 -1
- package/cjs/core/index.js +1 -1
- package/cjs/core/index.js.map +1 -1
- package/cjs/mark/base/base-line.js +3 -1
- package/cjs/mark/base/base-line.js.map +1 -1
- package/cjs/mark/base/base-mark.js +3 -3
- package/cjs/mark/base/base-mark.js.map +1 -1
- package/cjs/mark/group.js +1 -1
- package/cjs/mark/group.js.map +1 -1
- package/cjs/mark/interface/common.d.ts +10 -0
- package/cjs/mark/interface/common.js.map +1 -1
- package/cjs/model/base-model.d.ts +2 -2
- package/cjs/model/base-model.js +2 -2
- package/cjs/model/base-model.js.map +1 -1
- package/cjs/region/region.js +8 -4
- package/cjs/region/region.js.map +1 -1
- package/cjs/series/area/area.js +4 -4
- package/cjs/series/area/area.js.map +1 -1
- package/cjs/series/bar/bar.d.ts +2 -2
- package/cjs/series/bar/bar.js +53 -48
- package/cjs/series/bar/bar.js.map +1 -1
- package/cjs/series/base/base-series.d.ts +2 -2
- package/cjs/series/base/base-series.js +18 -13
- package/cjs/series/base/base-series.js.map +1 -1
- package/cjs/series/box-plot/box-plot.js +3 -5
- package/cjs/series/box-plot/box-plot.js.map +1 -1
- package/cjs/series/circle-packing/circle-packing.js +3 -2
- package/cjs/series/circle-packing/circle-packing.js.map +1 -1
- package/cjs/series/correlation/correlation.js +12 -6
- package/cjs/series/correlation/correlation.js.map +1 -1
- package/cjs/series/dot/dot.js +7 -3
- package/cjs/series/dot/dot.js.map +1 -1
- package/cjs/series/funnel/3d/funnel-3d.js +2 -1
- package/cjs/series/funnel/3d/funnel-3d.js.map +1 -1
- package/cjs/series/funnel/funnel.js +8 -6
- package/cjs/series/funnel/funnel.js.map +1 -1
- package/cjs/series/heatmap/heatmap.js +10 -10
- package/cjs/series/heatmap/heatmap.js.map +1 -1
- package/cjs/series/interface/common.d.ts +1 -9
- package/cjs/series/interface/common.js.map +1 -1
- package/cjs/series/link/link.js +7 -3
- package/cjs/series/link/link.js.map +1 -1
- package/cjs/series/liquid/liquid.js +11 -6
- package/cjs/series/liquid/liquid.js.map +1 -1
- package/cjs/series/map/map.js +3 -2
- package/cjs/series/map/map.js.map +1 -1
- package/cjs/series/mixin/line-mixin.d.ts +2 -2
- package/cjs/series/mixin/line-mixin.js +15 -14
- package/cjs/series/mixin/line-mixin.js.map +1 -1
- package/cjs/series/pie/3d/pie-3d.js +3 -1
- package/cjs/series/pie/3d/pie-3d.js.map +1 -1
- package/cjs/series/pie/pie.js +5 -4
- package/cjs/series/pie/pie.js.map +1 -1
- package/cjs/series/polar/progress-like/progress-like.js +29 -24
- package/cjs/series/polar/progress-like/progress-like.js.map +1 -1
- package/cjs/series/progress/circular/circular.js +6 -4
- package/cjs/series/progress/circular/circular.js.map +1 -1
- package/cjs/series/progress/linear/linear.js +6 -4
- package/cjs/series/progress/linear/linear.js.map +1 -1
- package/cjs/series/radar/radar.js +4 -4
- package/cjs/series/radar/radar.js.map +1 -1
- package/cjs/series/range-area/range-area.js +3 -2
- package/cjs/series/range-area/range-area.js.map +1 -1
- package/cjs/series/range-column/range-column.js +5 -4
- package/cjs/series/range-column/range-column.js.map +1 -1
- package/cjs/series/rose/rose.js +5 -4
- package/cjs/series/rose/rose.js.map +1 -1
- package/cjs/series/sankey/sankey.js +12 -6
- package/cjs/series/sankey/sankey.js.map +1 -1
- package/cjs/series/scatter/scatter.js +8 -10
- package/cjs/series/scatter/scatter.js.map +1 -1
- package/cjs/series/sunburst/sunburst.js +3 -2
- package/cjs/series/sunburst/sunburst.js.map +1 -1
- package/cjs/series/treemap/treemap.js +6 -4
- package/cjs/series/treemap/treemap.js.map +1 -1
- package/cjs/series/waterfall/waterfall.js +3 -2
- package/cjs/series/waterfall/waterfall.js.map +1 -1
- package/cjs/series/word-cloud/base.js +2 -1
- package/cjs/series/word-cloud/base.js.map +1 -1
- package/cjs/series/word-cloud/word-cloud-3d.js +2 -1
- package/cjs/series/word-cloud/word-cloud-3d.js.map +1 -1
- package/cjs/theme/builtin/common/component/title.js.map +1 -1
- package/esm/animation/utils.js +1 -1
- package/esm/animation/utils.js.map +1 -1
- package/esm/compile/compilable-base.js +1 -2
- package/esm/compile/compiler.js +1 -1
- package/esm/compile/compiler.js.map +1 -1
- package/esm/compile/interface/compiler.d.ts +14 -0
- package/esm/compile/interface/compiler.js.map +1 -1
- package/esm/compile/mark/compilable-mark.d.ts +6 -35
- package/esm/compile/mark/compilable-mark.js +15 -78
- package/esm/compile/mark/compilable-mark.js.map +1 -1
- package/esm/compile/mark/interface.d.ts +4 -23
- package/esm/compile/mark/interface.js.map +1 -1
- package/esm/compile/util.js +2 -1
- package/esm/component/axis/base-axis.js +23 -10
- package/esm/component/axis/base-axis.js.map +1 -1
- package/esm/component/data-zoom/data-filter-base-component.js +3 -1
- package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
- package/esm/component/geo/geo-coordinate.d.ts +7 -0
- package/esm/component/geo/geo-coordinate.js +6 -1
- package/esm/component/geo/geo-coordinate.js.map +1 -1
- package/esm/component/label/label.js +11 -7
- package/esm/component/label/label.js.map +1 -1
- package/esm/component/label/total-label.js +2 -1
- package/esm/component/label/total-label.js.map +1 -1
- package/esm/component/title/interface/theme.d.ts +1 -1
- package/esm/component/title/interface/theme.js.map +1 -1
- package/esm/component/tooltip/interface/spec.d.ts +12 -2
- package/esm/component/tooltip/interface/spec.js.map +1 -1
- package/esm/component/tooltip/tooltip.js +29 -16
- package/esm/component/tooltip/tooltip.js.map +1 -1
- package/esm/core/factory.js +3 -1
- package/esm/core/factory.js.map +1 -1
- package/esm/core/index.d.ts +1 -1
- package/esm/core/index.js +1 -1
- package/esm/core/index.js.map +1 -1
- package/esm/mark/base/base-line.js +3 -1
- package/esm/mark/base/base-line.js.map +1 -1
- package/esm/mark/base/base-mark.js +2 -2
- package/esm/mark/base/base-mark.js.map +1 -1
- package/esm/mark/group.js +1 -1
- package/esm/mark/group.js.map +1 -1
- package/esm/mark/interface/common.d.ts +10 -0
- package/esm/mark/interface/common.js.map +1 -1
- package/esm/model/base-model.d.ts +2 -2
- package/esm/model/base-model.js +2 -2
- package/esm/model/base-model.js.map +1 -1
- package/esm/region/region.js +8 -4
- package/esm/region/region.js.map +1 -1
- package/esm/series/area/area.js +4 -4
- package/esm/series/area/area.js.map +1 -1
- package/esm/series/bar/bar.d.ts +2 -2
- package/esm/series/bar/bar.js +52 -47
- package/esm/series/bar/bar.js.map +1 -1
- package/esm/series/base/base-series.d.ts +2 -2
- package/esm/series/base/base-series.js +18 -13
- package/esm/series/base/base-series.js.map +1 -1
- package/esm/series/box-plot/box-plot.js +3 -5
- package/esm/series/box-plot/box-plot.js.map +1 -1
- package/esm/series/circle-packing/circle-packing.js +3 -2
- package/esm/series/circle-packing/circle-packing.js.map +1 -1
- package/esm/series/correlation/correlation.js +12 -6
- package/esm/series/correlation/correlation.js.map +1 -1
- package/esm/series/dot/dot.js +7 -3
- package/esm/series/dot/dot.js.map +1 -1
- package/esm/series/funnel/3d/funnel-3d.js +2 -1
- package/esm/series/funnel/3d/funnel-3d.js.map +1 -1
- package/esm/series/funnel/funnel.js +8 -6
- package/esm/series/funnel/funnel.js.map +1 -1
- package/esm/series/heatmap/heatmap.js +10 -10
- package/esm/series/heatmap/heatmap.js.map +1 -1
- package/esm/series/interface/common.d.ts +1 -9
- package/esm/series/interface/common.js.map +1 -1
- package/esm/series/link/link.js +7 -3
- package/esm/series/link/link.js.map +1 -1
- package/esm/series/liquid/liquid.js +11 -6
- package/esm/series/liquid/liquid.js.map +1 -1
- package/esm/series/map/map.js +3 -2
- package/esm/series/map/map.js.map +1 -1
- package/esm/series/mixin/line-mixin.d.ts +2 -2
- package/esm/series/mixin/line-mixin.js +15 -14
- package/esm/series/mixin/line-mixin.js.map +1 -1
- package/esm/series/pie/3d/pie-3d.js +3 -1
- package/esm/series/pie/3d/pie-3d.js.map +1 -1
- package/esm/series/pie/pie.js +5 -4
- package/esm/series/pie/pie.js.map +1 -1
- package/esm/series/polar/progress-like/progress-like.js +28 -23
- package/esm/series/polar/progress-like/progress-like.js.map +1 -1
- package/esm/series/progress/circular/circular.js +6 -4
- package/esm/series/progress/circular/circular.js.map +1 -1
- package/esm/series/progress/linear/linear.js +6 -4
- package/esm/series/progress/linear/linear.js.map +1 -1
- package/esm/series/radar/radar.js +4 -4
- package/esm/series/radar/radar.js.map +1 -1
- package/esm/series/range-area/range-area.js +3 -2
- package/esm/series/range-area/range-area.js.map +1 -1
- package/esm/series/range-column/range-column.js +5 -4
- package/esm/series/range-column/range-column.js.map +1 -1
- package/esm/series/rose/rose.js +5 -4
- package/esm/series/rose/rose.js.map +1 -1
- package/esm/series/sankey/sankey.js +12 -6
- package/esm/series/sankey/sankey.js.map +1 -1
- package/esm/series/scatter/scatter.js +8 -10
- package/esm/series/scatter/scatter.js.map +1 -1
- package/esm/series/sunburst/sunburst.js +3 -2
- package/esm/series/sunburst/sunburst.js.map +1 -1
- package/esm/series/treemap/treemap.js +6 -4
- package/esm/series/treemap/treemap.js.map +1 -1
- package/esm/series/waterfall/waterfall.js +3 -2
- package/esm/series/waterfall/waterfall.js.map +1 -1
- package/esm/series/word-cloud/base.js +2 -1
- package/esm/series/word-cloud/base.js.map +1 -1
- package/esm/series/word-cloud/word-cloud-3d.js +2 -1
- package/esm/series/word-cloud/word-cloud-3d.js.map +1 -1
- package/esm/theme/builtin/common/component/title.js.map +1 -1
- package/package.json +17 -17
package/build/index.js
CHANGED
|
@@ -1251,7 +1251,7 @@
|
|
|
1251
1251
|
return steps.forEach(step => {
|
|
1252
1252
|
const sin = Math.sin(step),
|
|
1253
1253
|
cos = Math.cos(step);
|
|
1254
|
-
1 === sin ? radiusList.push(height - y) : -1 === sin ? radiusList.push(y) : 1 === cos ? radiusList.push(width - x) : -1 === cos ? radiusList.push(x) : (sin > 0 ? radiusList.push(Math.abs((height - y) /
|
|
1254
|
+
1 === sin ? radiusList.push(height - y) : -1 === sin ? radiusList.push(y) : 1 === cos ? radiusList.push(width - x) : -1 === cos ? radiusList.push(x) : (sin > 0 ? radiusList.push(Math.abs((height - y) / sin)) : radiusList.push(Math.abs(y / sin)), cos > 0 ? radiusList.push(Math.abs((width - x) / cos)) : radiusList.push(Math.abs(x / cos)));
|
|
1255
1255
|
}), Math.min.apply(null, radiusList);
|
|
1256
1256
|
}
|
|
1257
1257
|
function computeQuadrant(angle) {
|
|
@@ -18490,7 +18490,9 @@
|
|
|
18490
18490
|
path = groupAttribute.path,
|
|
18491
18491
|
lineWidth = groupAttribute.lineWidth,
|
|
18492
18492
|
visible = groupAttribute.visible,
|
|
18493
|
-
fillStrokeOrder = groupAttribute.fillStrokeOrder
|
|
18493
|
+
fillStrokeOrder = groupAttribute.fillStrokeOrder,
|
|
18494
|
+
x: originX = groupAttribute.x,
|
|
18495
|
+
y: originY = groupAttribute.y
|
|
18494
18496
|
} = group.attribute,
|
|
18495
18497
|
fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
|
|
18496
18498
|
sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height),
|
|
@@ -18518,10 +18520,10 @@
|
|
|
18518
18520
|
c.time === BaseRenderContributionTime.beforeFillStroke && c.drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb, doFillOrStroke);
|
|
18519
18521
|
}), clip && context.clip(), context.setShadowBlendStyle && context.setShadowBlendStyle(group, group.attribute, groupAttribute);
|
|
18520
18522
|
const _runFill = () => {
|
|
18521
|
-
doFillOrStroke.doFill && (fillCb ? fillCb(context, group.attribute, groupAttribute) : fVisible && (context.setCommonStyle(group, group.attribute, x, y, groupAttribute), context.fill()));
|
|
18523
|
+
doFillOrStroke.doFill && (fillCb ? fillCb(context, group.attribute, groupAttribute) : fVisible && (context.setCommonStyle(group, group.attribute, originX - x, originY - y, groupAttribute), context.fill()));
|
|
18522
18524
|
},
|
|
18523
18525
|
_runStroke = () => {
|
|
18524
|
-
doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, group.attribute, groupAttribute) : sVisible && (context.setStrokeStyle(group, group.attribute, x, y, groupAttribute), context.stroke()));
|
|
18526
|
+
doFillOrStroke.doStroke && (strokeCb ? strokeCb(context, group.attribute, groupAttribute) : sVisible && (context.setStrokeStyle(group, group.attribute, originX - x, originY - y, groupAttribute), context.stroke()));
|
|
18525
18527
|
};
|
|
18526
18528
|
fillStrokeOrder ? (_runStroke(), _runFill()) : (_runFill(), _runStroke()), this._groupRenderContribitions.forEach(c => {
|
|
18527
18529
|
c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(group, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb);
|
|
@@ -24005,27 +24007,9 @@
|
|
|
24005
24007
|
for (let i = 1, len = points.length; i < len; i++) deltaX = points[i].x - lastX, deltaY = points[i].y - lastY, deltaX * deltaX + deltaY * deltaY > sqTolerance && (lastX = points[i].x, lastY = points[i].y, newPoints.push(points[i]));
|
|
24006
24008
|
return points[points.length - 1].x === lastX && points[points.length - 1].y === lastY || newPoints.push(points[points.length - 1]), newPoints;
|
|
24007
24009
|
}
|
|
24008
|
-
function simplifyDPStep(points, startIdx, endIdx, sqTolerance, simplified) {
|
|
24009
|
-
let maxSqDist = sqTolerance,
|
|
24010
|
-
nextIdx = startIdx;
|
|
24011
|
-
const startX = points[startIdx].x,
|
|
24012
|
-
startY = points[startIdx].y,
|
|
24013
|
-
vecX2 = points[endIdx].x - startX,
|
|
24014
|
-
vecY2 = points[endIdx].y - startY,
|
|
24015
|
-
sqLength = vecX2 * vecX2 + vecY2 * vecY2;
|
|
24016
|
-
let area, sqArea, sqDistance, vecX1, vecY1;
|
|
24017
|
-
for (let i = startIdx + 1, len = endIdx - 1; i < len; i++) vecX1 = points[i].x - startX, vecY1 = points[i].y - startY, area = vecX1 * vecY2 - vecX2 * vecY1, sqArea = area * area, sqDistance = sqArea / sqLength, sqDistance > maxSqDist && (maxSqDist = sqDistance, nextIdx = i);
|
|
24018
|
-
maxSqDist > sqTolerance && (nextIdx - startIdx > 2 && simplifyDPStep(points, startIdx, nextIdx, sqTolerance, simplified), simplified.push(points[nextIdx], points[nextIdx + 1]), endIdx - nextIdx > 2 && simplifyDPStep(points, nextIdx, endIdx, sqTolerance, simplified));
|
|
24019
|
-
}
|
|
24020
|
-
function simplifyDouglasPeucker(points, sqTolerance) {
|
|
24021
|
-
const lastIdx = points.length - 1,
|
|
24022
|
-
simplified = [points[0]];
|
|
24023
|
-
return simplifyDPStep(points, 0, lastIdx, sqTolerance, simplified), simplified.push(points[lastIdx]), simplified;
|
|
24024
|
-
}
|
|
24025
24010
|
function flatten_simplify(points, tolerance, highestQuality) {
|
|
24026
24011
|
if (points.length <= 10) return points;
|
|
24027
|
-
|
|
24028
|
-
return points = simplifyDouglasPeucker(points = highestQuality ? points : simplifyRadialDist(points, sqTolerance), sqTolerance);
|
|
24012
|
+
return points = highestQuality ? points : simplifyRadialDist(points, void 0 !== tolerance ? tolerance * tolerance : 1);
|
|
24029
24013
|
}
|
|
24030
24014
|
|
|
24031
24015
|
let loadArcModule = !1;
|
|
@@ -25391,7 +25375,7 @@
|
|
|
25391
25375
|
let config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
25392
25376
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
25393
25377
|
super(), this.cachedEvents = [], this.startPoints = [], this.processEvent = {}, this.throttleTimer = 0, this.emitThrottles = [], this.lastTapTarget = null, this.onStart = ev => {
|
|
25394
|
-
this.reset(), this.startTime = clock.now();
|
|
25378
|
+
this.cachedEvents = [], this.startPoints = [], this.reset(), this.startTime = clock.now();
|
|
25395
25379
|
const {
|
|
25396
25380
|
cachedEvents: cachedEvents,
|
|
25397
25381
|
startPoints: startPoints
|
|
@@ -25411,7 +25395,7 @@
|
|
|
25411
25395
|
if (1 !== startPoints.length) this.startDistance = calcDistance(startPoints[0], startPoints[1]), this.center = getCenter([startPoints[0], startPoints[1]]);else {
|
|
25412
25396
|
const event = cachedEvents[0];
|
|
25413
25397
|
this.pressTimeout = setTimeout(() => {
|
|
25414
|
-
event.direction = "none", event.deltaX = 0, event.deltaY = 0, event.points = startPoints, this.triggerStartEvent("press", event), this.triggerEvent("press", event), this.eventType = "press", this.direction = "none";
|
|
25398
|
+
event.direction = "none", event.deltaX = 0, event.deltaY = 0, event.points = startPoints, this.triggerStartEvent("press", event), this.triggerEvent("press", event), this.eventType = "press", this.direction = "none", this.pressTimeout = null;
|
|
25415
25399
|
}, this.config.press.time);
|
|
25416
25400
|
}
|
|
25417
25401
|
}, this.onMove = ev => {
|
|
@@ -34383,21 +34367,23 @@
|
|
|
34383
34367
|
axisLength: axisLength
|
|
34384
34368
|
} = config;
|
|
34385
34369
|
if (isEmpty(labels) || !isValidNumber$1(limitLength)) return;
|
|
34386
|
-
const overflowLimitLength = normalizeOverflowLimitLength(config.overflowLimitLength)
|
|
34370
|
+
const overflowLimitLength = normalizeOverflowLimitLength(config.overflowLimitLength),
|
|
34371
|
+
firstLabel = labels[0],
|
|
34372
|
+
angle = firstLabel.attribute.angle,
|
|
34373
|
+
hasAngle = !isNil$1(angle),
|
|
34374
|
+
cos = hasAngle ? Math.cos(angle) : 1,
|
|
34375
|
+
sin = hasAngle ? Math.sin(angle) : 0,
|
|
34376
|
+
isHorizontal = isAngleHorizontal(angle),
|
|
34377
|
+
isVertical = isAngleVertical(angle),
|
|
34378
|
+
isX = "top" === orient || "bottom" === orient,
|
|
34379
|
+
direction = firstLabel.attribute.direction,
|
|
34380
|
+
checkBox = !isHorizontal && !isVertical && isX && (labels.length < 2 || labels.some(label => Math.abs(label.AABBBounds.width() - firstLabel.AABBBounds.width()) >= 2)) && firstLabel.AABBBounds.width() > Math.abs(limitLength / sin);
|
|
34387
34381
|
labels.forEach(label => {
|
|
34388
34382
|
var _a;
|
|
34389
|
-
const angle = label.attribute.angle,
|
|
34390
|
-
hasAngle = !isNil$1(angle),
|
|
34391
|
-
cos = hasAngle ? Math.cos(angle) : 1,
|
|
34392
|
-
sin = hasAngle ? Math.sin(angle) : 0,
|
|
34393
|
-
isHorizontal = isAngleHorizontal(angle),
|
|
34394
|
-
isVertical = isAngleVertical(angle),
|
|
34395
|
-
isX = "top" === orient || "bottom" === orient;
|
|
34396
34383
|
if (isX) {
|
|
34397
34384
|
if (isVertical && Math.floor(label.AABBBounds.height()) <= limitLength) return;
|
|
34398
34385
|
if (isHorizontal && Math.floor(label.AABBBounds.width()) <= verticalLimitLength) return;
|
|
34399
34386
|
}
|
|
34400
|
-
const direction = label.attribute.direction;
|
|
34401
34387
|
if (!isX) {
|
|
34402
34388
|
if ("vertical" === direction && Math.floor(label.AABBBounds.height()) <= verticalLimitLength) return;
|
|
34403
34389
|
if ("vertical" !== direction) {
|
|
@@ -34413,11 +34399,11 @@
|
|
|
34413
34399
|
} = label.AABBBounds,
|
|
34414
34400
|
tan = sin / cos,
|
|
34415
34401
|
verticalSizeLimit = Math.abs(limitLength / sin);
|
|
34416
|
-
if (tan > 0 && x1 <= axisLength && limitLength / tan + x1 > axisLength) {
|
|
34417
|
-
const lengthLimit = (axisLength - x1) / Math.abs(cos)
|
|
34402
|
+
if (checkBox && tan > 0 && x1 <= axisLength + overflowLimitLength.right && limitLength / tan + x1 > axisLength + overflowLimitLength.right) {
|
|
34403
|
+
const lengthLimit = (axisLength - x1 + overflowLimitLength.right) / Math.abs(cos);
|
|
34418
34404
|
limitLabelLength = Math.min(lengthLimit, verticalSizeLimit);
|
|
34419
|
-
} else if (tan < 0 && x2 >=
|
|
34420
|
-
const lengthLimit = x2 / Math.abs(cos)
|
|
34405
|
+
} else if (checkBox && tan < 0 && x2 >= -overflowLimitLength.left && limitLength / tan + x2 < -overflowLimitLength.left) {
|
|
34406
|
+
const lengthLimit = (x2 + overflowLimitLength.left) / Math.abs(cos);
|
|
34421
34407
|
limitLabelLength = Math.min(lengthLimit, verticalSizeLimit);
|
|
34422
34408
|
} else limitLabelLength = verticalSizeLimit;
|
|
34423
34409
|
} else limitLabelLength = Math.abs(limitLength / cos);
|
|
@@ -34436,30 +34422,40 @@
|
|
|
34436
34422
|
orient: orient
|
|
34437
34423
|
} = config;
|
|
34438
34424
|
if (isEmpty(labels) || !isValidNumber$1(limitLength)) return;
|
|
34439
|
-
const
|
|
34440
|
-
|
|
34441
|
-
|
|
34442
|
-
|
|
34443
|
-
|
|
34444
|
-
|
|
34445
|
-
|
|
34425
|
+
const angle = labels[0].attribute.angle,
|
|
34426
|
+
isHorizontal = isAngleHorizontal(angle),
|
|
34427
|
+
isVertical = isAngleVertical(angle),
|
|
34428
|
+
isX = "top" === orient || "bottom" === orient;
|
|
34429
|
+
let verticalLimitLength = axisLength / labels.length;
|
|
34430
|
+
labels.forEach((label, index) => {
|
|
34431
|
+
var _a, _b, _c, _d, _e;
|
|
34446
34432
|
if (isX) {
|
|
34447
34433
|
if (isVertical && Math.floor(label.AABBBounds.height()) <= limitLength) return;
|
|
34448
|
-
if (isHorizontal
|
|
34434
|
+
if (isHorizontal) {
|
|
34435
|
+
const minGap = getLabelMinGap(label.attribute.x, null === (_a = labels[index + 1]) || void 0 === _a ? void 0 : _a.attribute.x, null === (_b = labels[index - 1]) || void 0 === _b ? void 0 : _b.attribute.x);
|
|
34436
|
+
isValidNumber$1(minGap) && (verticalLimitLength = min$1(verticalLimitLength, minGap));
|
|
34437
|
+
}
|
|
34449
34438
|
} else {
|
|
34450
|
-
if (isVertical
|
|
34439
|
+
if (isVertical) {
|
|
34440
|
+
const minGap = getLabelMinGap(label.attribute.y, null === (_c = labels[index + 1]) || void 0 === _c ? void 0 : _c.attribute.y, null === (_d = labels[index - 1]) || void 0 === _d ? void 0 : _d.attribute.y);
|
|
34441
|
+
isValidNumber$1(minGap) && (verticalLimitLength = min$1(verticalLimitLength, minGap));
|
|
34442
|
+
}
|
|
34451
34443
|
if (isHorizontal && Math.floor(label.AABBBounds.width()) <= limitLength) return;
|
|
34452
34444
|
}
|
|
34453
34445
|
let limitLabelLength = null,
|
|
34454
34446
|
heightLimit = null;
|
|
34455
34447
|
isX ? isVertical ? (limitLabelLength = limitLength, heightLimit = verticalLimitLength) : (limitLabelLength = verticalLimitLength, heightLimit = limitLength) : isVertical ? (limitLabelLength = verticalLimitLength, heightLimit = limitLength) : (limitLabelLength = limitLength, heightLimit = verticalLimitLength), label.setAttributes({
|
|
34456
34448
|
maxLineWidth: limitLabelLength,
|
|
34457
|
-
ellipsis: null !== (
|
|
34449
|
+
ellipsis: null !== (_e = label.attribute.ellipsis) && void 0 !== _e ? _e : ellipsis,
|
|
34458
34450
|
whiteSpace: "normal",
|
|
34459
34451
|
heightLimit: heightLimit
|
|
34460
34452
|
});
|
|
34461
34453
|
});
|
|
34462
34454
|
}
|
|
34455
|
+
function getLabelMinGap(current, next, prev) {
|
|
34456
|
+
let minGap;
|
|
34457
|
+
return isValidNumber$1(next) && (minGap = Math.abs(next - current)), isValidNumber$1(prev) && (minGap = isValidNumber$1(minGap) ? Math.min(Math.abs(current - prev), minGap) : Math.abs(current - prev)), minGap;
|
|
34458
|
+
}
|
|
34463
34459
|
|
|
34464
34460
|
function alignAxisLabels(labels, start, containerSize, orient, align) {
|
|
34465
34461
|
"left" === orient || "right" === orient ? "left" === align ? labels.forEach(label => {
|
|
@@ -35188,16 +35184,15 @@
|
|
|
35188
35184
|
inside: inside,
|
|
35189
35185
|
radius: radius,
|
|
35190
35186
|
center: center,
|
|
35191
|
-
|
|
35192
|
-
height: height,
|
|
35187
|
+
size: size,
|
|
35193
35188
|
label: label,
|
|
35194
35189
|
orient: orient
|
|
35195
35190
|
} = this.attribute,
|
|
35196
|
-
bounds =
|
|
35191
|
+
bounds = size ? {
|
|
35197
35192
|
x1: 0,
|
|
35198
35193
|
y1: 0,
|
|
35199
|
-
x2: width,
|
|
35200
|
-
y2: height
|
|
35194
|
+
x2: size.width,
|
|
35195
|
+
y2: size.height
|
|
35201
35196
|
} : {
|
|
35202
35197
|
x1: center.x - radius,
|
|
35203
35198
|
y1: center.y - radius,
|
|
@@ -40474,12 +40469,22 @@
|
|
|
40474
40469
|
pages = 1;
|
|
40475
40470
|
if (isHorizontal) compSize = maxWidth, contentWidth = maxWidth, contentHeight = this._itemHeight, comp = this._createScrollbar(compStyle, compSize), this._pagerComponent = comp, this._innerView.add(comp), this._updatePositionOfScrollbar(contentWidth, contentHeight, renderStartY);else {
|
|
40476
40471
|
if (compSize = maxHeight, comp = this._createScrollbar(compStyle, compSize), this._pagerComponent = comp, this._innerView.add(comp), contentHeight = maxHeight - renderStartY, contentWidth = this._itemMaxWidth, contentHeight <= 0) return this._innerView.removeChild(comp), !1;
|
|
40477
|
-
itemsContainer.getChildren()
|
|
40472
|
+
const items = itemsContainer.getChildren(),
|
|
40473
|
+
itemsHeightArr = items.map(item => item.attribute.height);
|
|
40474
|
+
if (1 === itemsHeightArr.length || itemsHeightArr.every(entry => entry === itemsHeightArr[0])) {
|
|
40475
|
+
const itemHeight = itemsHeightArr[0],
|
|
40476
|
+
maxContentHeight = contentHeight,
|
|
40477
|
+
pageItemsCount = Math.floor(maxContentHeight / (spaceRow + itemHeight));
|
|
40478
|
+
contentHeight = pageItemsCount * (spaceRow + itemHeight), pages = Math.ceil(items.length / pageItemsCount);
|
|
40479
|
+
} else items.forEach((item, index) => {
|
|
40478
40480
|
const {
|
|
40479
|
-
|
|
40480
|
-
|
|
40481
|
-
|
|
40482
|
-
|
|
40481
|
+
height: height
|
|
40482
|
+
} = item.attribute,
|
|
40483
|
+
prePages = pages,
|
|
40484
|
+
preStartY = startY;
|
|
40485
|
+
pages = Math.floor((startY + height) / contentHeight) + 1, startY += spaceRow + height, prePages !== pages && index === itemsContainer.getChildren().length - 1 && startY - contentHeight >= 1 / 3 * height && (contentHeight = preStartY + height, pages -= 1);
|
|
40486
|
+
});
|
|
40487
|
+
this._itemContext.totalPage = pages, this._itemContext.pages = pages, this._updatePositionOfScrollbar(contentWidth, contentHeight, renderStartY);
|
|
40483
40488
|
}
|
|
40484
40489
|
defaultCurrent > 1 && (isHorizontal ? itemsContainer.setAttribute("x", -(defaultCurrent - 1) * (contentWidth + spaceCol)) : itemsContainer.setAttribute("y", -(defaultCurrent - 1) * (contentHeight + spaceRow)));
|
|
40485
40490
|
const clipGroup = graphicCreator.group({
|
|
@@ -45851,7 +45856,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
45851
45856
|
const MarkConstructor = Factory._marks[markType];
|
|
45852
45857
|
const markInstance = new MarkConstructor(name, options);
|
|
45853
45858
|
if (markInstance.type === "group") {
|
|
45854
|
-
markInstance.
|
|
45859
|
+
markInstance.setMarkConfig({ interactive: false });
|
|
45855
45860
|
}
|
|
45856
45861
|
return markInstance;
|
|
45857
45862
|
}
|
|
@@ -56232,7 +56237,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
56232
56237
|
});
|
|
56233
56238
|
}
|
|
56234
56239
|
this._view = new View(Object.assign(Object.assign({ width: this._width, height: this._height, container: (_c = this._container.dom) !== null && _c !== void 0 ? _c : null, renderCanvas: (_d = this._container.canvas) !== null && _d !== void 0 ? _d : null, hooks: this._option.performanceHook }, this._option), { mode: toRenderMode(this._option.mode), autoFit: false, eventConfig: {
|
|
56235
|
-
gesture:
|
|
56240
|
+
gesture: isValid$1(this._option.gestureConfig)
|
|
56241
|
+
? this._option.gestureConfig
|
|
56242
|
+
: isMobileLikeMode(this._option.mode),
|
|
56236
56243
|
disable: this._option.interactive === false
|
|
56237
56244
|
}, doLayout: () => {
|
|
56238
56245
|
var _a;
|
|
@@ -57612,10 +57619,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
57612
57619
|
m.compile({ group });
|
|
57613
57620
|
});
|
|
57614
57621
|
}
|
|
57615
|
-
_createMark(markInfo, option = {}) {
|
|
57622
|
+
_createMark(markInfo, option = {}, config) {
|
|
57616
57623
|
const { type, name } = markInfo;
|
|
57617
57624
|
const m = Factory$1.createMark(type, name, Object.assign({ model: this, map: this._option.map, getCompiler: this.getCompiler, globalScale: this._option.globalScale }, option));
|
|
57618
|
-
|
|
57625
|
+
if (m) {
|
|
57626
|
+
m.created();
|
|
57627
|
+
config && m.setMarkConfig(config);
|
|
57628
|
+
}
|
|
57619
57629
|
return m;
|
|
57620
57630
|
}
|
|
57621
57631
|
_getDataIdKey() {
|
|
@@ -58173,8 +58183,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
58173
58183
|
this._groupMark.addMark(mark);
|
|
58174
58184
|
}
|
|
58175
58185
|
});
|
|
58176
|
-
this._backgroundMark && this._backgroundMark.
|
|
58177
|
-
this._foregroundMark && this._foregroundMark.
|
|
58186
|
+
this._backgroundMark && this._backgroundMark.setMarkConfig({ zIndex: LayoutZIndex.SeriesGroup - 1 });
|
|
58187
|
+
this._foregroundMark && this._foregroundMark.setMarkConfig({ zIndex: LayoutZIndex.Mark + 1 });
|
|
58178
58188
|
}
|
|
58179
58189
|
this.createTrigger();
|
|
58180
58190
|
}
|
|
@@ -58182,7 +58192,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
58182
58192
|
var _a, _b;
|
|
58183
58193
|
const groupMark = this._createMark({ type: "group", name });
|
|
58184
58194
|
groupMark.setUserId(userId);
|
|
58185
|
-
groupMark.
|
|
58195
|
+
groupMark.setMarkConfig({ zIndex });
|
|
58186
58196
|
const clip = (_a = this._spec.clip) !== null && _a !== void 0 ? _a : this._getClipDefaultValue();
|
|
58187
58197
|
this.setMarkStyle(groupMark, {
|
|
58188
58198
|
x: () => this.getLayoutStartPoint().x,
|
|
@@ -59356,29 +59366,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59356
59366
|
}
|
|
59357
59367
|
|
|
59358
59368
|
class CompilableMark extends GrammarItem {
|
|
59359
|
-
|
|
59360
|
-
return this.
|
|
59361
|
-
}
|
|
59362
|
-
setSkipTheme(skipTheme) {
|
|
59363
|
-
this._skipTheme = skipTheme;
|
|
59364
|
-
}
|
|
59365
|
-
getSupport3d() {
|
|
59366
|
-
return this._support3d;
|
|
59369
|
+
getMarkConfig() {
|
|
59370
|
+
return this._markConfig;
|
|
59367
59371
|
}
|
|
59368
|
-
|
|
59369
|
-
|
|
59370
|
-
|
|
59371
|
-
|
|
59372
|
-
return this._interactive;
|
|
59373
|
-
}
|
|
59374
|
-
setInteractive(interactive) {
|
|
59375
|
-
this._interactive = interactive;
|
|
59376
|
-
}
|
|
59377
|
-
getZIndex() {
|
|
59378
|
-
return this._zIndex;
|
|
59379
|
-
}
|
|
59380
|
-
setZIndex(zIndex) {
|
|
59381
|
-
this._zIndex = zIndex;
|
|
59372
|
+
setMarkConfig(config) {
|
|
59373
|
+
Object.keys(config).forEach(key => {
|
|
59374
|
+
this._markConfig[key] = config[key];
|
|
59375
|
+
});
|
|
59382
59376
|
}
|
|
59383
59377
|
getVisible() {
|
|
59384
59378
|
return this._visible;
|
|
@@ -59431,48 +59425,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59431
59425
|
getSkipBeforeLayouted() {
|
|
59432
59426
|
return this._skipBeforeLayouted;
|
|
59433
59427
|
}
|
|
59434
|
-
getMorph() {
|
|
59435
|
-
return this._morph;
|
|
59436
|
-
}
|
|
59437
|
-
setMorph(morph) {
|
|
59438
|
-
this._morph = morph;
|
|
59439
|
-
}
|
|
59440
|
-
getMorphKey() {
|
|
59441
|
-
return this._morphKey;
|
|
59442
|
-
}
|
|
59443
|
-
setMorphKey(morphKey) {
|
|
59444
|
-
this._morphKey = morphKey;
|
|
59445
|
-
}
|
|
59446
|
-
getMorphElementKey() {
|
|
59447
|
-
return this._morphElementKey;
|
|
59448
|
-
}
|
|
59449
|
-
setMorphElementKey(key) {
|
|
59450
|
-
this._morphElementKey = key;
|
|
59451
|
-
}
|
|
59452
59428
|
getGroupKey() {
|
|
59453
59429
|
return this._groupKey;
|
|
59454
59430
|
}
|
|
59455
59431
|
setGroupKey(groupKey) {
|
|
59456
59432
|
this._groupKey = groupKey;
|
|
59457
59433
|
}
|
|
59458
|
-
getProgressiveConfig() {
|
|
59459
|
-
return this._progressiveConfig;
|
|
59460
|
-
}
|
|
59461
|
-
setProgressiveConfig(config) {
|
|
59462
|
-
this._progressiveConfig = config;
|
|
59463
|
-
}
|
|
59464
|
-
setCustomizedShapeCallback(callback) {
|
|
59465
|
-
this._setCustomizedShape = callback;
|
|
59466
|
-
}
|
|
59467
|
-
setEnableSegments(enable) {
|
|
59468
|
-
this._enableSegments = enable;
|
|
59469
|
-
}
|
|
59470
|
-
getClip() {
|
|
59471
|
-
return this._clip;
|
|
59472
|
-
}
|
|
59473
|
-
setClip(clip) {
|
|
59474
|
-
this._clip = clip;
|
|
59475
|
-
}
|
|
59476
59434
|
setStateSortCallback(stateSort) {
|
|
59477
59435
|
this._stateSort = stateSort;
|
|
59478
59436
|
}
|
|
@@ -59481,19 +59439,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59481
59439
|
this.grammarType = GrammarType.mark;
|
|
59482
59440
|
this.type = undefined;
|
|
59483
59441
|
this.name = 'mark';
|
|
59484
|
-
this.
|
|
59485
|
-
|
|
59442
|
+
this._markConfig = {
|
|
59443
|
+
zIndex: LayoutZIndex.Mark,
|
|
59444
|
+
morph: false
|
|
59445
|
+
};
|
|
59486
59446
|
this._visible = true;
|
|
59487
59447
|
this.stateStyle = {};
|
|
59488
59448
|
this._unCompileChannel = {};
|
|
59489
59449
|
this._skipBeforeLayouted = false;
|
|
59490
|
-
this._morph = false;
|
|
59491
59450
|
this.name = name;
|
|
59492
59451
|
this.model = model;
|
|
59493
59452
|
this.key = option.key;
|
|
59494
59453
|
this.state = new MarkStateManager(Object.assign(Object.assign({}, option), { stateKeyToSignalName: this.stateKeyToSignalName.bind(this) }), this);
|
|
59495
|
-
this._option.support3d && this.setSupport3d(true);
|
|
59496
|
-
this._option.skipTheme && this.setSkipTheme(true);
|
|
59497
59454
|
this._event = new Event$1(model.getOption().eventDispatcher, model.getOption().mode);
|
|
59498
59455
|
}
|
|
59499
59456
|
setTransform(transform) {
|
|
@@ -59647,28 +59604,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59647
59604
|
}
|
|
59648
59605
|
}
|
|
59649
59606
|
compileContext(extraContext) {
|
|
59650
|
-
const config = {
|
|
59651
|
-
interactive: this.getInteractive(),
|
|
59652
|
-
zIndex: this.getZIndex(),
|
|
59653
|
-
context: Object.assign({ markId: this.id, modelId: this.model.id, markUserId: this._userId, modelUserId: this.model.userId }, extraContext),
|
|
59654
|
-
skipTheme: this.getSkipTheme(),
|
|
59655
|
-
support3d: this.getSupport3d(),
|
|
59656
|
-
enableSegments: !!this._enableSegments,
|
|
59657
|
-
clip: this._clip ? true : this._clip === false ? false : undefined,
|
|
59658
|
-
clipPath: this._clip || undefined
|
|
59659
|
-
};
|
|
59660
|
-
if (this._progressiveConfig) {
|
|
59661
|
-
config.progressiveStep = this._progressiveConfig.progressiveStep;
|
|
59662
|
-
config.progressiveThreshold = this._progressiveConfig.progressiveThreshold;
|
|
59663
|
-
config.large = this._progressiveConfig.large;
|
|
59664
|
-
config.largeThreshold = this._progressiveConfig.largeThreshold;
|
|
59665
|
-
}
|
|
59666
|
-
config.morph = this._morph;
|
|
59667
|
-
config.morphKey = this._morphKey;
|
|
59668
|
-
config.morphElementKey = this._morphElementKey;
|
|
59669
|
-
if (this._setCustomizedShape) {
|
|
59670
|
-
config.setCustomizedShape = this._setCustomizedShape;
|
|
59671
|
-
}
|
|
59607
|
+
const config = Object.assign(Object.assign({}, this._markConfig), { context: Object.assign({ markId: this.id, modelId: this.model.id, markUserId: this._userId, modelUserId: this.model.userId }, extraContext) });
|
|
59672
59608
|
this._product.configure(config);
|
|
59673
59609
|
}
|
|
59674
59610
|
compileSignal() {
|
|
@@ -59774,10 +59710,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59774
59710
|
this._userId = spec.id;
|
|
59775
59711
|
}
|
|
59776
59712
|
if (isBoolean$1(spec.interactive)) {
|
|
59777
|
-
this.
|
|
59713
|
+
this._markConfig.interactive = spec.interactive;
|
|
59778
59714
|
}
|
|
59779
59715
|
if (isValid$1(spec.zIndex)) {
|
|
59780
|
-
this.
|
|
59716
|
+
this._markConfig.zIndex = spec.zIndex;
|
|
59781
59717
|
}
|
|
59782
59718
|
if (isBoolean$1(spec.visible)) {
|
|
59783
59719
|
this.setVisible(spec.visible);
|
|
@@ -60153,7 +60089,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
60153
60089
|
_compileProduct(option) {
|
|
60154
60090
|
super._compileProduct(option);
|
|
60155
60091
|
this._product.configure({
|
|
60156
|
-
zIndex: this.
|
|
60092
|
+
zIndex: this._markConfig.zIndex
|
|
60157
60093
|
});
|
|
60158
60094
|
if (!(option === null || option === void 0 ? void 0 : option.ignoreChildren)) {
|
|
60159
60095
|
this.getMarks().forEach(mark => {
|
|
@@ -61645,7 +61581,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
61645
61581
|
};
|
|
61646
61582
|
registerVChartCore();
|
|
61647
61583
|
|
|
61648
|
-
const version = "1.12.
|
|
61584
|
+
const version = "1.12.10-alpha.2";
|
|
61649
61585
|
|
|
61650
61586
|
const addVChartProperty = (data, op) => {
|
|
61651
61587
|
const context = op.beforeCall();
|
|
@@ -62652,7 +62588,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
62652
62588
|
}
|
|
62653
62589
|
let animationThreshold = (_a = seriesSpec.animationThreshold) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER;
|
|
62654
62590
|
(_b = series.getMarks()) === null || _b === void 0 ? void 0 : _b.forEach(m => {
|
|
62655
|
-
const config = m.
|
|
62591
|
+
const config = m.getMarkConfig();
|
|
62656
62592
|
if (config) {
|
|
62657
62593
|
if (config.large && config.largeThreshold) {
|
|
62658
62594
|
animationThreshold = Math.min(animationThreshold, config.largeThreshold);
|
|
@@ -63229,7 +63165,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
63229
63165
|
parent: (_b = (_a = this._region).getGroupMark) === null || _b === void 0 ? void 0 : _b.call(_a),
|
|
63230
63166
|
dataView: false
|
|
63231
63167
|
});
|
|
63232
|
-
this._rootMark.
|
|
63168
|
+
this._rootMark.setMarkConfig({ zIndex: this.layoutZIndex });
|
|
63233
63169
|
}
|
|
63234
63170
|
_getExtensionMarkNamePrefix() {
|
|
63235
63171
|
return `${this.type}_${this.id}_extensionMark`;
|
|
@@ -63252,10 +63188,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
63252
63188
|
markSpec: spec,
|
|
63253
63189
|
parent: parentMark,
|
|
63254
63190
|
dataView: false,
|
|
63255
|
-
customShape: spec === null || spec === void 0 ? void 0 : spec.customShape,
|
|
63256
63191
|
componentType: spec.componentType,
|
|
63257
63192
|
depend: options.depend,
|
|
63258
63193
|
key: spec.dataKey
|
|
63194
|
+
}, {
|
|
63195
|
+
setCustomizedShape: spec === null || spec === void 0 ? void 0 : spec.customShape
|
|
63259
63196
|
});
|
|
63260
63197
|
if (!mark) {
|
|
63261
63198
|
return;
|
|
@@ -63710,18 +63647,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
63710
63647
|
}
|
|
63711
63648
|
onMarkTreePositionUpdate(marks) {
|
|
63712
63649
|
}
|
|
63713
|
-
_createMark(markInfo, option = {}) {
|
|
63714
|
-
var _a, _b, _c, _d;
|
|
63715
|
-
const { key, groupKey, skipBeforeLayouted, themeSpec = {}, markSpec, dataView, dataProductId, parent, isSeriesMark, depend,
|
|
63650
|
+
_createMark(markInfo, option = {}, config = {}) {
|
|
63651
|
+
var _a, _b, _c, _d, _e, _f;
|
|
63652
|
+
const { key, groupKey, skipBeforeLayouted, themeSpec = {}, markSpec, dataView, dataProductId, parent, isSeriesMark, depend, stateSort, noSeparateStyle = false } = option;
|
|
63716
63653
|
const m = super._createMark(markInfo, {
|
|
63717
63654
|
key: key !== null && key !== void 0 ? key : this._getDataIdKey(),
|
|
63718
|
-
support3d,
|
|
63719
63655
|
seriesId: this.id,
|
|
63720
63656
|
attributeContext: this._markAttributeContext,
|
|
63721
63657
|
componentType: option.componentType,
|
|
63722
63658
|
noSeparateStyle
|
|
63723
63659
|
});
|
|
63724
63660
|
if (isValid$1(m)) {
|
|
63661
|
+
const spec = this.getSpec() || {};
|
|
63725
63662
|
this._marks.addMark(m, { name: markInfo.name });
|
|
63726
63663
|
if (isSeriesMark) {
|
|
63727
63664
|
this._seriesMark = m;
|
|
@@ -63745,25 +63682,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
63745
63682
|
if (isValid$1(depend)) {
|
|
63746
63683
|
m.setDepend(...array(depend));
|
|
63747
63684
|
}
|
|
63748
|
-
const spec = this.getSpec() || {};
|
|
63749
|
-
m.setMorph(morph);
|
|
63750
|
-
m.setMorphKey(((_b = spec.morph) === null || _b === void 0 ? void 0 : _b.morphKey) || `${this.getSpecIndex()}_${this.getMarks().length}`);
|
|
63751
|
-
m.setMorphElementKey((_d = (_c = spec.morph) === null || _c === void 0 ? void 0 : _c.morphElementKey) !== null && _d !== void 0 ? _d : option.defaultMorphElementKey);
|
|
63752
|
-
if (!isNil$1(progressive)) {
|
|
63753
|
-
m.setProgressiveConfig(progressive);
|
|
63754
|
-
}
|
|
63755
63685
|
if (!isNil$1(groupKey)) {
|
|
63756
63686
|
m.setGroupKey(groupKey);
|
|
63757
63687
|
}
|
|
63758
|
-
if (customShape) {
|
|
63759
|
-
m.setCustomizedShapeCallback(customShape);
|
|
63760
|
-
}
|
|
63761
63688
|
if (stateSort) {
|
|
63762
63689
|
m.setStateSortCallback(stateSort);
|
|
63763
63690
|
}
|
|
63764
|
-
|
|
63765
|
-
|
|
63766
|
-
}
|
|
63691
|
+
const markConfig = Object.assign(Object.assign({}, config), { morph: (_b = config.morph) !== null && _b !== void 0 ? _b : false, support3d: (_c = config.support3d) !== null && _c !== void 0 ? _c : (spec.support3d || !!spec.zField), morphKey: ((_d = spec.morph) === null || _d === void 0 ? void 0 : _d.morphKey) || `${this.getSpecIndex()}_${this.getMarks().length}`, morphElementKey: (_f = (_e = spec.morph) === null || _e === void 0 ? void 0 : _e.morphElementKey) !== null && _f !== void 0 ? _f : config.morphElementKey });
|
|
63692
|
+
m.setMarkConfig(markConfig);
|
|
63767
63693
|
this.initMarkStyleWithSpec(m, mergeSpec({}, themeSpec, markSpec || spec[m.name]));
|
|
63768
63694
|
}
|
|
63769
63695
|
return m;
|
|
@@ -64393,13 +64319,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
64393
64319
|
initLineMark(progressive, isSeriesMark) {
|
|
64394
64320
|
var _a, _b;
|
|
64395
64321
|
this._lineMark = this._createMark(lineLikeSeriesMark.line, {
|
|
64396
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
64397
64322
|
groupKey: this._seriesField,
|
|
64398
64323
|
isSeriesMark: isSeriesMark !== null && isSeriesMark !== void 0 ? isSeriesMark : true,
|
|
64399
|
-
|
|
64400
|
-
|
|
64401
|
-
stateSort: (_b = this._spec.line) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
64402
|
-
});
|
|
64324
|
+
stateSort: (_a = this._spec.line) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
64325
|
+
}, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_b = this._spec.line) === null || _b === void 0 ? void 0 : _b.customShape, morphElementKey: this.getDimensionField()[0] }));
|
|
64403
64326
|
return this._lineMark;
|
|
64404
64327
|
}
|
|
64405
64328
|
initLineMarkStyle(direction, areaCurveType) {
|
|
@@ -64474,26 +64397,23 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
64474
64397
|
const pointSpec = this._spec.point || {};
|
|
64475
64398
|
if (pointSpec.visible !== false) {
|
|
64476
64399
|
this._symbolMark = this._createMark(lineLikeSeriesMark.point, {
|
|
64477
|
-
morph: shouldMarkDoMorph(this._spec, lineLikeSeriesMark.point.name),
|
|
64478
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
64479
64400
|
groupKey: this._seriesField,
|
|
64480
|
-
progressive,
|
|
64481
64401
|
isSeriesMark: !!isSeriesMark,
|
|
64482
|
-
customShape: pointSpec.customShape,
|
|
64483
64402
|
stateSort: pointSpec.stateSort
|
|
64484
|
-
});
|
|
64403
|
+
}, Object.assign(Object.assign({}, progressive), { setCustomizedShape: pointSpec.customShape, morph: shouldMarkDoMorph(this._spec, lineLikeSeriesMark.point.name), morphElementKey: this.getDimensionField()[0] }));
|
|
64485
64404
|
}
|
|
64486
64405
|
if (this._spec.activePoint === true) {
|
|
64487
64406
|
const activeData = new DataView(this._option.dataSet, { name: `${PREFIX}_series_${this.id}_active_point` });
|
|
64488
64407
|
activeData.parse([]);
|
|
64489
64408
|
this._symbolActiveMark = this._createMark({ name: `active_point_${this.id}`, type: "symbol" }, {
|
|
64490
|
-
morph: false,
|
|
64491
64409
|
groupKey: this._seriesField,
|
|
64492
64410
|
isSeriesMark: false,
|
|
64493
64411
|
dataView: activeData,
|
|
64494
64412
|
parent: this._region.getInteractionMark(),
|
|
64495
|
-
customShape: pointSpec.customShape,
|
|
64496
64413
|
stateSort: pointSpec.stateSort
|
|
64414
|
+
}, {
|
|
64415
|
+
setCustomizedShape: pointSpec.customShape,
|
|
64416
|
+
morph: false
|
|
64497
64417
|
});
|
|
64498
64418
|
this._symbolActiveMark.setVisible(false);
|
|
64499
64419
|
}
|
|
@@ -64512,6 +64432,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
64512
64432
|
for (const state in this._symbolMark.stateStyle) {
|
|
64513
64433
|
this._symbolActiveMark.stateStyle[state] = {};
|
|
64514
64434
|
for (const key in this._symbolMark.stateStyle[state]) {
|
|
64435
|
+
if (key === 'visible') {
|
|
64436
|
+
continue;
|
|
64437
|
+
}
|
|
64515
64438
|
this._symbolActiveMark.stateStyle[state][key] = {
|
|
64516
64439
|
style: null,
|
|
64517
64440
|
level: AttributeLevel.Series,
|
|
@@ -64675,7 +64598,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
64675
64598
|
this.setAttribute(attr, styleConverter, state, level, stateStyle);
|
|
64676
64599
|
});
|
|
64677
64600
|
if (enableSegments) {
|
|
64678
|
-
this.
|
|
64601
|
+
this.setMarkConfig({
|
|
64602
|
+
enableSegments: true
|
|
64603
|
+
});
|
|
64679
64604
|
}
|
|
64680
64605
|
}
|
|
64681
64606
|
}
|
|
@@ -65517,11 +65442,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
65517
65442
|
const axisMark = this._createMark({ type: 'component', name: `axis-${this.getOrient()}` }, {
|
|
65518
65443
|
componentType: this.getOrient() === 'angle' ? 'circleAxis' : 'axis',
|
|
65519
65444
|
mode: this._spec.mode,
|
|
65520
|
-
noSeparateStyle: true
|
|
65445
|
+
noSeparateStyle: true
|
|
65446
|
+
}, {
|
|
65521
65447
|
skipTheme: true
|
|
65522
65448
|
});
|
|
65523
65449
|
this._axisMark = axisMark;
|
|
65524
|
-
axisMark.
|
|
65450
|
+
axisMark.setMarkConfig({ zIndex: this.layoutZIndex });
|
|
65525
65451
|
if (isValid$1(this._spec.id)) {
|
|
65526
65452
|
axisMark.setUserId(this._spec.id);
|
|
65527
65453
|
}
|
|
@@ -65530,16 +65456,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
65530
65456
|
const gridMark = this._createMark({ type: 'component', name: `axis-${this.getOrient()}-grid` }, {
|
|
65531
65457
|
componentType: this.getOrient() === 'angle' ? GridEnum.circleAxisGrid : GridEnum.lineAxisGrid,
|
|
65532
65458
|
mode: this._spec.mode,
|
|
65533
|
-
noSeparateStyle: true
|
|
65459
|
+
noSeparateStyle: true
|
|
65460
|
+
}, {
|
|
65534
65461
|
skipTheme: true
|
|
65535
65462
|
});
|
|
65536
|
-
gridMark.
|
|
65537
|
-
|
|
65463
|
+
gridMark.setMarkConfig({
|
|
65464
|
+
zIndex: (_f = (_d = (_c = (_b = this._spec.grid) === null || _b === void 0 ? void 0 : _b.style) === null || _c === void 0 ? void 0 : _c.zIndex) !== null && _d !== void 0 ? _d : (_e = this._spec.grid) === null || _e === void 0 ? void 0 : _e.zIndex) !== null && _f !== void 0 ? _f : LayoutZIndex.Axis_Grid,
|
|
65465
|
+
interactive: false
|
|
65466
|
+
});
|
|
65538
65467
|
this._marks.addMark(gridMark);
|
|
65539
65468
|
this._gridMark = gridMark;
|
|
65540
65469
|
}
|
|
65541
65470
|
if (isBoolean$1(this._spec.interactive)) {
|
|
65542
|
-
this._marks.forEach(m => m.
|
|
65471
|
+
this._marks.forEach(m => m.setMarkConfig({ interactive: this._spec.interactive }));
|
|
65543
65472
|
}
|
|
65544
65473
|
if (this._option.animation !== false &&
|
|
65545
65474
|
get$1(this._option.getChart().getSpec(), 'animation') !== false &&
|
|
@@ -65671,7 +65600,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
65671
65600
|
super.onLayoutEnd(ctx);
|
|
65672
65601
|
}
|
|
65673
65602
|
computeData(updateType) {
|
|
65674
|
-
if (
|
|
65603
|
+
if (updateType === 'force' && (!this._tickData || !this._tickData.length)) {
|
|
65604
|
+
eachSeries(this._regions, s => {
|
|
65605
|
+
var _a;
|
|
65606
|
+
(_a = s.getViewData()) === null || _a === void 0 ? void 0 : _a.reRunAllTransform();
|
|
65607
|
+
}, {
|
|
65608
|
+
userId: this._seriesUserId,
|
|
65609
|
+
specIndex: this._seriesIndex
|
|
65610
|
+
});
|
|
65611
|
+
}
|
|
65612
|
+
else if (this._tickData &&
|
|
65613
|
+
this._tickData.length &&
|
|
65614
|
+
(updateType === 'force' || !isEqual(this._scale.range(), [0, 1]))) {
|
|
65675
65615
|
this._tickData.forEach(tickData => {
|
|
65676
65616
|
tickData.getDataView().reRunAllTransform();
|
|
65677
65617
|
tickData.updateData();
|
|
@@ -69772,12 +69712,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
69772
69712
|
const seriesMark = (_b = this._spec.seriesMark) !== null && _b !== void 0 ? _b : 'area';
|
|
69773
69713
|
this._areaMark = this._createMark(AreaSeries.mark.area, {
|
|
69774
69714
|
groupKey: this._seriesField,
|
|
69775
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
69776
|
-
progressive,
|
|
69777
69715
|
isSeriesMark: isAreaVisible && seriesMark !== 'point',
|
|
69778
|
-
customShape: areaSpec.customShape,
|
|
69779
69716
|
stateSort: areaSpec.stateSort
|
|
69780
|
-
});
|
|
69717
|
+
}, Object.assign(Object.assign({}, progressive), { morphElementKey: this.getDimensionField()[0], setCustomizedShape: areaSpec.customShape }));
|
|
69781
69718
|
this.initSymbolMark(progressive, seriesMark === 'point');
|
|
69782
69719
|
}
|
|
69783
69720
|
initMarkStyle() {
|
|
@@ -70175,31 +70112,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70175
70112
|
}
|
|
70176
70113
|
initMark() {
|
|
70177
70114
|
var _a, _b;
|
|
70178
|
-
|
|
70115
|
+
this._initBarBackgroundMark();
|
|
70116
|
+
this._barMark = this._createMark(Object.assign(Object.assign({}, BarSeries.mark.bar), { name: this._barMarkName, type: this._barMarkType }), {
|
|
70117
|
+
groupKey: this._seriesField,
|
|
70118
|
+
isSeriesMark: true,
|
|
70119
|
+
stateSort: (_a = this._spec.bar) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
70120
|
+
}, {
|
|
70179
70121
|
progressiveStep: this._spec.progressiveStep,
|
|
70180
70122
|
progressiveThreshold: this._spec.progressiveThreshold,
|
|
70181
70123
|
large: this._spec.large,
|
|
70182
|
-
largeThreshold: this._spec.largeThreshold
|
|
70183
|
-
|
|
70184
|
-
this._initBarBackgroundMark(progressive);
|
|
70185
|
-
this._barMark = this._createMark(Object.assign(Object.assign({}, BarSeries.mark.bar), { name: this._barMarkName, type: this._barMarkType }), {
|
|
70124
|
+
largeThreshold: this._spec.largeThreshold,
|
|
70125
|
+
morphElementKey: this.getDimensionField()[0],
|
|
70186
70126
|
morph: shouldMarkDoMorph(this._spec, this._barMarkName),
|
|
70187
|
-
|
|
70188
|
-
groupKey: this._seriesField,
|
|
70189
|
-
isSeriesMark: true,
|
|
70190
|
-
progressive,
|
|
70191
|
-
customShape: (_a = this._spec.bar) === null || _a === void 0 ? void 0 : _a.customShape,
|
|
70192
|
-
stateSort: (_b = this._spec.bar) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
70127
|
+
setCustomizedShape: (_b = this._spec.bar) === null || _b === void 0 ? void 0 : _b.customShape
|
|
70193
70128
|
});
|
|
70194
70129
|
}
|
|
70195
|
-
_initBarBackgroundMark(
|
|
70130
|
+
_initBarBackgroundMark() {
|
|
70196
70131
|
if (this._spec.barBackground && this._spec.barBackground.visible) {
|
|
70197
70132
|
this._barBackgroundMark = this._createMark(BarSeries.mark.barBackground, {
|
|
70198
70133
|
dataView: this._barBackgroundViewData.getDataView(),
|
|
70199
70134
|
dataProductId: this._barBackgroundViewData.getProductId(),
|
|
70200
|
-
progressive,
|
|
70201
|
-
customShape: this._spec.barBackground.customShape,
|
|
70202
70135
|
stateSort: this._spec.barBackground.stateSort
|
|
70136
|
+
}, {
|
|
70137
|
+
setCustomizedShape: this._spec.barBackground.customShape,
|
|
70138
|
+
progressiveStep: this._spec.progressiveStep,
|
|
70139
|
+
progressiveThreshold: this._spec.progressiveThreshold,
|
|
70140
|
+
large: this._spec.large,
|
|
70141
|
+
largeThreshold: this._spec.largeThreshold
|
|
70203
70142
|
});
|
|
70204
70143
|
}
|
|
70205
70144
|
}
|
|
@@ -70452,51 +70391,54 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70452
70391
|
}
|
|
70453
70392
|
const xScale = (_b = (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0);
|
|
70454
70393
|
const yScale = (_d = (_c = this._yAxisHelper) === null || _c === void 0 ? void 0 : _c.getScale) === null || _d === void 0 ? void 0 : _d.call(_c, 0);
|
|
70455
|
-
this._barMark.
|
|
70456
|
-
|
|
70457
|
-
|
|
70458
|
-
|
|
70459
|
-
|
|
70460
|
-
|
|
70461
|
-
|
|
70462
|
-
|
|
70463
|
-
|
|
70464
|
-
|
|
70465
|
-
|
|
70466
|
-
|
|
70467
|
-
|
|
70468
|
-
|
|
70469
|
-
|
|
70470
|
-
|
|
70471
|
-
|
|
70472
|
-
|
|
70473
|
-
|
|
70474
|
-
|
|
70394
|
+
this._barMark.setMarkConfig({
|
|
70395
|
+
clip: true,
|
|
70396
|
+
clipPath: () => {
|
|
70397
|
+
const rectPaths = [];
|
|
70398
|
+
this._forEachStackGroup(node => {
|
|
70399
|
+
let min = Infinity;
|
|
70400
|
+
let max = -Infinity;
|
|
70401
|
+
let hasPercent = false;
|
|
70402
|
+
let minPercent = Infinity;
|
|
70403
|
+
let maxPercent = -Infinity;
|
|
70404
|
+
node.values.forEach(datum => {
|
|
70405
|
+
const start = datum[STACK_FIELD_START];
|
|
70406
|
+
const end = datum[STACK_FIELD_END];
|
|
70407
|
+
const startPercent = datum[STACK_FIELD_START_PERCENT];
|
|
70408
|
+
const endPercent = datum[STACK_FIELD_END_PERCENT];
|
|
70409
|
+
min = Math.min(min, start, end);
|
|
70410
|
+
max = Math.max(max, start, end);
|
|
70411
|
+
if (isValid$1(startPercent) && isValid$1(endPercent)) {
|
|
70412
|
+
hasPercent = true;
|
|
70413
|
+
minPercent = Math.min(minPercent, startPercent, endPercent);
|
|
70414
|
+
maxPercent = Math.max(maxPercent, startPercent, endPercent);
|
|
70415
|
+
}
|
|
70416
|
+
});
|
|
70417
|
+
const mockDatum = Object.assign(Object.assign(Object.assign({}, node.values[0]), { [STACK_FIELD_START]: min, [STACK_FIELD_END]: max }), (hasPercent
|
|
70418
|
+
? {
|
|
70419
|
+
[STACK_FIELD_START_PERCENT]: minPercent,
|
|
70420
|
+
[STACK_FIELD_END_PERCENT]: maxPercent
|
|
70421
|
+
}
|
|
70422
|
+
: undefined));
|
|
70423
|
+
const rectAttr = this.direction === "horizontal"
|
|
70424
|
+
? {
|
|
70425
|
+
x: this._getBarXStart(mockDatum, xScale),
|
|
70426
|
+
x1: this._getBarXEnd(mockDatum, xScale),
|
|
70427
|
+
y: this._getPosition(this.direction, mockDatum),
|
|
70428
|
+
height: this._getBarWidth(this._yAxisHelper)
|
|
70429
|
+
}
|
|
70430
|
+
: {
|
|
70431
|
+
y: this._getBarYStart(mockDatum, yScale),
|
|
70432
|
+
y1: this._getBarYEnd(mockDatum, yScale),
|
|
70433
|
+
x: this._getPosition(this.direction, mockDatum),
|
|
70434
|
+
width: this._getBarWidth(this._xAxisHelper)
|
|
70435
|
+
};
|
|
70436
|
+
rectPaths.push(createRect(Object.assign(Object.assign({}, rectAttr), { cornerRadius: isFunction$1(this._spec.stackCornerRadius)
|
|
70437
|
+
? this._spec.stackCornerRadius(rectAttr, mockDatum, this._markAttributeContext)
|
|
70438
|
+
: this._spec.stackCornerRadius, fill: true })));
|
|
70475
70439
|
});
|
|
70476
|
-
|
|
70477
|
-
|
|
70478
|
-
[STACK_FIELD_START_PERCENT]: minPercent,
|
|
70479
|
-
[STACK_FIELD_END_PERCENT]: maxPercent
|
|
70480
|
-
}
|
|
70481
|
-
: undefined));
|
|
70482
|
-
const rectAttr = this.direction === "horizontal"
|
|
70483
|
-
? {
|
|
70484
|
-
x: this._getBarXStart(mockDatum, xScale),
|
|
70485
|
-
x1: this._getBarXEnd(mockDatum, xScale),
|
|
70486
|
-
y: this._getPosition(this.direction, mockDatum),
|
|
70487
|
-
height: this._getBarWidth(this._yAxisHelper)
|
|
70488
|
-
}
|
|
70489
|
-
: {
|
|
70490
|
-
y: this._getBarYStart(mockDatum, yScale),
|
|
70491
|
-
y1: this._getBarYEnd(mockDatum, yScale),
|
|
70492
|
-
x: this._getPosition(this.direction, mockDatum),
|
|
70493
|
-
width: this._getBarWidth(this._xAxisHelper)
|
|
70494
|
-
};
|
|
70495
|
-
rectPaths.push(createRect(Object.assign(Object.assign({}, rectAttr), { cornerRadius: isFunction$1(this._spec.stackCornerRadius)
|
|
70496
|
-
? this._spec.stackCornerRadius(rectAttr, mockDatum, this._markAttributeContext)
|
|
70497
|
-
: this._spec.stackCornerRadius, fill: true })));
|
|
70498
|
-
});
|
|
70499
|
-
return rectPaths;
|
|
70440
|
+
return rectPaths;
|
|
70441
|
+
}
|
|
70500
70442
|
});
|
|
70501
70443
|
}
|
|
70502
70444
|
initLinearRectMarkStyle() {
|
|
@@ -70968,20 +70910,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70968
70910
|
}
|
|
70969
70911
|
initMark() {
|
|
70970
70912
|
var _a, _b;
|
|
70971
|
-
|
|
70913
|
+
this._symbolMark = this._createMark(ScatterSeries.mark.point, {
|
|
70914
|
+
groupKey: this._seriesField,
|
|
70915
|
+
isSeriesMark: true,
|
|
70916
|
+
stateSort: (_a = this._spec.point) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
70917
|
+
}, {
|
|
70972
70918
|
progressiveStep: this._spec.progressiveStep,
|
|
70973
70919
|
progressiveThreshold: this._spec.progressiveThreshold,
|
|
70974
70920
|
large: this._spec.large,
|
|
70975
|
-
largeThreshold: this._spec.largeThreshold
|
|
70976
|
-
};
|
|
70977
|
-
this._symbolMark = this._createMark(ScatterSeries.mark.point, {
|
|
70921
|
+
largeThreshold: this._spec.largeThreshold,
|
|
70978
70922
|
morph: shouldMarkDoMorph(this._spec, ScatterSeries.mark.point.name),
|
|
70979
|
-
|
|
70980
|
-
|
|
70981
|
-
progressive,
|
|
70982
|
-
isSeriesMark: true,
|
|
70983
|
-
customShape: (_a = this._spec.point) === null || _a === void 0 ? void 0 : _a.customShape,
|
|
70984
|
-
stateSort: (_b = this._spec.point) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
70923
|
+
morphElementKey: this.getDimensionField()[0],
|
|
70924
|
+
setCustomizedShape: (_b = this._spec.point) === null || _b === void 0 ? void 0 : _b.customShape
|
|
70985
70925
|
});
|
|
70986
70926
|
}
|
|
70987
70927
|
initMarkStyle() {
|
|
@@ -72273,6 +72213,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
72273
72213
|
});
|
|
72274
72214
|
});
|
|
72275
72215
|
}
|
|
72216
|
+
_compareSpec(spec, prevSpec) {
|
|
72217
|
+
const result = super._compareSpec(spec, prevSpec);
|
|
72218
|
+
if (!result.reMake) {
|
|
72219
|
+
result.reMake = ['roam', 'longitudeField', 'latitudeField', 'projection', 'zoomLimit'].some(k => {
|
|
72220
|
+
return !isEqual(prevSpec === null || prevSpec === void 0 ? void 0 : prevSpec[k], spec[k]);
|
|
72221
|
+
});
|
|
72222
|
+
}
|
|
72223
|
+
return result;
|
|
72224
|
+
}
|
|
72276
72225
|
release() {
|
|
72277
72226
|
super.release();
|
|
72278
72227
|
this._centerCache && this._centerCache.clear();
|
|
@@ -72370,13 +72319,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
72370
72319
|
}
|
|
72371
72320
|
initMark() {
|
|
72372
72321
|
this._pathMark = this._createMark(MapSeries.mark.area, {
|
|
72373
|
-
morph: shouldMarkDoMorph(this._spec, MapSeries.mark.area.name),
|
|
72374
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
72375
72322
|
groupKey: this.getDimensionField()[0],
|
|
72376
72323
|
isSeriesMark: true,
|
|
72377
72324
|
skipBeforeLayouted: true,
|
|
72378
72325
|
dataView: this._mapViewData.getDataView(),
|
|
72379
72326
|
dataProductId: this._mapViewData.getProductId()
|
|
72327
|
+
}, {
|
|
72328
|
+
morph: shouldMarkDoMorph(this._spec, MapSeries.mark.area.name),
|
|
72329
|
+
morphElementKey: this.getDimensionField()[0]
|
|
72380
72330
|
});
|
|
72381
72331
|
}
|
|
72382
72332
|
initMarkStyle() {
|
|
@@ -73412,8 +73362,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
73412
73362
|
super.initMark();
|
|
73413
73363
|
const leaderLine = this._createMark(WaterfallSeries.mark.leaderLine, {
|
|
73414
73364
|
key: 'index',
|
|
73415
|
-
|
|
73416
|
-
|
|
73365
|
+
stateSort: (_a = this._spec.leaderLine) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
73366
|
+
}, {
|
|
73367
|
+
setCustomizedShape: (_b = this._spec.leaderLine) === null || _b === void 0 ? void 0 : _b.customShape
|
|
73417
73368
|
});
|
|
73418
73369
|
if (leaderLine) {
|
|
73419
73370
|
this._leaderLineMark = leaderLine;
|
|
@@ -73805,15 +73756,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
73805
73756
|
largeThreshold: this._spec.largeThreshold
|
|
73806
73757
|
};
|
|
73807
73758
|
this._boxPlotMark = this._createMark(BoxPlotSeries.mark.boxPlot, {
|
|
73808
|
-
isSeriesMark: true
|
|
73809
|
-
|
|
73810
|
-
});
|
|
73759
|
+
isSeriesMark: true
|
|
73760
|
+
}, progressive);
|
|
73811
73761
|
this._outlierMark = this._createMark(BoxPlotSeries.mark.outlier, {
|
|
73812
|
-
progressive,
|
|
73813
73762
|
key: DEFAULT_DATA_INDEX,
|
|
73814
73763
|
dataView: this._outlierDataView.getDataView(),
|
|
73815
73764
|
dataProductId: this._outlierDataView.getProductId()
|
|
73816
|
-
});
|
|
73765
|
+
}, progressive);
|
|
73817
73766
|
}
|
|
73818
73767
|
initMarkStyle() {
|
|
73819
73768
|
var _a, _b, _c, _d, _e;
|
|
@@ -74257,12 +74206,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
74257
74206
|
this._initBarBackgroundMark();
|
|
74258
74207
|
const labelPosition = (_a = this._spec.label) === null || _a === void 0 ? void 0 : _a.position;
|
|
74259
74208
|
this._barMark = this._createMark(RangeColumnSeries.mark.bar, {
|
|
74260
|
-
morph: shouldMarkDoMorph(this._spec, RangeColumnSeries.mark.bar.name),
|
|
74261
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
74262
74209
|
groupKey: this._seriesField,
|
|
74263
74210
|
isSeriesMark: true,
|
|
74264
|
-
|
|
74265
|
-
|
|
74211
|
+
stateSort: (_b = this._spec.bar) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
74212
|
+
}, {
|
|
74213
|
+
setCustomizedShape: (_c = this._spec.bar) === null || _c === void 0 ? void 0 : _c.customShape,
|
|
74214
|
+
morph: shouldMarkDoMorph(this._spec, RangeColumnSeries.mark.bar.name),
|
|
74215
|
+
morphElementKey: this.getDimensionField()[0]
|
|
74266
74216
|
});
|
|
74267
74217
|
if (((_d = this._spec.label) === null || _d === void 0 ? void 0 : _d.visible) !== false && labelPosition === "bothEnd") {
|
|
74268
74218
|
if (((_f = (_e = this._spec.label) === null || _e === void 0 ? void 0 : _e.minLabel) === null || _f === void 0 ? void 0 : _f.visible) !== false) {
|
|
@@ -74449,11 +74399,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
74449
74399
|
var _a;
|
|
74450
74400
|
const { customShape, stateSort } = (_a = this._spec.area) !== null && _a !== void 0 ? _a : {};
|
|
74451
74401
|
this._areaMark = this._createMark(RangeAreaSeries.mark.area, {
|
|
74452
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
74453
74402
|
groupKey: this._seriesField,
|
|
74454
74403
|
isSeriesMark: true,
|
|
74455
|
-
customShape,
|
|
74456
74404
|
stateSort
|
|
74405
|
+
}, {
|
|
74406
|
+
setCustomizedShape: customShape,
|
|
74407
|
+
morphElementKey: this.getDimensionField()[0]
|
|
74457
74408
|
});
|
|
74458
74409
|
}
|
|
74459
74410
|
initMarkStyle() {
|
|
@@ -75211,14 +75162,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
75211
75162
|
initMark() {
|
|
75212
75163
|
var _a, _b;
|
|
75213
75164
|
this._pieMark = this._createMark(Object.assign(Object.assign({}, BasePieSeries.mark.pie), { name: this._pieMarkName, type: this._pieMarkType }), {
|
|
75214
|
-
morph: shouldMarkDoMorph(this._spec, this._pieMarkName),
|
|
75215
|
-
defaultMorphElementKey: this._seriesField,
|
|
75216
75165
|
key: DEFAULT_DATA_KEY,
|
|
75217
75166
|
groupKey: this._seriesField,
|
|
75218
75167
|
skipBeforeLayouted: true,
|
|
75219
75168
|
isSeriesMark: true,
|
|
75220
|
-
|
|
75221
|
-
|
|
75169
|
+
stateSort: (_a = this._spec.pie) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
75170
|
+
}, {
|
|
75171
|
+
setCustomizedShape: (_b = this._spec.pie) === null || _b === void 0 ? void 0 : _b.customShape,
|
|
75172
|
+
morph: shouldMarkDoMorph(this._spec, this._pieMarkName),
|
|
75173
|
+
morphElementKey: this._seriesField
|
|
75222
75174
|
});
|
|
75223
75175
|
if (this._showEmptyCircle) {
|
|
75224
75176
|
this._emptyArcMark = this._createMark({
|
|
@@ -75526,7 +75478,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
75526
75478
|
}
|
|
75527
75479
|
super.initLabelMarkStyle(textMark);
|
|
75528
75480
|
const params3d = {};
|
|
75529
|
-
textMark.
|
|
75481
|
+
textMark.setMarkConfig({ support3d: true });
|
|
75530
75482
|
params3d.beta = this._angle3d;
|
|
75531
75483
|
params3d.anchor3d = (datum) => {
|
|
75532
75484
|
const { x, y } = this.getCenter();
|
|
@@ -76161,12 +76113,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
76161
76113
|
initRoseMark() {
|
|
76162
76114
|
var _a, _b;
|
|
76163
76115
|
this._roseMark = this._createMark(RoseSeries.mark.rose, {
|
|
76164
|
-
morph: shouldMarkDoMorph(this._spec, RoseSeries.mark.rose.name),
|
|
76165
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
76166
76116
|
groupKey: this._seriesField,
|
|
76167
76117
|
isSeriesMark: true,
|
|
76168
|
-
|
|
76169
|
-
|
|
76118
|
+
stateSort: (_a = this._spec.rose) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
76119
|
+
}, {
|
|
76120
|
+
setCustomizedShape: (_b = this._spec.rose) === null || _b === void 0 ? void 0 : _b.customShape,
|
|
76121
|
+
morph: shouldMarkDoMorph(this._spec, RoseSeries.mark.rose.name),
|
|
76122
|
+
morphElementKey: this.getDimensionField()[0]
|
|
76170
76123
|
});
|
|
76171
76124
|
}
|
|
76172
76125
|
getRoseAngle() {
|
|
@@ -76515,11 +76468,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
76515
76468
|
var _a, _b;
|
|
76516
76469
|
this._areaMark = this._createMark(RadarSeries.mark.area, {
|
|
76517
76470
|
groupKey: this._seriesField,
|
|
76518
|
-
progressive,
|
|
76519
76471
|
isSeriesMark,
|
|
76520
|
-
|
|
76521
|
-
|
|
76522
|
-
});
|
|
76472
|
+
stateSort: (_a = this._spec.area) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
76473
|
+
}, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_b = this._spec.area) === null || _b === void 0 ? void 0 : _b.customShape }));
|
|
76523
76474
|
}
|
|
76524
76475
|
initAreaMarkStyle() {
|
|
76525
76476
|
const areaMark = this._areaMark;
|
|
@@ -76839,17 +76790,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
76839
76790
|
x: -this._spec.leftAppendPadding,
|
|
76840
76791
|
y: 0,
|
|
76841
76792
|
width: 10000,
|
|
76842
|
-
height: this._spec.clipHeight
|
|
76843
|
-
clip: true
|
|
76793
|
+
height: this._spec.clipHeight
|
|
76844
76794
|
}, 'normal', AttributeLevel.Series);
|
|
76845
|
-
clipMark.
|
|
76795
|
+
clipMark.setMarkConfig({ interactive: false, clip: true });
|
|
76846
76796
|
}
|
|
76847
76797
|
const containerMark = this._containerMark;
|
|
76848
76798
|
if (containerMark) {
|
|
76849
76799
|
this.setMarkStyle(containerMark, {
|
|
76850
76800
|
x: this._spec.leftAppendPadding
|
|
76851
76801
|
}, 'normal', AttributeLevel.Series);
|
|
76852
|
-
containerMark.
|
|
76802
|
+
containerMark.setMarkConfig({ interactive: false });
|
|
76853
76803
|
}
|
|
76854
76804
|
const gridBackgroundMark = this._gridBackgroundMark;
|
|
76855
76805
|
if (gridBackgroundMark) {
|
|
@@ -77201,10 +77151,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77201
77151
|
x: -this._spec.leftAppendPadding,
|
|
77202
77152
|
y: 0,
|
|
77203
77153
|
width: 10000,
|
|
77204
|
-
height: this._spec.clipHeight
|
|
77205
|
-
clip: true
|
|
77154
|
+
height: this._spec.clipHeight
|
|
77206
77155
|
}, 'normal', AttributeLevel.Series);
|
|
77207
|
-
clipMark.
|
|
77156
|
+
clipMark.setMarkConfig({ interactive: false, clip: true });
|
|
77208
77157
|
}
|
|
77209
77158
|
const containerMark = this._containerMark;
|
|
77210
77159
|
if (containerMark) {
|
|
@@ -77212,7 +77161,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77212
77161
|
x: this._spec.leftAppendPadding,
|
|
77213
77162
|
width: this.getLayoutRect().width
|
|
77214
77163
|
}, 'normal', AttributeLevel.Series);
|
|
77215
|
-
containerMark.
|
|
77164
|
+
containerMark.setMarkConfig({ interactive: false });
|
|
77216
77165
|
}
|
|
77217
77166
|
const linkMark = this._linkMark;
|
|
77218
77167
|
if (linkMark) {
|
|
@@ -77510,38 +77459,41 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77510
77459
|
}
|
|
77511
77460
|
_initArcGroupMarkStyle() {
|
|
77512
77461
|
const groupMark = this._arcGroupMark;
|
|
77513
|
-
groupMark.setZIndex(this.layoutZIndex);
|
|
77514
77462
|
groupMark.created();
|
|
77515
77463
|
this.setMarkStyle(groupMark, {
|
|
77516
77464
|
x: 0,
|
|
77517
77465
|
y: 0
|
|
77518
77466
|
}, 'normal', AttributeLevel.Series);
|
|
77519
|
-
|
|
77520
|
-
|
|
77521
|
-
|
|
77522
|
-
|
|
77523
|
-
|
|
77524
|
-
const
|
|
77525
|
-
|
|
77526
|
-
|
|
77527
|
-
|
|
77528
|
-
|
|
77529
|
-
const
|
|
77530
|
-
const
|
|
77531
|
-
|
|
77532
|
-
|
|
77533
|
-
|
|
77467
|
+
this._arcGroupMark.setMarkConfig({
|
|
77468
|
+
interactive: false,
|
|
77469
|
+
zIndex: this.layoutZIndex,
|
|
77470
|
+
clip: true,
|
|
77471
|
+
clipPath: () => {
|
|
77472
|
+
const axis = this._getAngleAxis();
|
|
77473
|
+
if (this._isTickMaskVisible(axis)) {
|
|
77474
|
+
const { tickMask } = this._spec;
|
|
77475
|
+
const { angle, offsetAngle, style = {} } = tickMask;
|
|
77476
|
+
const subTickData = this._getAngleAxisSubTickData(axis);
|
|
77477
|
+
const { x, y } = this.angleAxisHelper.center();
|
|
77478
|
+
const radius = this._computeLayoutRadius();
|
|
77479
|
+
const markStyle = style;
|
|
77480
|
+
return subTickData.map(({ value }) => {
|
|
77481
|
+
const pos = this.angleAxisHelper.dataToPosition([value]) + degreeToRadian(offsetAngle);
|
|
77482
|
+
const angleUnit = degreeToRadian(angle) / 2;
|
|
77483
|
+
return createArc(Object.assign(Object.assign({}, markStyle), { x,
|
|
77484
|
+
y, startAngle: pos - angleUnit, endAngle: pos + angleUnit, innerRadius: radius * this._innerRadius, outerRadius: radius * this._outerRadius, fill: true }));
|
|
77485
|
+
});
|
|
77486
|
+
}
|
|
77487
|
+
const { width, height } = this.getLayoutRect();
|
|
77488
|
+
return [
|
|
77489
|
+
createRect({
|
|
77490
|
+
width,
|
|
77491
|
+
height,
|
|
77492
|
+
fill: true
|
|
77493
|
+
})
|
|
77494
|
+
];
|
|
77534
77495
|
}
|
|
77535
|
-
const { width, height } = this.getLayoutRect();
|
|
77536
|
-
return [
|
|
77537
|
-
createRect({
|
|
77538
|
-
width,
|
|
77539
|
-
height,
|
|
77540
|
-
fill: true
|
|
77541
|
-
})
|
|
77542
|
-
];
|
|
77543
77496
|
});
|
|
77544
|
-
this._arcGroupMark.setInteractive(false);
|
|
77545
77497
|
}
|
|
77546
77498
|
_getAngleAxis() {
|
|
77547
77499
|
if (!this.angleAxisHelper) {
|
|
@@ -77677,8 +77629,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77677
77629
|
this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {
|
|
77678
77630
|
parent: this._arcGroupMark,
|
|
77679
77631
|
isSeriesMark: true,
|
|
77680
|
-
|
|
77681
|
-
|
|
77632
|
+
stateSort: (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
77633
|
+
}, {
|
|
77634
|
+
setCustomizedShape: (_b = this._spec.progress) === null || _b === void 0 ? void 0 : _b.customShape
|
|
77682
77635
|
});
|
|
77683
77636
|
return this._progressMark;
|
|
77684
77637
|
}
|
|
@@ -77720,8 +77673,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77720
77673
|
var _a, _b;
|
|
77721
77674
|
this._trackMark = this._createMark(CircularProgressSeries.mark.track, {
|
|
77722
77675
|
parent: this._arcGroupMark,
|
|
77723
|
-
|
|
77724
|
-
|
|
77676
|
+
stateSort: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
77677
|
+
}, {
|
|
77678
|
+
setCustomizedShape: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.customShape
|
|
77725
77679
|
});
|
|
77726
77680
|
return this._trackMark;
|
|
77727
77681
|
}
|
|
@@ -77914,8 +77868,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77914
77868
|
var _a, _b, _c;
|
|
77915
77869
|
this._progressMark = this._createMark(LinearProgressSeries.mark.progress, {
|
|
77916
77870
|
isSeriesMark: true,
|
|
77917
|
-
|
|
77918
|
-
|
|
77871
|
+
stateSort: (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
77872
|
+
}, {
|
|
77873
|
+
setCustomizedShape: (_c = (_b = this._spec.progress) === null || _b === void 0 ? void 0 : _b.customShape) !== null && _c !== void 0 ? _c : this._defaultProgressCustomShape
|
|
77919
77874
|
});
|
|
77920
77875
|
return this._progressMark;
|
|
77921
77876
|
}
|
|
@@ -77964,8 +77919,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77964
77919
|
_initTrackMark() {
|
|
77965
77920
|
var _a, _b;
|
|
77966
77921
|
this._trackMark = this._createMark(LinearProgressSeries.mark.track, {
|
|
77967
|
-
|
|
77968
|
-
|
|
77922
|
+
stateSort: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
77923
|
+
}, {
|
|
77924
|
+
setCustomizedShape: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.customShape
|
|
77969
77925
|
});
|
|
77970
77926
|
return this._trackMark;
|
|
77971
77927
|
}
|
|
@@ -78154,9 +78110,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
78154
78110
|
}
|
|
78155
78111
|
this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {
|
|
78156
78112
|
key: DEFAULT_DATA_KEY,
|
|
78157
|
-
defaultMorphElementKey: this._seriesField,
|
|
78158
78113
|
groupKey: this._seriesField,
|
|
78159
78114
|
isSeriesMark: true
|
|
78115
|
+
}, {
|
|
78116
|
+
morphElementKey: this._seriesField
|
|
78160
78117
|
});
|
|
78161
78118
|
}
|
|
78162
78119
|
initMarkStyle() {
|
|
@@ -80350,8 +80307,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80350
80307
|
initMark() {
|
|
80351
80308
|
this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {
|
|
80352
80309
|
groupKey: this._seriesField,
|
|
80353
|
-
support3d: true,
|
|
80354
80310
|
isSeriesMark: true
|
|
80311
|
+
}, {
|
|
80312
|
+
support3d: true
|
|
80355
80313
|
});
|
|
80356
80314
|
}
|
|
80357
80315
|
initMarkStyle() {
|
|
@@ -80624,13 +80582,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80624
80582
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
80625
80583
|
this._funnelMark = this._createMark(Object.assign(Object.assign({}, FunnelSeries.mark.funnel), { name: this._funnelMarkName, type: this._funnelMarkType }), {
|
|
80626
80584
|
themeSpec: (_a = this._theme) === null || _a === void 0 ? void 0 : _a.funnel,
|
|
80627
|
-
morph: shouldMarkDoMorph(this._spec, this._funnelMarkName),
|
|
80628
|
-
defaultMorphElementKey: this._seriesField,
|
|
80629
80585
|
groupKey: this._seriesField,
|
|
80630
80586
|
isSeriesMark: true,
|
|
80631
|
-
|
|
80632
|
-
stateSort: (_c = this._spec.funnel) === null || _c === void 0 ? void 0 : _c.stateSort,
|
|
80587
|
+
stateSort: (_b = this._spec.funnel) === null || _b === void 0 ? void 0 : _b.stateSort,
|
|
80633
80588
|
noSeparateStyle: true
|
|
80589
|
+
}, {
|
|
80590
|
+
setCustomizedShape: (_c = this._spec.funnel) === null || _c === void 0 ? void 0 : _c.customShape,
|
|
80591
|
+
morph: shouldMarkDoMorph(this._spec, this._funnelMarkName),
|
|
80592
|
+
morphElementKey: this._seriesField
|
|
80634
80593
|
});
|
|
80635
80594
|
if (this._spec.isTransform) {
|
|
80636
80595
|
this._funnelTransformMark = this._createMark(Object.assign(Object.assign({}, FunnelSeries.mark.transform), { name: this._transformMarkName, type: this._transformMarkType }), {
|
|
@@ -80638,9 +80597,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80638
80597
|
skipBeforeLayouted: false,
|
|
80639
80598
|
dataView: this._viewDataTransform.getDataView(),
|
|
80640
80599
|
dataProductId: this._viewDataTransform.getProductId(),
|
|
80641
|
-
|
|
80642
|
-
stateSort: (_f = this._spec.transform) === null || _f === void 0 ? void 0 : _f.stateSort,
|
|
80600
|
+
stateSort: (_e = this._spec.transform) === null || _e === void 0 ? void 0 : _e.stateSort,
|
|
80643
80601
|
noSeparateStyle: true
|
|
80602
|
+
}, {
|
|
80603
|
+
setCustomizedShape: (_f = this._spec.transform) === null || _f === void 0 ? void 0 : _f.customShape
|
|
80644
80604
|
});
|
|
80645
80605
|
}
|
|
80646
80606
|
if ((_h = (_g = this._spec) === null || _g === void 0 ? void 0 : _g.outerLabel) === null || _h === void 0 ? void 0 : _h.visible) {
|
|
@@ -81205,7 +81165,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
81205
81165
|
this._funnelMark = this._createMark(Object.assign(Object.assign({}, Funnel3dSeries.mark.funnel3d), { name: this._funnelMarkName, type: this._funnelMarkType }), {
|
|
81206
81166
|
themeSpec: (_a = this._theme) === null || _a === void 0 ? void 0 : _a.funnel3d,
|
|
81207
81167
|
key: this._seriesField,
|
|
81208
|
-
isSeriesMark: true
|
|
81168
|
+
isSeriesMark: true
|
|
81169
|
+
}, {
|
|
81209
81170
|
support3d: true
|
|
81210
81171
|
});
|
|
81211
81172
|
if (this._spec.isTransform) {
|
|
@@ -82425,8 +82386,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
82425
82386
|
}
|
|
82426
82387
|
const sunburstMark = this._createMark(SunburstSeries.mark.sunburst, {
|
|
82427
82388
|
isSeriesMark: true,
|
|
82428
|
-
|
|
82429
|
-
|
|
82389
|
+
stateSort: (_a = this._spec.sunburst) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
82390
|
+
}, {
|
|
82391
|
+
setCustomizedShape: (_b = this._spec.sunburst) === null || _b === void 0 ? void 0 : _b.customShape
|
|
82430
82392
|
});
|
|
82431
82393
|
this._sunburstMark = sunburstMark;
|
|
82432
82394
|
}
|
|
@@ -82713,8 +82675,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
82713
82675
|
return;
|
|
82714
82676
|
}
|
|
82715
82677
|
const circlePacking = this._createMark(CirclePackingSeries.mark.circlePacking, {
|
|
82716
|
-
isSeriesMark: true
|
|
82717
|
-
|
|
82678
|
+
isSeriesMark: true
|
|
82679
|
+
}, {
|
|
82680
|
+
setCustomizedShape: (_b = this._spec.circlePacking) === null || _b === void 0 ? void 0 : _b.customShape
|
|
82718
82681
|
});
|
|
82719
82682
|
this._circlePackingMark = circlePacking;
|
|
82720
82683
|
}
|
|
@@ -84211,18 +84174,20 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
84211
84174
|
isSeriesMark: true,
|
|
84212
84175
|
dataView: this._nodesSeriesData.getDataView(),
|
|
84213
84176
|
dataProductId: this._nodesSeriesData.getProductId(),
|
|
84214
|
-
|
|
84215
|
-
|
|
84177
|
+
stateSort: (_a = this._spec.node) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
84178
|
+
}, {
|
|
84179
|
+
setCustomizedShape: (_b = this._spec.node) === null || _b === void 0 ? void 0 : _b.customShape
|
|
84216
84180
|
});
|
|
84217
84181
|
if (nodeMark) {
|
|
84218
|
-
nodeMark.
|
|
84182
|
+
nodeMark.setMarkConfig({ zIndex: this._nodeLayoutZIndex });
|
|
84219
84183
|
this._nodeMark = nodeMark;
|
|
84220
84184
|
}
|
|
84221
84185
|
const linkMark = this._createMark(SankeySeries.mark.link, {
|
|
84222
84186
|
dataView: this._linksSeriesData.getDataView(),
|
|
84223
84187
|
dataProductId: this._linksSeriesData.getProductId(),
|
|
84224
|
-
|
|
84225
|
-
|
|
84188
|
+
stateSort: (_c = this._spec.link) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
84189
|
+
}, {
|
|
84190
|
+
setCustomizedShape: (_d = this._spec.link) === null || _d === void 0 ? void 0 : _d.customShape
|
|
84226
84191
|
});
|
|
84227
84192
|
if (linkMark) {
|
|
84228
84193
|
this._linkMark = linkMark;
|
|
@@ -84311,7 +84276,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
84311
84276
|
maxLineWidth: labelSpec.limit
|
|
84312
84277
|
});
|
|
84313
84278
|
}
|
|
84314
|
-
labelMark.
|
|
84279
|
+
labelMark.setMarkConfig({ zIndex: this._labelLayoutZIndex });
|
|
84315
84280
|
}
|
|
84316
84281
|
_createText(datum, labelSpec) {
|
|
84317
84282
|
if (isNil$1(datum) || isNil$1(datum.datum)) {
|
|
@@ -84805,8 +84770,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
84805
84770
|
var _a, _b, _c, _d;
|
|
84806
84771
|
const nonLeafMark = this._createMark(TreemapSeries.mark.nonLeaf, {
|
|
84807
84772
|
isSeriesMark: true,
|
|
84808
|
-
|
|
84809
|
-
|
|
84773
|
+
stateSort: (_a = this._spec.nonLeaf) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
84774
|
+
}, {
|
|
84775
|
+
setCustomizedShape: (_b = this._spec.nonLeaf) === null || _b === void 0 ? void 0 : _b.customShape
|
|
84810
84776
|
});
|
|
84811
84777
|
if (nonLeafMark) {
|
|
84812
84778
|
nonLeafMark.setTransform([
|
|
@@ -84821,8 +84787,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
84821
84787
|
}
|
|
84822
84788
|
const leafMark = this._createMark(TreemapSeries.mark.leaf, {
|
|
84823
84789
|
isSeriesMark: true,
|
|
84824
|
-
|
|
84825
|
-
|
|
84790
|
+
stateSort: (_c = this._spec.leaf) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
84791
|
+
}, {
|
|
84792
|
+
setCustomizedShape: (_d = this._spec.leaf) === null || _d === void 0 ? void 0 : _d.customShape
|
|
84826
84793
|
});
|
|
84827
84794
|
if (leafMark) {
|
|
84828
84795
|
leafMark.setTransform([
|
|
@@ -85486,18 +85453,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
85486
85453
|
largeThreshold: this._spec.largeThreshold
|
|
85487
85454
|
};
|
|
85488
85455
|
this._cellMark = this._createMark(HeatmapSeries.mark.cell, {
|
|
85489
|
-
morph: shouldMarkDoMorph(this._spec, HeatmapSeries.mark.cell.name),
|
|
85490
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
85491
85456
|
isSeriesMark: true,
|
|
85492
|
-
|
|
85493
|
-
|
|
85494
|
-
stateSort: (_b = this._spec.cell) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
85495
|
-
});
|
|
85457
|
+
stateSort: (_a = this._spec.cell) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
85458
|
+
}, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_b = this._spec.cell) === null || _b === void 0 ? void 0 : _b.customShape, morph: shouldMarkDoMorph(this._spec, HeatmapSeries.mark.cell.name), morphElementKey: this.getDimensionField()[0] }));
|
|
85496
85459
|
this._backgroundMark = this._createMark(HeatmapSeries.mark.cellBackground, {
|
|
85497
|
-
|
|
85498
|
-
|
|
85499
|
-
stateSort: (_d = this._spec.cellBackground) === null || _d === void 0 ? void 0 : _d.stateSort
|
|
85500
|
-
});
|
|
85460
|
+
stateSort: (_c = this._spec.cellBackground) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
85461
|
+
}, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_d = this._spec.cellBackground) === null || _d === void 0 ? void 0 : _d.customShape }));
|
|
85501
85462
|
}
|
|
85502
85463
|
initMarkStyle() {
|
|
85503
85464
|
this.initCellMarkStyle();
|
|
@@ -85912,11 +85873,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
85912
85873
|
groupKey: this._seriesField,
|
|
85913
85874
|
isSeriesMark: true,
|
|
85914
85875
|
key: DEFAULT_DATA_INDEX,
|
|
85915
|
-
|
|
85916
|
-
|
|
85876
|
+
stateSort: (_a = this._spec.nodePoint) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
85877
|
+
}, {
|
|
85878
|
+
setCustomizedShape: (_b = this._spec.nodePoint) === null || _b === void 0 ? void 0 : _b.customShape
|
|
85917
85879
|
});
|
|
85918
85880
|
if (nodePointMark) {
|
|
85919
|
-
nodePointMark.
|
|
85881
|
+
nodePointMark.setMarkConfig({ zIndex: LayoutZIndex.Node });
|
|
85920
85882
|
this._nodePointMark = nodePointMark;
|
|
85921
85883
|
}
|
|
85922
85884
|
const ripplePointMark = this._createMark(CorrelationSeries.mark.ripplePoint, {
|
|
@@ -85931,11 +85893,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
85931
85893
|
key: DEFAULT_DATA_INDEX,
|
|
85932
85894
|
dataView: this._centerSeriesData.getDataView(),
|
|
85933
85895
|
dataProductId: this._centerSeriesData.getProductId(),
|
|
85934
|
-
|
|
85935
|
-
|
|
85896
|
+
stateSort: (_c = this._spec.centerPoint) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
85897
|
+
}, {
|
|
85898
|
+
setCustomizedShape: (_d = this._spec.centerPoint) === null || _d === void 0 ? void 0 : _d.customShape
|
|
85936
85899
|
});
|
|
85937
85900
|
if (centerPointMark) {
|
|
85938
|
-
centerPointMark.
|
|
85901
|
+
centerPointMark.setMarkConfig({ zIndex: LayoutZIndex.Node });
|
|
85939
85902
|
this._centerPointMark = centerPointMark;
|
|
85940
85903
|
}
|
|
85941
85904
|
}
|
|
@@ -86363,7 +86326,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
86363
86326
|
}
|
|
86364
86327
|
_initLiquidOutlineMarkStyle() {
|
|
86365
86328
|
const liquidOutlineMark = this._liquidOutlineMark;
|
|
86366
|
-
liquidOutlineMark.setZIndex(this.layoutZIndex);
|
|
86367
86329
|
liquidOutlineMark.created();
|
|
86368
86330
|
this.setMarkStyle(liquidOutlineMark, {
|
|
86369
86331
|
stroke: this.getColorAttribute(),
|
|
@@ -86371,19 +86333,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
86371
86333
|
height: () => this._region.getLayoutRect().height,
|
|
86372
86334
|
path: () => this._getLiquidBackPath(true)
|
|
86373
86335
|
}, 'normal', AttributeLevel.Series);
|
|
86374
|
-
this._liquidOutlineMark.
|
|
86336
|
+
this._liquidOutlineMark.setMarkConfig({ interactive: false, zIndex: this.layoutZIndex });
|
|
86375
86337
|
}
|
|
86376
86338
|
_initLiquidBackgroundMarkStyle() {
|
|
86377
86339
|
const liquidBackgroundMark = this._liquidBackgroundMark;
|
|
86378
|
-
liquidBackgroundMark.setZIndex(this.layoutZIndex);
|
|
86379
86340
|
liquidBackgroundMark.created();
|
|
86380
86341
|
this.setMarkStyle(liquidBackgroundMark, {
|
|
86381
|
-
clip: true,
|
|
86382
86342
|
width: () => this._region.getLayoutRect().width,
|
|
86383
86343
|
height: () => this._region.getLayoutRect().height,
|
|
86384
86344
|
path: () => this._getLiquidBackPath()
|
|
86385
86345
|
}, 'normal', AttributeLevel.Series);
|
|
86386
|
-
this._liquidBackgroundMark.
|
|
86346
|
+
this._liquidBackgroundMark.setMarkConfig({ interactive: false, zIndex: this.layoutZIndex, clip: true });
|
|
86387
86347
|
}
|
|
86388
86348
|
_initLiquidMarkStyle() {
|
|
86389
86349
|
const liquidMark = this._liquidMark;
|
|
@@ -91017,21 +90977,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
91017
90977
|
return;
|
|
91018
90978
|
}
|
|
91019
90979
|
const trigger = array((_a = this._spec.trigger) !== null && _a !== void 0 ? _a : 'hover');
|
|
90980
|
+
const triggerOff = array(this._spec.triggerOff);
|
|
91020
90981
|
const mode = this._option.mode;
|
|
91021
|
-
|
|
91022
|
-
|
|
91023
|
-
|
|
91024
|
-
|
|
91025
|
-
this._mountEvent('
|
|
90982
|
+
trigger.forEach(triggerType => {
|
|
90983
|
+
var _a;
|
|
90984
|
+
if (triggerType === 'hover') {
|
|
90985
|
+
this._handleMouseMove = this._throttle(this._getMouseMoveHandler(false));
|
|
90986
|
+
this._mountEvent('pointermove', { source: 'chart' }, this._handleMouseMove);
|
|
90987
|
+
if (isMobileLikeMode(mode) || isMiniAppLikeMode(mode)) {
|
|
90988
|
+
this._mountEvent('pointerdown', { source: 'chart' }, this._getMouseMoveHandler(false));
|
|
90989
|
+
this._mountEvent('pointerup', { source: 'window' }, this._getMouseOutHandler(true));
|
|
90990
|
+
}
|
|
90991
|
+
this._mountEvent('pointerleave', { source: 'chart' }, this._getMouseOutHandler(false));
|
|
90992
|
+
}
|
|
90993
|
+
else if (triggerType === 'click') {
|
|
90994
|
+
this._mountEvent('pointertap', { source: 'chart' }, this._getMouseMoveHandler(true));
|
|
91026
90995
|
this._mountEvent('pointerup', { source: 'window' }, this._getMouseOutHandler(true));
|
|
91027
90996
|
}
|
|
91028
|
-
|
|
91029
|
-
|
|
91030
|
-
|
|
91031
|
-
|
|
91032
|
-
|
|
91033
|
-
|
|
91034
|
-
|
|
90997
|
+
else if (isObject$2(triggerType)) {
|
|
90998
|
+
this._mountEvent(triggerType.eventType, { source: (_a = triggerType.source) !== null && _a !== void 0 ? _a : 'chart', consume: triggerType.consume }, this._getMouseMoveHandler(true));
|
|
90999
|
+
}
|
|
91000
|
+
});
|
|
91001
|
+
const offEvents = triggerOff.filter(entry => isObject$2(entry));
|
|
91002
|
+
offEvents.forEach(entry => {
|
|
91003
|
+
var _a, _b;
|
|
91004
|
+
this._mountEvent(entry.eventType, { source: (_a = entry.source) !== null && _a !== void 0 ? _a : 'chart', consume: entry.consume }, this._getMouseOutHandler((_b = entry.checkOutside) !== null && _b !== void 0 ? _b : false));
|
|
91005
|
+
});
|
|
91006
|
+
if (!trigger.includes('click') && this._spec.lockAfterClick) {
|
|
91035
91007
|
this._mountEvent('pointertap', { source: 'chart' }, this._handleClickToLock);
|
|
91036
91008
|
}
|
|
91037
91009
|
}
|
|
@@ -92819,7 +92791,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
92819
92791
|
if (this._auto) {
|
|
92820
92792
|
(_b = (_a = this._component) === null || _a === void 0 ? void 0 : _a.setStartAndEnd) === null || _b === void 0 ? void 0 : _b.call(_a, this._start, this._end);
|
|
92821
92793
|
}
|
|
92822
|
-
axis.effect.scaleUpdate(
|
|
92794
|
+
axis.effect.scaleUpdate({
|
|
92795
|
+
value: 'force'
|
|
92796
|
+
});
|
|
92823
92797
|
}
|
|
92824
92798
|
else {
|
|
92825
92799
|
eachSeries(this._regions, s => {
|
|
@@ -96488,13 +96462,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
96488
96462
|
if (this._layoutRule === 'region') {
|
|
96489
96463
|
const component = this._createMark({ type: "component", name: `${region.getGroupMark().name}-label-component` }, {
|
|
96490
96464
|
componentType: 'label',
|
|
96491
|
-
noSeparateStyle: true
|
|
96465
|
+
noSeparateStyle: true
|
|
96466
|
+
}, {
|
|
96492
96467
|
support3d: this._spec.support3d
|
|
96493
96468
|
});
|
|
96494
96469
|
if (component) {
|
|
96495
96470
|
component.setSkipBeforeLayouted(true);
|
|
96496
96471
|
if (regionLabelInfo[0] && isValid$1(regionLabelInfo[0].labelSpec.zIndex)) {
|
|
96497
|
-
component.
|
|
96472
|
+
component.setMarkConfig({ zIndex: regionLabelInfo[0].labelSpec.zIndex });
|
|
96498
96473
|
}
|
|
96499
96474
|
this._marks.addMark(component);
|
|
96500
96475
|
this._labelComponentMap.set(component, () => {
|
|
@@ -96506,12 +96481,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
96506
96481
|
regionLabelInfo.forEach((labelInfo, i) => {
|
|
96507
96482
|
const component = this._createMark({ type: "component", name: `${labelInfo.labelMark.name}-component` }, {
|
|
96508
96483
|
componentType: 'label',
|
|
96509
|
-
noSeparateStyle: true
|
|
96510
|
-
|
|
96484
|
+
noSeparateStyle: true
|
|
96485
|
+
}, {
|
|
96486
|
+
support3d: labelInfo.baseMark.getMarkConfig().support3d
|
|
96511
96487
|
});
|
|
96512
96488
|
if (component) {
|
|
96513
96489
|
if (isValid$1(labelInfo.labelSpec.zIndex)) {
|
|
96514
|
-
component.
|
|
96490
|
+
component.setMarkConfig({ zIndex: labelInfo.labelSpec.zIndex });
|
|
96515
96491
|
}
|
|
96516
96492
|
component.setSkipBeforeLayouted(true);
|
|
96517
96493
|
this._marks.addMark(component);
|
|
@@ -96722,7 +96698,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
96722
96698
|
const series = this._getSeries();
|
|
96723
96699
|
const component = this._createMark({ type: "component", name: `${series.name}-total-label-component` }, {
|
|
96724
96700
|
componentType: 'label',
|
|
96725
|
-
noSeparateStyle: true
|
|
96701
|
+
noSeparateStyle: true
|
|
96702
|
+
}, {
|
|
96726
96703
|
support3d: this._spec.support3d
|
|
96727
96704
|
});
|
|
96728
96705
|
if (component) {
|