@visactor/vchart 1.12.9 → 1.12.10
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 +365 -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/chart/index.js +1 -2
- 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/component/axis/base-axis.d.ts +1 -0
- package/cjs/component/axis/base-axis.js +35 -22
- package/cjs/component/axis/base-axis.js.map +1 -1
- package/cjs/component/axis/cartesian/axis.d.ts +1 -0
- package/cjs/component/axis/cartesian/axis.js +3 -0
- package/cjs/component/axis/cartesian/axis.js.map +1 -1
- package/cjs/component/axis/polar/axis.d.ts +1 -0
- package/cjs/component/axis/polar/axis.js +5 -1
- package/cjs/component/axis/polar/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/constant/layout.js +2 -1
- package/cjs/constant/scatter.js +1 -2
- 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/data/register.js +2 -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/interface.d.ts +3 -3
- package/cjs/series/pie/interface.js.map +1 -1
- package/cjs/series/pie/pie.js +10 -9
- 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/chart/index.js +1 -2
- 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/component/axis/base-axis.d.ts +1 -0
- package/esm/component/axis/base-axis.js +30 -18
- package/esm/component/axis/base-axis.js.map +1 -1
- package/esm/component/axis/cartesian/axis.d.ts +1 -0
- package/esm/component/axis/cartesian/axis.js +3 -0
- package/esm/component/axis/cartesian/axis.js.map +1 -1
- package/esm/component/axis/polar/axis.d.ts +1 -0
- package/esm/component/axis/polar/axis.js +5 -1
- package/esm/component/axis/polar/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/constant/layout.js +2 -1
- package/esm/constant/scatter.js +1 -2
- 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/data/register.js +2 -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/interface.d.ts +3 -3
- package/esm/series/pie/interface.js.map +1 -1
- package/esm/series/pie/pie.js +11 -8
- 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 +19 -19
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;
|
|
@@ -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
|
}
|
|
@@ -57612,10 +57617,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
57612
57617
|
m.compile({ group });
|
|
57613
57618
|
});
|
|
57614
57619
|
}
|
|
57615
|
-
_createMark(markInfo, option = {}) {
|
|
57620
|
+
_createMark(markInfo, option = {}, config) {
|
|
57616
57621
|
const { type, name } = markInfo;
|
|
57617
57622
|
const m = Factory$1.createMark(type, name, Object.assign({ model: this, map: this._option.map, getCompiler: this.getCompiler, globalScale: this._option.globalScale }, option));
|
|
57618
|
-
|
|
57623
|
+
if (m) {
|
|
57624
|
+
m.created();
|
|
57625
|
+
config && m.setMarkConfig(config);
|
|
57626
|
+
}
|
|
57619
57627
|
return m;
|
|
57620
57628
|
}
|
|
57621
57629
|
_getDataIdKey() {
|
|
@@ -58173,8 +58181,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
58173
58181
|
this._groupMark.addMark(mark);
|
|
58174
58182
|
}
|
|
58175
58183
|
});
|
|
58176
|
-
this._backgroundMark && this._backgroundMark.
|
|
58177
|
-
this._foregroundMark && this._foregroundMark.
|
|
58184
|
+
this._backgroundMark && this._backgroundMark.setMarkConfig({ zIndex: LayoutZIndex.SeriesGroup - 1 });
|
|
58185
|
+
this._foregroundMark && this._foregroundMark.setMarkConfig({ zIndex: LayoutZIndex.Mark + 1 });
|
|
58178
58186
|
}
|
|
58179
58187
|
this.createTrigger();
|
|
58180
58188
|
}
|
|
@@ -58182,7 +58190,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
58182
58190
|
var _a, _b;
|
|
58183
58191
|
const groupMark = this._createMark({ type: "group", name });
|
|
58184
58192
|
groupMark.setUserId(userId);
|
|
58185
|
-
groupMark.
|
|
58193
|
+
groupMark.setMarkConfig({ zIndex });
|
|
58186
58194
|
const clip = (_a = this._spec.clip) !== null && _a !== void 0 ? _a : this._getClipDefaultValue();
|
|
58187
58195
|
this.setMarkStyle(groupMark, {
|
|
58188
58196
|
x: () => this.getLayoutStartPoint().x,
|
|
@@ -59356,29 +59364,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59356
59364
|
}
|
|
59357
59365
|
|
|
59358
59366
|
class CompilableMark extends GrammarItem {
|
|
59359
|
-
|
|
59360
|
-
return this.
|
|
59361
|
-
}
|
|
59362
|
-
setSkipTheme(skipTheme) {
|
|
59363
|
-
this._skipTheme = skipTheme;
|
|
59367
|
+
getMarkConfig() {
|
|
59368
|
+
return this._markConfig;
|
|
59364
59369
|
}
|
|
59365
|
-
|
|
59366
|
-
|
|
59367
|
-
|
|
59368
|
-
|
|
59369
|
-
this._support3d = support3d;
|
|
59370
|
-
}
|
|
59371
|
-
getInteractive() {
|
|
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;
|
|
59370
|
+
setMarkConfig(config) {
|
|
59371
|
+
Object.keys(config).forEach(key => {
|
|
59372
|
+
this._markConfig[key] = config[key];
|
|
59373
|
+
});
|
|
59382
59374
|
}
|
|
59383
59375
|
getVisible() {
|
|
59384
59376
|
return this._visible;
|
|
@@ -59431,48 +59423,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59431
59423
|
getSkipBeforeLayouted() {
|
|
59432
59424
|
return this._skipBeforeLayouted;
|
|
59433
59425
|
}
|
|
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
59426
|
getGroupKey() {
|
|
59453
59427
|
return this._groupKey;
|
|
59454
59428
|
}
|
|
59455
59429
|
setGroupKey(groupKey) {
|
|
59456
59430
|
this._groupKey = groupKey;
|
|
59457
59431
|
}
|
|
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
59432
|
setStateSortCallback(stateSort) {
|
|
59477
59433
|
this._stateSort = stateSort;
|
|
59478
59434
|
}
|
|
@@ -59481,19 +59437,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59481
59437
|
this.grammarType = GrammarType.mark;
|
|
59482
59438
|
this.type = undefined;
|
|
59483
59439
|
this.name = 'mark';
|
|
59484
|
-
this.
|
|
59485
|
-
|
|
59440
|
+
this._markConfig = {
|
|
59441
|
+
zIndex: LayoutZIndex.Mark,
|
|
59442
|
+
morph: false
|
|
59443
|
+
};
|
|
59486
59444
|
this._visible = true;
|
|
59487
59445
|
this.stateStyle = {};
|
|
59488
59446
|
this._unCompileChannel = {};
|
|
59489
59447
|
this._skipBeforeLayouted = false;
|
|
59490
|
-
this._morph = false;
|
|
59491
59448
|
this.name = name;
|
|
59492
59449
|
this.model = model;
|
|
59493
59450
|
this.key = option.key;
|
|
59494
59451
|
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
59452
|
this._event = new Event$1(model.getOption().eventDispatcher, model.getOption().mode);
|
|
59498
59453
|
}
|
|
59499
59454
|
setTransform(transform) {
|
|
@@ -59647,28 +59602,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59647
59602
|
}
|
|
59648
59603
|
}
|
|
59649
59604
|
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
|
-
}
|
|
59605
|
+
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
59606
|
this._product.configure(config);
|
|
59673
59607
|
}
|
|
59674
59608
|
compileSignal() {
|
|
@@ -59774,10 +59708,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
59774
59708
|
this._userId = spec.id;
|
|
59775
59709
|
}
|
|
59776
59710
|
if (isBoolean$1(spec.interactive)) {
|
|
59777
|
-
this.
|
|
59711
|
+
this._markConfig.interactive = spec.interactive;
|
|
59778
59712
|
}
|
|
59779
59713
|
if (isValid$1(spec.zIndex)) {
|
|
59780
|
-
this.
|
|
59714
|
+
this._markConfig.zIndex = spec.zIndex;
|
|
59781
59715
|
}
|
|
59782
59716
|
if (isBoolean$1(spec.visible)) {
|
|
59783
59717
|
this.setVisible(spec.visible);
|
|
@@ -60153,7 +60087,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
60153
60087
|
_compileProduct(option) {
|
|
60154
60088
|
super._compileProduct(option);
|
|
60155
60089
|
this._product.configure({
|
|
60156
|
-
zIndex: this.
|
|
60090
|
+
zIndex: this._markConfig.zIndex
|
|
60157
60091
|
});
|
|
60158
60092
|
if (!(option === null || option === void 0 ? void 0 : option.ignoreChildren)) {
|
|
60159
60093
|
this.getMarks().forEach(mark => {
|
|
@@ -61645,7 +61579,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
61645
61579
|
};
|
|
61646
61580
|
registerVChartCore();
|
|
61647
61581
|
|
|
61648
|
-
const version = "1.12.
|
|
61582
|
+
const version = "1.12.10";
|
|
61649
61583
|
|
|
61650
61584
|
const addVChartProperty = (data, op) => {
|
|
61651
61585
|
const context = op.beforeCall();
|
|
@@ -62652,7 +62586,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
62652
62586
|
}
|
|
62653
62587
|
let animationThreshold = (_a = seriesSpec.animationThreshold) !== null && _a !== void 0 ? _a : Number.MAX_SAFE_INTEGER;
|
|
62654
62588
|
(_b = series.getMarks()) === null || _b === void 0 ? void 0 : _b.forEach(m => {
|
|
62655
|
-
const config = m.
|
|
62589
|
+
const config = m.getMarkConfig();
|
|
62656
62590
|
if (config) {
|
|
62657
62591
|
if (config.large && config.largeThreshold) {
|
|
62658
62592
|
animationThreshold = Math.min(animationThreshold, config.largeThreshold);
|
|
@@ -63229,7 +63163,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
63229
63163
|
parent: (_b = (_a = this._region).getGroupMark) === null || _b === void 0 ? void 0 : _b.call(_a),
|
|
63230
63164
|
dataView: false
|
|
63231
63165
|
});
|
|
63232
|
-
this._rootMark.
|
|
63166
|
+
this._rootMark.setMarkConfig({ zIndex: this.layoutZIndex });
|
|
63233
63167
|
}
|
|
63234
63168
|
_getExtensionMarkNamePrefix() {
|
|
63235
63169
|
return `${this.type}_${this.id}_extensionMark`;
|
|
@@ -63252,10 +63186,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
63252
63186
|
markSpec: spec,
|
|
63253
63187
|
parent: parentMark,
|
|
63254
63188
|
dataView: false,
|
|
63255
|
-
customShape: spec === null || spec === void 0 ? void 0 : spec.customShape,
|
|
63256
63189
|
componentType: spec.componentType,
|
|
63257
63190
|
depend: options.depend,
|
|
63258
63191
|
key: spec.dataKey
|
|
63192
|
+
}, {
|
|
63193
|
+
setCustomizedShape: spec === null || spec === void 0 ? void 0 : spec.customShape
|
|
63259
63194
|
});
|
|
63260
63195
|
if (!mark) {
|
|
63261
63196
|
return;
|
|
@@ -63710,18 +63645,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
63710
63645
|
}
|
|
63711
63646
|
onMarkTreePositionUpdate(marks) {
|
|
63712
63647
|
}
|
|
63713
|
-
_createMark(markInfo, option = {}) {
|
|
63714
|
-
var _a, _b, _c, _d;
|
|
63715
|
-
const { key, groupKey, skipBeforeLayouted, themeSpec = {}, markSpec, dataView, dataProductId, parent, isSeriesMark, depend,
|
|
63648
|
+
_createMark(markInfo, option = {}, config = {}) {
|
|
63649
|
+
var _a, _b, _c, _d, _e, _f;
|
|
63650
|
+
const { key, groupKey, skipBeforeLayouted, themeSpec = {}, markSpec, dataView, dataProductId, parent, isSeriesMark, depend, stateSort, noSeparateStyle = false } = option;
|
|
63716
63651
|
const m = super._createMark(markInfo, {
|
|
63717
63652
|
key: key !== null && key !== void 0 ? key : this._getDataIdKey(),
|
|
63718
|
-
support3d,
|
|
63719
63653
|
seriesId: this.id,
|
|
63720
63654
|
attributeContext: this._markAttributeContext,
|
|
63721
63655
|
componentType: option.componentType,
|
|
63722
63656
|
noSeparateStyle
|
|
63723
63657
|
});
|
|
63724
63658
|
if (isValid$1(m)) {
|
|
63659
|
+
const spec = this.getSpec() || {};
|
|
63725
63660
|
this._marks.addMark(m, { name: markInfo.name });
|
|
63726
63661
|
if (isSeriesMark) {
|
|
63727
63662
|
this._seriesMark = m;
|
|
@@ -63745,25 +63680,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
63745
63680
|
if (isValid$1(depend)) {
|
|
63746
63681
|
m.setDepend(...array(depend));
|
|
63747
63682
|
}
|
|
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
63683
|
if (!isNil$1(groupKey)) {
|
|
63756
63684
|
m.setGroupKey(groupKey);
|
|
63757
63685
|
}
|
|
63758
|
-
if (customShape) {
|
|
63759
|
-
m.setCustomizedShapeCallback(customShape);
|
|
63760
|
-
}
|
|
63761
63686
|
if (stateSort) {
|
|
63762
63687
|
m.setStateSortCallback(stateSort);
|
|
63763
63688
|
}
|
|
63764
|
-
|
|
63765
|
-
|
|
63766
|
-
}
|
|
63689
|
+
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 });
|
|
63690
|
+
m.setMarkConfig(markConfig);
|
|
63767
63691
|
this.initMarkStyleWithSpec(m, mergeSpec({}, themeSpec, markSpec || spec[m.name]));
|
|
63768
63692
|
}
|
|
63769
63693
|
return m;
|
|
@@ -64393,13 +64317,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
64393
64317
|
initLineMark(progressive, isSeriesMark) {
|
|
64394
64318
|
var _a, _b;
|
|
64395
64319
|
this._lineMark = this._createMark(lineLikeSeriesMark.line, {
|
|
64396
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
64397
64320
|
groupKey: this._seriesField,
|
|
64398
64321
|
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
|
-
});
|
|
64322
|
+
stateSort: (_a = this._spec.line) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
64323
|
+
}, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_b = this._spec.line) === null || _b === void 0 ? void 0 : _b.customShape, morphElementKey: this.getDimensionField()[0] }));
|
|
64403
64324
|
return this._lineMark;
|
|
64404
64325
|
}
|
|
64405
64326
|
initLineMarkStyle(direction, areaCurveType) {
|
|
@@ -64474,26 +64395,23 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
64474
64395
|
const pointSpec = this._spec.point || {};
|
|
64475
64396
|
if (pointSpec.visible !== false) {
|
|
64476
64397
|
this._symbolMark = this._createMark(lineLikeSeriesMark.point, {
|
|
64477
|
-
morph: shouldMarkDoMorph(this._spec, lineLikeSeriesMark.point.name),
|
|
64478
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
64479
64398
|
groupKey: this._seriesField,
|
|
64480
|
-
progressive,
|
|
64481
64399
|
isSeriesMark: !!isSeriesMark,
|
|
64482
|
-
customShape: pointSpec.customShape,
|
|
64483
64400
|
stateSort: pointSpec.stateSort
|
|
64484
|
-
});
|
|
64401
|
+
}, Object.assign(Object.assign({}, progressive), { setCustomizedShape: pointSpec.customShape, morph: shouldMarkDoMorph(this._spec, lineLikeSeriesMark.point.name), morphElementKey: this.getDimensionField()[0] }));
|
|
64485
64402
|
}
|
|
64486
64403
|
if (this._spec.activePoint === true) {
|
|
64487
64404
|
const activeData = new DataView(this._option.dataSet, { name: `${PREFIX}_series_${this.id}_active_point` });
|
|
64488
64405
|
activeData.parse([]);
|
|
64489
64406
|
this._symbolActiveMark = this._createMark({ name: `active_point_${this.id}`, type: "symbol" }, {
|
|
64490
|
-
morph: false,
|
|
64491
64407
|
groupKey: this._seriesField,
|
|
64492
64408
|
isSeriesMark: false,
|
|
64493
64409
|
dataView: activeData,
|
|
64494
64410
|
parent: this._region.getInteractionMark(),
|
|
64495
|
-
customShape: pointSpec.customShape,
|
|
64496
64411
|
stateSort: pointSpec.stateSort
|
|
64412
|
+
}, {
|
|
64413
|
+
setCustomizedShape: pointSpec.customShape,
|
|
64414
|
+
morph: false
|
|
64497
64415
|
});
|
|
64498
64416
|
this._symbolActiveMark.setVisible(false);
|
|
64499
64417
|
}
|
|
@@ -64512,6 +64430,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
64512
64430
|
for (const state in this._symbolMark.stateStyle) {
|
|
64513
64431
|
this._symbolActiveMark.stateStyle[state] = {};
|
|
64514
64432
|
for (const key in this._symbolMark.stateStyle[state]) {
|
|
64433
|
+
if (key === 'visible') {
|
|
64434
|
+
continue;
|
|
64435
|
+
}
|
|
64515
64436
|
this._symbolActiveMark.stateStyle[state][key] = {
|
|
64516
64437
|
style: null,
|
|
64517
64438
|
level: AttributeLevel.Series,
|
|
@@ -64675,7 +64596,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
64675
64596
|
this.setAttribute(attr, styleConverter, state, level, stateStyle);
|
|
64676
64597
|
});
|
|
64677
64598
|
if (enableSegments) {
|
|
64678
|
-
this.
|
|
64599
|
+
this.setMarkConfig({
|
|
64600
|
+
enableSegments: true
|
|
64601
|
+
});
|
|
64679
64602
|
}
|
|
64680
64603
|
}
|
|
64681
64604
|
}
|
|
@@ -65506,7 +65429,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
65506
65429
|
].filter(isValid$1);
|
|
65507
65430
|
}
|
|
65508
65431
|
created() {
|
|
65509
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
|
|
65432
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
|
|
65510
65433
|
super.created();
|
|
65511
65434
|
this.setSeriesAndRegionsFromSpec();
|
|
65512
65435
|
this.initEvent();
|
|
@@ -65517,39 +65440,41 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
65517
65440
|
const axisMark = this._createMark({ type: 'component', name: `axis-${this.getOrient()}` }, {
|
|
65518
65441
|
componentType: this.getOrient() === 'angle' ? 'circleAxis' : 'axis',
|
|
65519
65442
|
mode: this._spec.mode,
|
|
65520
|
-
noSeparateStyle: true
|
|
65443
|
+
noSeparateStyle: true
|
|
65444
|
+
}, {
|
|
65521
65445
|
skipTheme: true
|
|
65522
65446
|
});
|
|
65523
65447
|
this._axisMark = axisMark;
|
|
65524
|
-
axisMark.
|
|
65448
|
+
axisMark.setMarkConfig({ zIndex: this.layoutZIndex });
|
|
65525
65449
|
if (isValid$1(this._spec.id)) {
|
|
65526
65450
|
axisMark.setUserId(this._spec.id);
|
|
65527
65451
|
}
|
|
65452
|
+
axisMark.setMarkConfig({ interactive: (_a = this._spec.interactive) !== null && _a !== void 0 ? _a : this.getDefaultInteractive() });
|
|
65528
65453
|
this._marks.addMark(axisMark);
|
|
65529
|
-
if ((
|
|
65454
|
+
if ((_b = this._spec.grid) === null || _b === void 0 ? void 0 : _b.visible) {
|
|
65530
65455
|
const gridMark = this._createMark({ type: 'component', name: `axis-${this.getOrient()}-grid` }, {
|
|
65531
65456
|
componentType: this.getOrient() === 'angle' ? GridEnum.circleAxisGrid : GridEnum.lineAxisGrid,
|
|
65532
65457
|
mode: this._spec.mode,
|
|
65533
|
-
noSeparateStyle: true
|
|
65458
|
+
noSeparateStyle: true
|
|
65459
|
+
}, {
|
|
65534
65460
|
skipTheme: true
|
|
65535
65461
|
});
|
|
65536
|
-
gridMark.
|
|
65537
|
-
|
|
65462
|
+
gridMark.setMarkConfig({
|
|
65463
|
+
zIndex: (_g = (_e = (_d = (_c = this._spec.grid) === null || _c === void 0 ? void 0 : _c.style) === null || _d === void 0 ? void 0 : _d.zIndex) !== null && _e !== void 0 ? _e : (_f = this._spec.grid) === null || _f === void 0 ? void 0 : _f.zIndex) !== null && _g !== void 0 ? _g : LayoutZIndex.Axis_Grid,
|
|
65464
|
+
interactive: false
|
|
65465
|
+
});
|
|
65538
65466
|
this._marks.addMark(gridMark);
|
|
65539
65467
|
this._gridMark = gridMark;
|
|
65540
65468
|
}
|
|
65541
|
-
if (isBoolean$1(this._spec.interactive)) {
|
|
65542
|
-
this._marks.forEach(m => m.setInteractive(this._spec.interactive));
|
|
65543
|
-
}
|
|
65544
65469
|
if (this._option.animation !== false &&
|
|
65545
65470
|
get$1(this._option.getChart().getSpec(), 'animation') !== false &&
|
|
65546
65471
|
this._spec.animation === true) {
|
|
65547
|
-
const axisAnimateConfig = animationConfig((
|
|
65548
|
-
appear: (
|
|
65549
|
-
disappear: (
|
|
65550
|
-
enter: (
|
|
65551
|
-
exit: (
|
|
65552
|
-
update: (
|
|
65472
|
+
const axisAnimateConfig = animationConfig((_h = Factory$1.getAnimationInKey('axis')) === null || _h === void 0 ? void 0 : _h(), {
|
|
65473
|
+
appear: (_k = (_j = this._spec.animationAppear) !== null && _j !== void 0 ? _j : get$1(this._option.getChart().getSpec(), 'animationAppear.axis')) !== null && _k !== void 0 ? _k : get$1(this._option.getChart().getSpec(), 'animationAppear'),
|
|
65474
|
+
disappear: (_m = (_l = this._spec.animationDisappear) !== null && _l !== void 0 ? _l : get$1(this._option.getChart().getSpec(), 'animationDisappear.axis')) !== null && _m !== void 0 ? _m : get$1(this._option.getChart().getSpec(), 'animationDisappear'),
|
|
65475
|
+
enter: (_p = (_o = this._spec.animationEnter) !== null && _o !== void 0 ? _o : get$1(this._option.getChart().getSpec(), 'animationEnter.axis')) !== null && _p !== void 0 ? _p : get$1(this._option.getChart().getSpec(), 'animationEnter'),
|
|
65476
|
+
exit: (_r = (_q = this._spec.animationExit) !== null && _q !== void 0 ? _q : get$1(this._option.getChart().getSpec(), 'animationExit.axis')) !== null && _r !== void 0 ? _r : get$1(this._option.getChart().getSpec(), 'animationExit'),
|
|
65477
|
+
update: (_t = (_s = this._spec.animationUpdate) !== null && _s !== void 0 ? _s : get$1(this._option.getChart().getSpec(), 'animationUpdate.axis')) !== null && _t !== void 0 ? _t : get$1(this._option.getChart().getSpec(), 'animationUpdate')
|
|
65553
65478
|
});
|
|
65554
65479
|
if (axisAnimateConfig.enter) {
|
|
65555
65480
|
axisAnimateConfig.update[0].customParameters = {
|
|
@@ -65671,7 +65596,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
65671
65596
|
super.onLayoutEnd(ctx);
|
|
65672
65597
|
}
|
|
65673
65598
|
computeData(updateType) {
|
|
65674
|
-
if (
|
|
65599
|
+
if (updateType === 'force' && (!this._tickData || !this._tickData.length)) {
|
|
65600
|
+
eachSeries(this._regions, s => {
|
|
65601
|
+
var _a;
|
|
65602
|
+
(_a = s.getViewData()) === null || _a === void 0 ? void 0 : _a.reRunAllTransform();
|
|
65603
|
+
}, {
|
|
65604
|
+
userId: this._seriesUserId,
|
|
65605
|
+
specIndex: this._seriesIndex
|
|
65606
|
+
});
|
|
65607
|
+
}
|
|
65608
|
+
else if (this._tickData &&
|
|
65609
|
+
this._tickData.length &&
|
|
65610
|
+
(updateType === 'force' || !isEqual(this._scale.range(), [0, 1]))) {
|
|
65675
65611
|
this._tickData.forEach(tickData => {
|
|
65676
65612
|
tickData.getDataView().reRunAllTransform();
|
|
65677
65613
|
tickData.updateData();
|
|
@@ -65947,6 +65883,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
65947
65883
|
getOrient() {
|
|
65948
65884
|
return this._orient;
|
|
65949
65885
|
}
|
|
65886
|
+
getDefaultInteractive() {
|
|
65887
|
+
return true;
|
|
65888
|
+
}
|
|
65950
65889
|
set autoIndentOnce(v) {
|
|
65951
65890
|
this._autoIndentOnce = v;
|
|
65952
65891
|
}
|
|
@@ -69772,12 +69711,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
69772
69711
|
const seriesMark = (_b = this._spec.seriesMark) !== null && _b !== void 0 ? _b : 'area';
|
|
69773
69712
|
this._areaMark = this._createMark(AreaSeries.mark.area, {
|
|
69774
69713
|
groupKey: this._seriesField,
|
|
69775
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
69776
|
-
progressive,
|
|
69777
69714
|
isSeriesMark: isAreaVisible && seriesMark !== 'point',
|
|
69778
|
-
customShape: areaSpec.customShape,
|
|
69779
69715
|
stateSort: areaSpec.stateSort
|
|
69780
|
-
});
|
|
69716
|
+
}, Object.assign(Object.assign({}, progressive), { morphElementKey: this.getDimensionField()[0], setCustomizedShape: areaSpec.customShape }));
|
|
69781
69717
|
this.initSymbolMark(progressive, seriesMark === 'point');
|
|
69782
69718
|
}
|
|
69783
69719
|
initMarkStyle() {
|
|
@@ -70175,31 +70111,33 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70175
70111
|
}
|
|
70176
70112
|
initMark() {
|
|
70177
70113
|
var _a, _b;
|
|
70178
|
-
|
|
70114
|
+
this._initBarBackgroundMark();
|
|
70115
|
+
this._barMark = this._createMark(Object.assign(Object.assign({}, BarSeries.mark.bar), { name: this._barMarkName, type: this._barMarkType }), {
|
|
70116
|
+
groupKey: this._seriesField,
|
|
70117
|
+
isSeriesMark: true,
|
|
70118
|
+
stateSort: (_a = this._spec.bar) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
70119
|
+
}, {
|
|
70179
70120
|
progressiveStep: this._spec.progressiveStep,
|
|
70180
70121
|
progressiveThreshold: this._spec.progressiveThreshold,
|
|
70181
70122
|
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 }), {
|
|
70123
|
+
largeThreshold: this._spec.largeThreshold,
|
|
70124
|
+
morphElementKey: this.getDimensionField()[0],
|
|
70186
70125
|
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
|
|
70126
|
+
setCustomizedShape: (_b = this._spec.bar) === null || _b === void 0 ? void 0 : _b.customShape
|
|
70193
70127
|
});
|
|
70194
70128
|
}
|
|
70195
|
-
_initBarBackgroundMark(
|
|
70129
|
+
_initBarBackgroundMark() {
|
|
70196
70130
|
if (this._spec.barBackground && this._spec.barBackground.visible) {
|
|
70197
70131
|
this._barBackgroundMark = this._createMark(BarSeries.mark.barBackground, {
|
|
70198
70132
|
dataView: this._barBackgroundViewData.getDataView(),
|
|
70199
70133
|
dataProductId: this._barBackgroundViewData.getProductId(),
|
|
70200
|
-
progressive,
|
|
70201
|
-
customShape: this._spec.barBackground.customShape,
|
|
70202
70134
|
stateSort: this._spec.barBackground.stateSort
|
|
70135
|
+
}, {
|
|
70136
|
+
setCustomizedShape: this._spec.barBackground.customShape,
|
|
70137
|
+
progressiveStep: this._spec.progressiveStep,
|
|
70138
|
+
progressiveThreshold: this._spec.progressiveThreshold,
|
|
70139
|
+
large: this._spec.large,
|
|
70140
|
+
largeThreshold: this._spec.largeThreshold
|
|
70203
70141
|
});
|
|
70204
70142
|
}
|
|
70205
70143
|
}
|
|
@@ -70452,51 +70390,54 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70452
70390
|
}
|
|
70453
70391
|
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
70392
|
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
|
-
|
|
70393
|
+
this._barMark.setMarkConfig({
|
|
70394
|
+
clip: true,
|
|
70395
|
+
clipPath: () => {
|
|
70396
|
+
const rectPaths = [];
|
|
70397
|
+
this._forEachStackGroup(node => {
|
|
70398
|
+
let min = Infinity;
|
|
70399
|
+
let max = -Infinity;
|
|
70400
|
+
let hasPercent = false;
|
|
70401
|
+
let minPercent = Infinity;
|
|
70402
|
+
let maxPercent = -Infinity;
|
|
70403
|
+
node.values.forEach(datum => {
|
|
70404
|
+
const start = datum[STACK_FIELD_START];
|
|
70405
|
+
const end = datum[STACK_FIELD_END];
|
|
70406
|
+
const startPercent = datum[STACK_FIELD_START_PERCENT];
|
|
70407
|
+
const endPercent = datum[STACK_FIELD_END_PERCENT];
|
|
70408
|
+
min = Math.min(min, start, end);
|
|
70409
|
+
max = Math.max(max, start, end);
|
|
70410
|
+
if (isValid$1(startPercent) && isValid$1(endPercent)) {
|
|
70411
|
+
hasPercent = true;
|
|
70412
|
+
minPercent = Math.min(minPercent, startPercent, endPercent);
|
|
70413
|
+
maxPercent = Math.max(maxPercent, startPercent, endPercent);
|
|
70414
|
+
}
|
|
70415
|
+
});
|
|
70416
|
+
const mockDatum = Object.assign(Object.assign(Object.assign({}, node.values[0]), { [STACK_FIELD_START]: min, [STACK_FIELD_END]: max }), (hasPercent
|
|
70417
|
+
? {
|
|
70418
|
+
[STACK_FIELD_START_PERCENT]: minPercent,
|
|
70419
|
+
[STACK_FIELD_END_PERCENT]: maxPercent
|
|
70420
|
+
}
|
|
70421
|
+
: undefined));
|
|
70422
|
+
const rectAttr = this.direction === "horizontal"
|
|
70423
|
+
? {
|
|
70424
|
+
x: this._getBarXStart(mockDatum, xScale),
|
|
70425
|
+
x1: this._getBarXEnd(mockDatum, xScale),
|
|
70426
|
+
y: this._getPosition(this.direction, mockDatum),
|
|
70427
|
+
height: this._getBarWidth(this._yAxisHelper)
|
|
70428
|
+
}
|
|
70429
|
+
: {
|
|
70430
|
+
y: this._getBarYStart(mockDatum, yScale),
|
|
70431
|
+
y1: this._getBarYEnd(mockDatum, yScale),
|
|
70432
|
+
x: this._getPosition(this.direction, mockDatum),
|
|
70433
|
+
width: this._getBarWidth(this._xAxisHelper)
|
|
70434
|
+
};
|
|
70435
|
+
rectPaths.push(createRect(Object.assign(Object.assign({}, rectAttr), { cornerRadius: isFunction$1(this._spec.stackCornerRadius)
|
|
70436
|
+
? this._spec.stackCornerRadius(rectAttr, mockDatum, this._markAttributeContext)
|
|
70437
|
+
: this._spec.stackCornerRadius, fill: true })));
|
|
70475
70438
|
});
|
|
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;
|
|
70439
|
+
return rectPaths;
|
|
70440
|
+
}
|
|
70500
70441
|
});
|
|
70501
70442
|
}
|
|
70502
70443
|
initLinearRectMarkStyle() {
|
|
@@ -70968,20 +70909,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70968
70909
|
}
|
|
70969
70910
|
initMark() {
|
|
70970
70911
|
var _a, _b;
|
|
70971
|
-
|
|
70912
|
+
this._symbolMark = this._createMark(ScatterSeries.mark.point, {
|
|
70913
|
+
groupKey: this._seriesField,
|
|
70914
|
+
isSeriesMark: true,
|
|
70915
|
+
stateSort: (_a = this._spec.point) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
70916
|
+
}, {
|
|
70972
70917
|
progressiveStep: this._spec.progressiveStep,
|
|
70973
70918
|
progressiveThreshold: this._spec.progressiveThreshold,
|
|
70974
70919
|
large: this._spec.large,
|
|
70975
|
-
largeThreshold: this._spec.largeThreshold
|
|
70976
|
-
};
|
|
70977
|
-
this._symbolMark = this._createMark(ScatterSeries.mark.point, {
|
|
70920
|
+
largeThreshold: this._spec.largeThreshold,
|
|
70978
70921
|
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
|
|
70922
|
+
morphElementKey: this.getDimensionField()[0],
|
|
70923
|
+
setCustomizedShape: (_b = this._spec.point) === null || _b === void 0 ? void 0 : _b.customShape
|
|
70985
70924
|
});
|
|
70986
70925
|
}
|
|
70987
70926
|
initMarkStyle() {
|
|
@@ -72273,6 +72212,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
72273
72212
|
});
|
|
72274
72213
|
});
|
|
72275
72214
|
}
|
|
72215
|
+
_compareSpec(spec, prevSpec) {
|
|
72216
|
+
const result = super._compareSpec(spec, prevSpec);
|
|
72217
|
+
if (!result.reMake) {
|
|
72218
|
+
result.reMake = ['roam', 'longitudeField', 'latitudeField', 'projection', 'zoomLimit'].some(k => {
|
|
72219
|
+
return !isEqual(prevSpec === null || prevSpec === void 0 ? void 0 : prevSpec[k], spec[k]);
|
|
72220
|
+
});
|
|
72221
|
+
}
|
|
72222
|
+
return result;
|
|
72223
|
+
}
|
|
72276
72224
|
release() {
|
|
72277
72225
|
super.release();
|
|
72278
72226
|
this._centerCache && this._centerCache.clear();
|
|
@@ -72370,13 +72318,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
72370
72318
|
}
|
|
72371
72319
|
initMark() {
|
|
72372
72320
|
this._pathMark = this._createMark(MapSeries.mark.area, {
|
|
72373
|
-
morph: shouldMarkDoMorph(this._spec, MapSeries.mark.area.name),
|
|
72374
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
72375
72321
|
groupKey: this.getDimensionField()[0],
|
|
72376
72322
|
isSeriesMark: true,
|
|
72377
72323
|
skipBeforeLayouted: true,
|
|
72378
72324
|
dataView: this._mapViewData.getDataView(),
|
|
72379
72325
|
dataProductId: this._mapViewData.getProductId()
|
|
72326
|
+
}, {
|
|
72327
|
+
morph: shouldMarkDoMorph(this._spec, MapSeries.mark.area.name),
|
|
72328
|
+
morphElementKey: this.getDimensionField()[0]
|
|
72380
72329
|
});
|
|
72381
72330
|
}
|
|
72382
72331
|
initMarkStyle() {
|
|
@@ -73412,8 +73361,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
73412
73361
|
super.initMark();
|
|
73413
73362
|
const leaderLine = this._createMark(WaterfallSeries.mark.leaderLine, {
|
|
73414
73363
|
key: 'index',
|
|
73415
|
-
|
|
73416
|
-
|
|
73364
|
+
stateSort: (_a = this._spec.leaderLine) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
73365
|
+
}, {
|
|
73366
|
+
setCustomizedShape: (_b = this._spec.leaderLine) === null || _b === void 0 ? void 0 : _b.customShape
|
|
73417
73367
|
});
|
|
73418
73368
|
if (leaderLine) {
|
|
73419
73369
|
this._leaderLineMark = leaderLine;
|
|
@@ -73805,15 +73755,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
73805
73755
|
largeThreshold: this._spec.largeThreshold
|
|
73806
73756
|
};
|
|
73807
73757
|
this._boxPlotMark = this._createMark(BoxPlotSeries.mark.boxPlot, {
|
|
73808
|
-
isSeriesMark: true
|
|
73809
|
-
|
|
73810
|
-
});
|
|
73758
|
+
isSeriesMark: true
|
|
73759
|
+
}, progressive);
|
|
73811
73760
|
this._outlierMark = this._createMark(BoxPlotSeries.mark.outlier, {
|
|
73812
|
-
progressive,
|
|
73813
73761
|
key: DEFAULT_DATA_INDEX,
|
|
73814
73762
|
dataView: this._outlierDataView.getDataView(),
|
|
73815
73763
|
dataProductId: this._outlierDataView.getProductId()
|
|
73816
|
-
});
|
|
73764
|
+
}, progressive);
|
|
73817
73765
|
}
|
|
73818
73766
|
initMarkStyle() {
|
|
73819
73767
|
var _a, _b, _c, _d, _e;
|
|
@@ -74257,12 +74205,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
74257
74205
|
this._initBarBackgroundMark();
|
|
74258
74206
|
const labelPosition = (_a = this._spec.label) === null || _a === void 0 ? void 0 : _a.position;
|
|
74259
74207
|
this._barMark = this._createMark(RangeColumnSeries.mark.bar, {
|
|
74260
|
-
morph: shouldMarkDoMorph(this._spec, RangeColumnSeries.mark.bar.name),
|
|
74261
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
74262
74208
|
groupKey: this._seriesField,
|
|
74263
74209
|
isSeriesMark: true,
|
|
74264
|
-
|
|
74265
|
-
|
|
74210
|
+
stateSort: (_b = this._spec.bar) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
74211
|
+
}, {
|
|
74212
|
+
setCustomizedShape: (_c = this._spec.bar) === null || _c === void 0 ? void 0 : _c.customShape,
|
|
74213
|
+
morph: shouldMarkDoMorph(this._spec, RangeColumnSeries.mark.bar.name),
|
|
74214
|
+
morphElementKey: this.getDimensionField()[0]
|
|
74266
74215
|
});
|
|
74267
74216
|
if (((_d = this._spec.label) === null || _d === void 0 ? void 0 : _d.visible) !== false && labelPosition === "bothEnd") {
|
|
74268
74217
|
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 +74398,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
74449
74398
|
var _a;
|
|
74450
74399
|
const { customShape, stateSort } = (_a = this._spec.area) !== null && _a !== void 0 ? _a : {};
|
|
74451
74400
|
this._areaMark = this._createMark(RangeAreaSeries.mark.area, {
|
|
74452
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
74453
74401
|
groupKey: this._seriesField,
|
|
74454
74402
|
isSeriesMark: true,
|
|
74455
|
-
customShape,
|
|
74456
74403
|
stateSort
|
|
74404
|
+
}, {
|
|
74405
|
+
setCustomizedShape: customShape,
|
|
74406
|
+
morphElementKey: this.getDimensionField()[0]
|
|
74457
74407
|
});
|
|
74458
74408
|
}
|
|
74459
74409
|
initMarkStyle() {
|
|
@@ -75118,11 +75068,11 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
75118
75068
|
this._pieMarkName = "pie";
|
|
75119
75069
|
this._pieMarkType = "arc";
|
|
75120
75070
|
this.getCenter = () => {
|
|
75121
|
-
var _a, _b
|
|
75122
|
-
const
|
|
75071
|
+
var _a, _b;
|
|
75072
|
+
const layoutRect = this._region.getLayoutRect();
|
|
75123
75073
|
return {
|
|
75124
|
-
x: (
|
|
75125
|
-
y: (
|
|
75074
|
+
x: calcLayoutNumber((_a = this._spec) === null || _a === void 0 ? void 0 : _a.centerX, layoutRect.width, layoutRect, layoutRect.width / 2),
|
|
75075
|
+
y: calcLayoutNumber((_b = this._spec) === null || _b === void 0 ? void 0 : _b.centerY, layoutRect.height, layoutRect, layoutRect.height / 2)
|
|
75126
75076
|
};
|
|
75127
75077
|
};
|
|
75128
75078
|
this._startAngle = POLAR_START_RADIAN;
|
|
@@ -75211,14 +75161,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
75211
75161
|
initMark() {
|
|
75212
75162
|
var _a, _b;
|
|
75213
75163
|
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
75164
|
key: DEFAULT_DATA_KEY,
|
|
75217
75165
|
groupKey: this._seriesField,
|
|
75218
75166
|
skipBeforeLayouted: true,
|
|
75219
75167
|
isSeriesMark: true,
|
|
75220
|
-
|
|
75221
|
-
|
|
75168
|
+
stateSort: (_a = this._spec.pie) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
75169
|
+
}, {
|
|
75170
|
+
setCustomizedShape: (_b = this._spec.pie) === null || _b === void 0 ? void 0 : _b.customShape,
|
|
75171
|
+
morph: shouldMarkDoMorph(this._spec, this._pieMarkName),
|
|
75172
|
+
morphElementKey: this._seriesField
|
|
75222
75173
|
});
|
|
75223
75174
|
if (this._showEmptyCircle) {
|
|
75224
75175
|
this._emptyArcMark = this._createMark({
|
|
@@ -75526,7 +75477,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
75526
75477
|
}
|
|
75527
75478
|
super.initLabelMarkStyle(textMark);
|
|
75528
75479
|
const params3d = {};
|
|
75529
|
-
textMark.
|
|
75480
|
+
textMark.setMarkConfig({ support3d: true });
|
|
75530
75481
|
params3d.beta = this._angle3d;
|
|
75531
75482
|
params3d.anchor3d = (datum) => {
|
|
75532
75483
|
const { x, y } = this.getCenter();
|
|
@@ -75675,6 +75626,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
75675
75626
|
getOrient() {
|
|
75676
75627
|
return this._orient;
|
|
75677
75628
|
}
|
|
75629
|
+
getDefaultInteractive() {
|
|
75630
|
+
return this._orient !== 'angle';
|
|
75631
|
+
}
|
|
75678
75632
|
getGroupScales() {
|
|
75679
75633
|
return this._groupScales;
|
|
75680
75634
|
}
|
|
@@ -75948,7 +75902,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
75948
75902
|
innerRadius, startAngle: this._startAngle, endAngle: this._endAngle, sides: ((_c = (_b = (_a = this._getRelatedAxis(this._option.radiusAxisIndex)) === null || _a === void 0 ? void 0 : _a.getSpec()) === null || _b === void 0 ? void 0 : _b.grid) === null || _c === void 0 ? void 0 : _c.smooth)
|
|
75949
75903
|
? undefined
|
|
75950
75904
|
: this.getScale().domain().length });
|
|
75951
|
-
const attrs = Object.assign(Object.assign(
|
|
75905
|
+
const attrs = Object.assign(Object.assign({}, commonAttrs), { size: this.getRefLayoutRect(), title: {
|
|
75952
75906
|
text: this._spec.title.text || this._dataFieldText
|
|
75953
75907
|
}, items, orient: 'angle' });
|
|
75954
75908
|
if (this._spec.grid.visible) {
|
|
@@ -76161,12 +76115,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
76161
76115
|
initRoseMark() {
|
|
76162
76116
|
var _a, _b;
|
|
76163
76117
|
this._roseMark = this._createMark(RoseSeries.mark.rose, {
|
|
76164
|
-
morph: shouldMarkDoMorph(this._spec, RoseSeries.mark.rose.name),
|
|
76165
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
76166
76118
|
groupKey: this._seriesField,
|
|
76167
76119
|
isSeriesMark: true,
|
|
76168
|
-
|
|
76169
|
-
|
|
76120
|
+
stateSort: (_a = this._spec.rose) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
76121
|
+
}, {
|
|
76122
|
+
setCustomizedShape: (_b = this._spec.rose) === null || _b === void 0 ? void 0 : _b.customShape,
|
|
76123
|
+
morph: shouldMarkDoMorph(this._spec, RoseSeries.mark.rose.name),
|
|
76124
|
+
morphElementKey: this.getDimensionField()[0]
|
|
76170
76125
|
});
|
|
76171
76126
|
}
|
|
76172
76127
|
getRoseAngle() {
|
|
@@ -76515,11 +76470,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
76515
76470
|
var _a, _b;
|
|
76516
76471
|
this._areaMark = this._createMark(RadarSeries.mark.area, {
|
|
76517
76472
|
groupKey: this._seriesField,
|
|
76518
|
-
progressive,
|
|
76519
76473
|
isSeriesMark,
|
|
76520
|
-
|
|
76521
|
-
|
|
76522
|
-
});
|
|
76474
|
+
stateSort: (_a = this._spec.area) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
76475
|
+
}, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_b = this._spec.area) === null || _b === void 0 ? void 0 : _b.customShape }));
|
|
76523
76476
|
}
|
|
76524
76477
|
initAreaMarkStyle() {
|
|
76525
76478
|
const areaMark = this._areaMark;
|
|
@@ -76839,17 +76792,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
76839
76792
|
x: -this._spec.leftAppendPadding,
|
|
76840
76793
|
y: 0,
|
|
76841
76794
|
width: 10000,
|
|
76842
|
-
height: this._spec.clipHeight
|
|
76843
|
-
clip: true
|
|
76795
|
+
height: this._spec.clipHeight
|
|
76844
76796
|
}, 'normal', AttributeLevel.Series);
|
|
76845
|
-
clipMark.
|
|
76797
|
+
clipMark.setMarkConfig({ interactive: false, clip: true });
|
|
76846
76798
|
}
|
|
76847
76799
|
const containerMark = this._containerMark;
|
|
76848
76800
|
if (containerMark) {
|
|
76849
76801
|
this.setMarkStyle(containerMark, {
|
|
76850
76802
|
x: this._spec.leftAppendPadding
|
|
76851
76803
|
}, 'normal', AttributeLevel.Series);
|
|
76852
|
-
containerMark.
|
|
76804
|
+
containerMark.setMarkConfig({ interactive: false });
|
|
76853
76805
|
}
|
|
76854
76806
|
const gridBackgroundMark = this._gridBackgroundMark;
|
|
76855
76807
|
if (gridBackgroundMark) {
|
|
@@ -77201,10 +77153,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77201
77153
|
x: -this._spec.leftAppendPadding,
|
|
77202
77154
|
y: 0,
|
|
77203
77155
|
width: 10000,
|
|
77204
|
-
height: this._spec.clipHeight
|
|
77205
|
-
clip: true
|
|
77156
|
+
height: this._spec.clipHeight
|
|
77206
77157
|
}, 'normal', AttributeLevel.Series);
|
|
77207
|
-
clipMark.
|
|
77158
|
+
clipMark.setMarkConfig({ interactive: false, clip: true });
|
|
77208
77159
|
}
|
|
77209
77160
|
const containerMark = this._containerMark;
|
|
77210
77161
|
if (containerMark) {
|
|
@@ -77212,7 +77163,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77212
77163
|
x: this._spec.leftAppendPadding,
|
|
77213
77164
|
width: this.getLayoutRect().width
|
|
77214
77165
|
}, 'normal', AttributeLevel.Series);
|
|
77215
|
-
containerMark.
|
|
77166
|
+
containerMark.setMarkConfig({ interactive: false });
|
|
77216
77167
|
}
|
|
77217
77168
|
const linkMark = this._linkMark;
|
|
77218
77169
|
if (linkMark) {
|
|
@@ -77510,38 +77461,41 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77510
77461
|
}
|
|
77511
77462
|
_initArcGroupMarkStyle() {
|
|
77512
77463
|
const groupMark = this._arcGroupMark;
|
|
77513
|
-
groupMark.setZIndex(this.layoutZIndex);
|
|
77514
77464
|
groupMark.created();
|
|
77515
77465
|
this.setMarkStyle(groupMark, {
|
|
77516
77466
|
x: 0,
|
|
77517
77467
|
y: 0
|
|
77518
77468
|
}, 'normal', AttributeLevel.Series);
|
|
77519
|
-
|
|
77520
|
-
|
|
77521
|
-
|
|
77522
|
-
|
|
77523
|
-
|
|
77524
|
-
const
|
|
77525
|
-
|
|
77526
|
-
|
|
77527
|
-
|
|
77528
|
-
|
|
77529
|
-
const
|
|
77530
|
-
const
|
|
77531
|
-
|
|
77532
|
-
|
|
77533
|
-
|
|
77469
|
+
this._arcGroupMark.setMarkConfig({
|
|
77470
|
+
interactive: false,
|
|
77471
|
+
zIndex: this.layoutZIndex,
|
|
77472
|
+
clip: true,
|
|
77473
|
+
clipPath: () => {
|
|
77474
|
+
const axis = this._getAngleAxis();
|
|
77475
|
+
if (this._isTickMaskVisible(axis)) {
|
|
77476
|
+
const { tickMask } = this._spec;
|
|
77477
|
+
const { angle, offsetAngle, style = {} } = tickMask;
|
|
77478
|
+
const subTickData = this._getAngleAxisSubTickData(axis);
|
|
77479
|
+
const { x, y } = this.angleAxisHelper.center();
|
|
77480
|
+
const radius = this._computeLayoutRadius();
|
|
77481
|
+
const markStyle = style;
|
|
77482
|
+
return subTickData.map(({ value }) => {
|
|
77483
|
+
const pos = this.angleAxisHelper.dataToPosition([value]) + degreeToRadian(offsetAngle);
|
|
77484
|
+
const angleUnit = degreeToRadian(angle) / 2;
|
|
77485
|
+
return createArc(Object.assign(Object.assign({}, markStyle), { x,
|
|
77486
|
+
y, startAngle: pos - angleUnit, endAngle: pos + angleUnit, innerRadius: radius * this._innerRadius, outerRadius: radius * this._outerRadius, fill: true }));
|
|
77487
|
+
});
|
|
77488
|
+
}
|
|
77489
|
+
const { width, height } = this.getLayoutRect();
|
|
77490
|
+
return [
|
|
77491
|
+
createRect({
|
|
77492
|
+
width,
|
|
77493
|
+
height,
|
|
77494
|
+
fill: true
|
|
77495
|
+
})
|
|
77496
|
+
];
|
|
77534
77497
|
}
|
|
77535
|
-
const { width, height } = this.getLayoutRect();
|
|
77536
|
-
return [
|
|
77537
|
-
createRect({
|
|
77538
|
-
width,
|
|
77539
|
-
height,
|
|
77540
|
-
fill: true
|
|
77541
|
-
})
|
|
77542
|
-
];
|
|
77543
77498
|
});
|
|
77544
|
-
this._arcGroupMark.setInteractive(false);
|
|
77545
77499
|
}
|
|
77546
77500
|
_getAngleAxis() {
|
|
77547
77501
|
if (!this.angleAxisHelper) {
|
|
@@ -77677,8 +77631,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77677
77631
|
this._progressMark = this._createMark(CircularProgressSeries.mark.progress, {
|
|
77678
77632
|
parent: this._arcGroupMark,
|
|
77679
77633
|
isSeriesMark: true,
|
|
77680
|
-
|
|
77681
|
-
|
|
77634
|
+
stateSort: (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
77635
|
+
}, {
|
|
77636
|
+
setCustomizedShape: (_b = this._spec.progress) === null || _b === void 0 ? void 0 : _b.customShape
|
|
77682
77637
|
});
|
|
77683
77638
|
return this._progressMark;
|
|
77684
77639
|
}
|
|
@@ -77720,8 +77675,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77720
77675
|
var _a, _b;
|
|
77721
77676
|
this._trackMark = this._createMark(CircularProgressSeries.mark.track, {
|
|
77722
77677
|
parent: this._arcGroupMark,
|
|
77723
|
-
|
|
77724
|
-
|
|
77678
|
+
stateSort: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
77679
|
+
}, {
|
|
77680
|
+
setCustomizedShape: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.customShape
|
|
77725
77681
|
});
|
|
77726
77682
|
return this._trackMark;
|
|
77727
77683
|
}
|
|
@@ -77914,8 +77870,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77914
77870
|
var _a, _b, _c;
|
|
77915
77871
|
this._progressMark = this._createMark(LinearProgressSeries.mark.progress, {
|
|
77916
77872
|
isSeriesMark: true,
|
|
77917
|
-
|
|
77918
|
-
|
|
77873
|
+
stateSort: (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
77874
|
+
}, {
|
|
77875
|
+
setCustomizedShape: (_c = (_b = this._spec.progress) === null || _b === void 0 ? void 0 : _b.customShape) !== null && _c !== void 0 ? _c : this._defaultProgressCustomShape
|
|
77919
77876
|
});
|
|
77920
77877
|
return this._progressMark;
|
|
77921
77878
|
}
|
|
@@ -77964,8 +77921,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
77964
77921
|
_initTrackMark() {
|
|
77965
77922
|
var _a, _b;
|
|
77966
77923
|
this._trackMark = this._createMark(LinearProgressSeries.mark.track, {
|
|
77967
|
-
|
|
77968
|
-
|
|
77924
|
+
stateSort: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
77925
|
+
}, {
|
|
77926
|
+
setCustomizedShape: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.customShape
|
|
77969
77927
|
});
|
|
77970
77928
|
return this._trackMark;
|
|
77971
77929
|
}
|
|
@@ -78154,9 +78112,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
78154
78112
|
}
|
|
78155
78113
|
this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {
|
|
78156
78114
|
key: DEFAULT_DATA_KEY,
|
|
78157
|
-
defaultMorphElementKey: this._seriesField,
|
|
78158
78115
|
groupKey: this._seriesField,
|
|
78159
78116
|
isSeriesMark: true
|
|
78117
|
+
}, {
|
|
78118
|
+
morphElementKey: this._seriesField
|
|
78160
78119
|
});
|
|
78161
78120
|
}
|
|
78162
78121
|
initMarkStyle() {
|
|
@@ -80350,8 +80309,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80350
80309
|
initMark() {
|
|
80351
80310
|
this._wordMark = this._createMark(BaseWordCloudSeries.mark.word, {
|
|
80352
80311
|
groupKey: this._seriesField,
|
|
80353
|
-
support3d: true,
|
|
80354
80312
|
isSeriesMark: true
|
|
80313
|
+
}, {
|
|
80314
|
+
support3d: true
|
|
80355
80315
|
});
|
|
80356
80316
|
}
|
|
80357
80317
|
initMarkStyle() {
|
|
@@ -80624,13 +80584,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80624
80584
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
80625
80585
|
this._funnelMark = this._createMark(Object.assign(Object.assign({}, FunnelSeries.mark.funnel), { name: this._funnelMarkName, type: this._funnelMarkType }), {
|
|
80626
80586
|
themeSpec: (_a = this._theme) === null || _a === void 0 ? void 0 : _a.funnel,
|
|
80627
|
-
morph: shouldMarkDoMorph(this._spec, this._funnelMarkName),
|
|
80628
|
-
defaultMorphElementKey: this._seriesField,
|
|
80629
80587
|
groupKey: this._seriesField,
|
|
80630
80588
|
isSeriesMark: true,
|
|
80631
|
-
|
|
80632
|
-
stateSort: (_c = this._spec.funnel) === null || _c === void 0 ? void 0 : _c.stateSort,
|
|
80589
|
+
stateSort: (_b = this._spec.funnel) === null || _b === void 0 ? void 0 : _b.stateSort,
|
|
80633
80590
|
noSeparateStyle: true
|
|
80591
|
+
}, {
|
|
80592
|
+
setCustomizedShape: (_c = this._spec.funnel) === null || _c === void 0 ? void 0 : _c.customShape,
|
|
80593
|
+
morph: shouldMarkDoMorph(this._spec, this._funnelMarkName),
|
|
80594
|
+
morphElementKey: this._seriesField
|
|
80634
80595
|
});
|
|
80635
80596
|
if (this._spec.isTransform) {
|
|
80636
80597
|
this._funnelTransformMark = this._createMark(Object.assign(Object.assign({}, FunnelSeries.mark.transform), { name: this._transformMarkName, type: this._transformMarkType }), {
|
|
@@ -80638,9 +80599,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80638
80599
|
skipBeforeLayouted: false,
|
|
80639
80600
|
dataView: this._viewDataTransform.getDataView(),
|
|
80640
80601
|
dataProductId: this._viewDataTransform.getProductId(),
|
|
80641
|
-
|
|
80642
|
-
stateSort: (_f = this._spec.transform) === null || _f === void 0 ? void 0 : _f.stateSort,
|
|
80602
|
+
stateSort: (_e = this._spec.transform) === null || _e === void 0 ? void 0 : _e.stateSort,
|
|
80643
80603
|
noSeparateStyle: true
|
|
80604
|
+
}, {
|
|
80605
|
+
setCustomizedShape: (_f = this._spec.transform) === null || _f === void 0 ? void 0 : _f.customShape
|
|
80644
80606
|
});
|
|
80645
80607
|
}
|
|
80646
80608
|
if ((_h = (_g = this._spec) === null || _g === void 0 ? void 0 : _g.outerLabel) === null || _h === void 0 ? void 0 : _h.visible) {
|
|
@@ -81205,7 +81167,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
81205
81167
|
this._funnelMark = this._createMark(Object.assign(Object.assign({}, Funnel3dSeries.mark.funnel3d), { name: this._funnelMarkName, type: this._funnelMarkType }), {
|
|
81206
81168
|
themeSpec: (_a = this._theme) === null || _a === void 0 ? void 0 : _a.funnel3d,
|
|
81207
81169
|
key: this._seriesField,
|
|
81208
|
-
isSeriesMark: true
|
|
81170
|
+
isSeriesMark: true
|
|
81171
|
+
}, {
|
|
81209
81172
|
support3d: true
|
|
81210
81173
|
});
|
|
81211
81174
|
if (this._spec.isTransform) {
|
|
@@ -82425,8 +82388,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
82425
82388
|
}
|
|
82426
82389
|
const sunburstMark = this._createMark(SunburstSeries.mark.sunburst, {
|
|
82427
82390
|
isSeriesMark: true,
|
|
82428
|
-
|
|
82429
|
-
|
|
82391
|
+
stateSort: (_a = this._spec.sunburst) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
82392
|
+
}, {
|
|
82393
|
+
setCustomizedShape: (_b = this._spec.sunburst) === null || _b === void 0 ? void 0 : _b.customShape
|
|
82430
82394
|
});
|
|
82431
82395
|
this._sunburstMark = sunburstMark;
|
|
82432
82396
|
}
|
|
@@ -82713,8 +82677,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
82713
82677
|
return;
|
|
82714
82678
|
}
|
|
82715
82679
|
const circlePacking = this._createMark(CirclePackingSeries.mark.circlePacking, {
|
|
82716
|
-
isSeriesMark: true
|
|
82717
|
-
|
|
82680
|
+
isSeriesMark: true
|
|
82681
|
+
}, {
|
|
82682
|
+
setCustomizedShape: (_b = this._spec.circlePacking) === null || _b === void 0 ? void 0 : _b.customShape
|
|
82718
82683
|
});
|
|
82719
82684
|
this._circlePackingMark = circlePacking;
|
|
82720
82685
|
}
|
|
@@ -84211,18 +84176,20 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
84211
84176
|
isSeriesMark: true,
|
|
84212
84177
|
dataView: this._nodesSeriesData.getDataView(),
|
|
84213
84178
|
dataProductId: this._nodesSeriesData.getProductId(),
|
|
84214
|
-
|
|
84215
|
-
|
|
84179
|
+
stateSort: (_a = this._spec.node) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
84180
|
+
}, {
|
|
84181
|
+
setCustomizedShape: (_b = this._spec.node) === null || _b === void 0 ? void 0 : _b.customShape
|
|
84216
84182
|
});
|
|
84217
84183
|
if (nodeMark) {
|
|
84218
|
-
nodeMark.
|
|
84184
|
+
nodeMark.setMarkConfig({ zIndex: this._nodeLayoutZIndex });
|
|
84219
84185
|
this._nodeMark = nodeMark;
|
|
84220
84186
|
}
|
|
84221
84187
|
const linkMark = this._createMark(SankeySeries.mark.link, {
|
|
84222
84188
|
dataView: this._linksSeriesData.getDataView(),
|
|
84223
84189
|
dataProductId: this._linksSeriesData.getProductId(),
|
|
84224
|
-
|
|
84225
|
-
|
|
84190
|
+
stateSort: (_c = this._spec.link) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
84191
|
+
}, {
|
|
84192
|
+
setCustomizedShape: (_d = this._spec.link) === null || _d === void 0 ? void 0 : _d.customShape
|
|
84226
84193
|
});
|
|
84227
84194
|
if (linkMark) {
|
|
84228
84195
|
this._linkMark = linkMark;
|
|
@@ -84311,7 +84278,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
84311
84278
|
maxLineWidth: labelSpec.limit
|
|
84312
84279
|
});
|
|
84313
84280
|
}
|
|
84314
|
-
labelMark.
|
|
84281
|
+
labelMark.setMarkConfig({ zIndex: this._labelLayoutZIndex });
|
|
84315
84282
|
}
|
|
84316
84283
|
_createText(datum, labelSpec) {
|
|
84317
84284
|
if (isNil$1(datum) || isNil$1(datum.datum)) {
|
|
@@ -84805,8 +84772,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
84805
84772
|
var _a, _b, _c, _d;
|
|
84806
84773
|
const nonLeafMark = this._createMark(TreemapSeries.mark.nonLeaf, {
|
|
84807
84774
|
isSeriesMark: true,
|
|
84808
|
-
|
|
84809
|
-
|
|
84775
|
+
stateSort: (_a = this._spec.nonLeaf) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
84776
|
+
}, {
|
|
84777
|
+
setCustomizedShape: (_b = this._spec.nonLeaf) === null || _b === void 0 ? void 0 : _b.customShape
|
|
84810
84778
|
});
|
|
84811
84779
|
if (nonLeafMark) {
|
|
84812
84780
|
nonLeafMark.setTransform([
|
|
@@ -84821,8 +84789,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
84821
84789
|
}
|
|
84822
84790
|
const leafMark = this._createMark(TreemapSeries.mark.leaf, {
|
|
84823
84791
|
isSeriesMark: true,
|
|
84824
|
-
|
|
84825
|
-
|
|
84792
|
+
stateSort: (_c = this._spec.leaf) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
84793
|
+
}, {
|
|
84794
|
+
setCustomizedShape: (_d = this._spec.leaf) === null || _d === void 0 ? void 0 : _d.customShape
|
|
84826
84795
|
});
|
|
84827
84796
|
if (leafMark) {
|
|
84828
84797
|
leafMark.setTransform([
|
|
@@ -85486,18 +85455,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
85486
85455
|
largeThreshold: this._spec.largeThreshold
|
|
85487
85456
|
};
|
|
85488
85457
|
this._cellMark = this._createMark(HeatmapSeries.mark.cell, {
|
|
85489
|
-
morph: shouldMarkDoMorph(this._spec, HeatmapSeries.mark.cell.name),
|
|
85490
|
-
defaultMorphElementKey: this.getDimensionField()[0],
|
|
85491
85458
|
isSeriesMark: true,
|
|
85492
|
-
|
|
85493
|
-
|
|
85494
|
-
stateSort: (_b = this._spec.cell) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
85495
|
-
});
|
|
85459
|
+
stateSort: (_a = this._spec.cell) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
85460
|
+
}, 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
85461
|
this._backgroundMark = this._createMark(HeatmapSeries.mark.cellBackground, {
|
|
85497
|
-
|
|
85498
|
-
|
|
85499
|
-
stateSort: (_d = this._spec.cellBackground) === null || _d === void 0 ? void 0 : _d.stateSort
|
|
85500
|
-
});
|
|
85462
|
+
stateSort: (_c = this._spec.cellBackground) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
85463
|
+
}, Object.assign(Object.assign({}, progressive), { setCustomizedShape: (_d = this._spec.cellBackground) === null || _d === void 0 ? void 0 : _d.customShape }));
|
|
85501
85464
|
}
|
|
85502
85465
|
initMarkStyle() {
|
|
85503
85466
|
this.initCellMarkStyle();
|
|
@@ -85912,11 +85875,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
85912
85875
|
groupKey: this._seriesField,
|
|
85913
85876
|
isSeriesMark: true,
|
|
85914
85877
|
key: DEFAULT_DATA_INDEX,
|
|
85915
|
-
|
|
85916
|
-
|
|
85878
|
+
stateSort: (_a = this._spec.nodePoint) === null || _a === void 0 ? void 0 : _a.stateSort
|
|
85879
|
+
}, {
|
|
85880
|
+
setCustomizedShape: (_b = this._spec.nodePoint) === null || _b === void 0 ? void 0 : _b.customShape
|
|
85917
85881
|
});
|
|
85918
85882
|
if (nodePointMark) {
|
|
85919
|
-
nodePointMark.
|
|
85883
|
+
nodePointMark.setMarkConfig({ zIndex: LayoutZIndex.Node });
|
|
85920
85884
|
this._nodePointMark = nodePointMark;
|
|
85921
85885
|
}
|
|
85922
85886
|
const ripplePointMark = this._createMark(CorrelationSeries.mark.ripplePoint, {
|
|
@@ -85931,11 +85895,12 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
85931
85895
|
key: DEFAULT_DATA_INDEX,
|
|
85932
85896
|
dataView: this._centerSeriesData.getDataView(),
|
|
85933
85897
|
dataProductId: this._centerSeriesData.getProductId(),
|
|
85934
|
-
|
|
85935
|
-
|
|
85898
|
+
stateSort: (_c = this._spec.centerPoint) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
85899
|
+
}, {
|
|
85900
|
+
setCustomizedShape: (_d = this._spec.centerPoint) === null || _d === void 0 ? void 0 : _d.customShape
|
|
85936
85901
|
});
|
|
85937
85902
|
if (centerPointMark) {
|
|
85938
|
-
centerPointMark.
|
|
85903
|
+
centerPointMark.setMarkConfig({ zIndex: LayoutZIndex.Node });
|
|
85939
85904
|
this._centerPointMark = centerPointMark;
|
|
85940
85905
|
}
|
|
85941
85906
|
}
|
|
@@ -86363,7 +86328,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
86363
86328
|
}
|
|
86364
86329
|
_initLiquidOutlineMarkStyle() {
|
|
86365
86330
|
const liquidOutlineMark = this._liquidOutlineMark;
|
|
86366
|
-
liquidOutlineMark.setZIndex(this.layoutZIndex);
|
|
86367
86331
|
liquidOutlineMark.created();
|
|
86368
86332
|
this.setMarkStyle(liquidOutlineMark, {
|
|
86369
86333
|
stroke: this.getColorAttribute(),
|
|
@@ -86371,19 +86335,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
86371
86335
|
height: () => this._region.getLayoutRect().height,
|
|
86372
86336
|
path: () => this._getLiquidBackPath(true)
|
|
86373
86337
|
}, 'normal', AttributeLevel.Series);
|
|
86374
|
-
this._liquidOutlineMark.
|
|
86338
|
+
this._liquidOutlineMark.setMarkConfig({ interactive: false, zIndex: this.layoutZIndex });
|
|
86375
86339
|
}
|
|
86376
86340
|
_initLiquidBackgroundMarkStyle() {
|
|
86377
86341
|
const liquidBackgroundMark = this._liquidBackgroundMark;
|
|
86378
|
-
liquidBackgroundMark.setZIndex(this.layoutZIndex);
|
|
86379
86342
|
liquidBackgroundMark.created();
|
|
86380
86343
|
this.setMarkStyle(liquidBackgroundMark, {
|
|
86381
|
-
clip: true,
|
|
86382
86344
|
width: () => this._region.getLayoutRect().width,
|
|
86383
86345
|
height: () => this._region.getLayoutRect().height,
|
|
86384
86346
|
path: () => this._getLiquidBackPath()
|
|
86385
86347
|
}, 'normal', AttributeLevel.Series);
|
|
86386
|
-
this._liquidBackgroundMark.
|
|
86348
|
+
this._liquidBackgroundMark.setMarkConfig({ interactive: false, zIndex: this.layoutZIndex, clip: true });
|
|
86387
86349
|
}
|
|
86388
86350
|
_initLiquidMarkStyle() {
|
|
86389
86351
|
const liquidMark = this._liquidMark;
|
|
@@ -92819,7 +92781,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
92819
92781
|
if (this._auto) {
|
|
92820
92782
|
(_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
92783
|
}
|
|
92822
|
-
axis.effect.scaleUpdate(
|
|
92784
|
+
axis.effect.scaleUpdate({
|
|
92785
|
+
value: 'force'
|
|
92786
|
+
});
|
|
92823
92787
|
}
|
|
92824
92788
|
else {
|
|
92825
92789
|
eachSeries(this._regions, s => {
|
|
@@ -96488,13 +96452,14 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
96488
96452
|
if (this._layoutRule === 'region') {
|
|
96489
96453
|
const component = this._createMark({ type: "component", name: `${region.getGroupMark().name}-label-component` }, {
|
|
96490
96454
|
componentType: 'label',
|
|
96491
|
-
noSeparateStyle: true
|
|
96455
|
+
noSeparateStyle: true
|
|
96456
|
+
}, {
|
|
96492
96457
|
support3d: this._spec.support3d
|
|
96493
96458
|
});
|
|
96494
96459
|
if (component) {
|
|
96495
96460
|
component.setSkipBeforeLayouted(true);
|
|
96496
96461
|
if (regionLabelInfo[0] && isValid$1(regionLabelInfo[0].labelSpec.zIndex)) {
|
|
96497
|
-
component.
|
|
96462
|
+
component.setMarkConfig({ zIndex: regionLabelInfo[0].labelSpec.zIndex });
|
|
96498
96463
|
}
|
|
96499
96464
|
this._marks.addMark(component);
|
|
96500
96465
|
this._labelComponentMap.set(component, () => {
|
|
@@ -96506,12 +96471,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
96506
96471
|
regionLabelInfo.forEach((labelInfo, i) => {
|
|
96507
96472
|
const component = this._createMark({ type: "component", name: `${labelInfo.labelMark.name}-component` }, {
|
|
96508
96473
|
componentType: 'label',
|
|
96509
|
-
noSeparateStyle: true
|
|
96510
|
-
|
|
96474
|
+
noSeparateStyle: true
|
|
96475
|
+
}, {
|
|
96476
|
+
support3d: labelInfo.baseMark.getMarkConfig().support3d
|
|
96511
96477
|
});
|
|
96512
96478
|
if (component) {
|
|
96513
96479
|
if (isValid$1(labelInfo.labelSpec.zIndex)) {
|
|
96514
|
-
component.
|
|
96480
|
+
component.setMarkConfig({ zIndex: labelInfo.labelSpec.zIndex });
|
|
96515
96481
|
}
|
|
96516
96482
|
component.setSkipBeforeLayouted(true);
|
|
96517
96483
|
this._marks.addMark(component);
|
|
@@ -96722,7 +96688,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
96722
96688
|
const series = this._getSeries();
|
|
96723
96689
|
const component = this._createMark({ type: "component", name: `${series.name}-total-label-component` }, {
|
|
96724
96690
|
componentType: 'label',
|
|
96725
|
-
noSeparateStyle: true
|
|
96691
|
+
noSeparateStyle: true
|
|
96692
|
+
}, {
|
|
96726
96693
|
support3d: this._spec.support3d
|
|
96727
96694
|
});
|
|
96728
96695
|
if (component) {
|