@visactor/vchart 1.1.2 → 1.1.3-beta.1
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/index.js +114 -65
- package/build/index.min.js +1 -1
- package/cjs/chart/waterfall/waterfall.js +1 -0
- package/cjs/chart/waterfall/waterfall.js.map +1 -1
- package/cjs/component/data-zoom/data-filter-base-component.js +2 -3
- package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
- package/cjs/component/data-zoom/data-zoom/data-zoom.js +6 -6
- package/cjs/component/data-zoom/data-zoom/data-zoom.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/transforms/legend-data/discrete/discrete.js +3 -2
- package/cjs/data/transforms/legend-data/discrete/discrete.js.map +1 -1
- package/cjs/data/transforms/sankey.d.ts +2 -0
- package/cjs/data/transforms/sankey.js +9 -1
- package/cjs/data/transforms/sankey.js.map +1 -1
- package/cjs/series/base/base-series.js.map +1 -1
- package/cjs/series/geo/geo.js +2 -1
- package/cjs/series/geo/geo.js.map +1 -1
- package/cjs/series/sankey/sankey.js +7 -4
- package/cjs/series/sankey/sankey.js.map +1 -1
- package/cjs/series/word-cloud/base.d.ts +7 -0
- package/cjs/series/word-cloud/base.js +8 -3
- package/cjs/series/word-cloud/base.js.map +1 -1
- package/esm/chart/waterfall/waterfall.js +1 -0
- package/esm/chart/waterfall/waterfall.js.map +1 -1
- package/esm/component/data-zoom/data-filter-base-component.js +2 -3
- package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
- package/esm/component/data-zoom/data-zoom/data-zoom.js +6 -6
- package/esm/component/data-zoom/data-zoom/data-zoom.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/transforms/legend-data/discrete/discrete.js +4 -1
- package/esm/data/transforms/legend-data/discrete/discrete.js.map +1 -1
- package/esm/data/transforms/sankey.d.ts +2 -0
- package/esm/data/transforms/sankey.js +9 -1
- package/esm/data/transforms/sankey.js.map +1 -1
- package/esm/series/base/base-series.js.map +1 -1
- package/esm/series/geo/geo.js +2 -1
- package/esm/series/geo/geo.js.map +1 -1
- package/esm/series/sankey/sankey.js +7 -4
- package/esm/series/sankey/sankey.js.map +1 -1
- package/esm/series/word-cloud/base.d.ts +7 -0
- package/esm/series/word-cloud/base.js +7 -0
- package/esm/series/word-cloud/base.js.map +1 -1
- package/package.json +1 -1
package/build/index.js
CHANGED
|
@@ -22298,18 +22298,18 @@
|
|
|
22298
22298
|
bind(DefaultGlobal).toSelf().inSingletonScope(), bind(Global).toService(DefaultGlobal), bind(DefaultWindow).to(DefaultWindow), bind(Window).toService(DefaultWindow), bind(DefaultGraphicUtil).toSelf().inSingletonScope(), bind(GraphicUtil).toService(DefaultGraphicUtil), bind(DefaultTransformUtil).toSelf().inSingletonScope(), bind(TransformUtil).toService(DefaultTransformUtil), bind(DefaultLayerService).toSelf().inSingletonScope(), bind(LayerService).toService(DefaultLayerService);
|
|
22299
22299
|
});
|
|
22300
22300
|
|
|
22301
|
-
function runFill(fill) {
|
|
22302
|
-
return
|
|
22301
|
+
function runFill(fill, background) {
|
|
22302
|
+
return !(!fill && !background);
|
|
22303
22303
|
}
|
|
22304
22304
|
function runStroke(stroke, lineWidth) {
|
|
22305
22305
|
let s;
|
|
22306
22306
|
return s = isArray$3(stroke) ? stroke.some(item => item || void 0 === item) : !!stroke, s && lineWidth > 0;
|
|
22307
22307
|
}
|
|
22308
|
-
function fillVisible(opacity, fillOpacity) {
|
|
22309
|
-
return opacity * fillOpacity > 0;
|
|
22308
|
+
function fillVisible(opacity, fillOpacity, fill) {
|
|
22309
|
+
return fill && opacity * fillOpacity > 0;
|
|
22310
22310
|
}
|
|
22311
|
-
function rectFillVisible(opacity, fillOpacity, width, height) {
|
|
22312
|
-
return opacity * fillOpacity > 0 && width > 0 && height > 0;
|
|
22311
|
+
function rectFillVisible(opacity, fillOpacity, width, height, fill) {
|
|
22312
|
+
return fill && opacity * fillOpacity > 0 && width > 0 && height > 0;
|
|
22313
22313
|
}
|
|
22314
22314
|
function strokeVisible(opacity, strokeOpacity) {
|
|
22315
22315
|
return opacity * strokeOpacity > 0;
|
|
@@ -22329,7 +22329,7 @@
|
|
|
22329
22329
|
strokeOpacity = themeAttributes.strokeOpacity,
|
|
22330
22330
|
visible = themeAttributes.visible
|
|
22331
22331
|
} = graphic.attribute,
|
|
22332
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
22332
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
22333
22333
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
22334
22334
|
doFill = runFill(fill),
|
|
22335
22335
|
doStroke = runStroke(stroke, lineWidth);
|
|
@@ -22691,12 +22691,12 @@
|
|
|
22691
22691
|
x: originX = arcAttribute.x,
|
|
22692
22692
|
y: originY = arcAttribute.y
|
|
22693
22693
|
} = arc.attribute,
|
|
22694
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
22694
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
22695
22695
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
22696
|
-
doFill = runFill(fill),
|
|
22696
|
+
doFill = runFill(fill, background),
|
|
22697
22697
|
doStroke = runStroke(stroke, lineWidth);
|
|
22698
22698
|
if (!arc.valid || !visible) return;
|
|
22699
|
-
if (!
|
|
22699
|
+
if (!doFill && !doStroke) return;
|
|
22700
22700
|
if (!(fVisible || sVisible || fillCb || strokeCb || background)) return;
|
|
22701
22701
|
const {
|
|
22702
22702
|
outerRadius = arcAttribute.outerRadius,
|
|
@@ -22709,7 +22709,7 @@
|
|
|
22709
22709
|
isFullStroke: isFullStroke,
|
|
22710
22710
|
stroke: arrayStroke
|
|
22711
22711
|
} = parseStroke(stroke);
|
|
22712
|
-
if (doFill || isFullStroke
|
|
22712
|
+
if (doFill || isFullStroke) {
|
|
22713
22713
|
if (context.beginPath(), drawArcPath$1(arc, context, x, y, outerRadius, innerRadius), !this._arcBeforeRenderContribitions) {
|
|
22714
22714
|
this._arcBeforeRenderContribitions = [], this._arcAfterRenderContribitions = [];
|
|
22715
22715
|
const contributions = this.arcRenderContribitions.getContributions() || [];
|
|
@@ -22833,11 +22833,11 @@
|
|
|
22833
22833
|
x: originX = circleAttribute.x,
|
|
22834
22834
|
y: originY = circleAttribute.y
|
|
22835
22835
|
} = circle.attribute,
|
|
22836
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
22836
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
22837
22837
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
22838
|
-
doFill = runFill(fill),
|
|
22838
|
+
doFill = runFill(fill, background),
|
|
22839
22839
|
doStroke = runStroke(stroke, lineWidth);
|
|
22840
|
-
circle.valid && visible && (doFill || doStroke
|
|
22840
|
+
circle.valid && visible && (doFill || doStroke) && (fVisible || sVisible || fillCb || strokeCb || background) && (context.beginPath(), context.arc(x, y, radius, startAngle, endAngle), context.closePath(), this._circleRenderContribitions || (this._circleRenderContribitions = this.circleRenderContribitions.getContributions() || [], this._circleRenderContribitions.sort((a, b) => b.order - a.order)), this._circleRenderContribitions.forEach(c => {
|
|
22841
22841
|
c.time === BaseRenderContributionTime.beforeFillStroke && c.drawShape(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb);
|
|
22842
22842
|
}), context.setShadowStyle && context.setShadowStyle(circle, circle.attribute, circleAttribute), doFill && (fillCb ? fillCb(context, circle.attribute, circleAttribute) : fVisible && (context.setCommonStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.fill())), doStroke && (strokeCb ? strokeCb(context, circle.attribute, circleAttribute) : sVisible && (context.setStrokeStyle(circle, circle.attribute, originX - x, originY - y, circleAttribute), context.stroke())), this._circleRenderContribitions.forEach(c => {
|
|
22843
22843
|
c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb);
|
|
@@ -25802,10 +25802,14 @@
|
|
|
25802
25802
|
return aabbBounds.set(-outerRadius, -outerRadius, outerRadius, outerRadius), aabbBounds;
|
|
25803
25803
|
}
|
|
25804
25804
|
updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds, graphic) {
|
|
25805
|
-
|
|
25805
|
+
let {
|
|
25806
25806
|
outerRadius = arcTheme.outerRadius,
|
|
25807
25807
|
innerRadius = arcTheme.innerRadius
|
|
25808
25808
|
} = attribute;
|
|
25809
|
+
if (outerRadius < innerRadius) {
|
|
25810
|
+
const temp = outerRadius;
|
|
25811
|
+
outerRadius = innerRadius, innerRadius = temp;
|
|
25812
|
+
}
|
|
25809
25813
|
let {
|
|
25810
25814
|
endAngle = arcTheme.endAngle,
|
|
25811
25815
|
startAngle = arcTheme.startAngle
|
|
@@ -25928,7 +25932,7 @@
|
|
|
25928
25932
|
return isArray$3(text) ? !text.every(t => null == t || "" === t) : null != text && "" !== text;
|
|
25929
25933
|
}
|
|
25930
25934
|
updateMultilineAABBBounds(text) {
|
|
25931
|
-
var _a;
|
|
25935
|
+
var _a, _b, _c;
|
|
25932
25936
|
const textTheme = getTheme(this).text,
|
|
25933
25937
|
{
|
|
25934
25938
|
fontFamily = textTheme.fontFamily,
|
|
@@ -25967,6 +25971,10 @@
|
|
|
25967
25971
|
break;
|
|
25968
25972
|
}
|
|
25969
25973
|
const clip = layoutObj.textMeasure.clipText(str, layoutObj.textOptions, maxLineWidth);
|
|
25974
|
+
if ("" !== str && "" === clip.str) if (ellipsis) {
|
|
25975
|
+
const clipEllipsis = layoutObj.textMeasure.clipTextWithSuffix(str, layoutObj.textOptions, maxLineWidth, ellipsis);
|
|
25976
|
+
clip.str = null !== (_b = clipEllipsis.str) && void 0 !== _b ? _b : "", clip.width = null !== (_c = clipEllipsis.width) && void 0 !== _c ? _c : 0;
|
|
25977
|
+
} else clip.str = "", clip.width = 0;
|
|
25970
25978
|
if (linesLayout.push({
|
|
25971
25979
|
str: clip.str,
|
|
25972
25980
|
width: clip.width
|
|
@@ -26192,6 +26200,7 @@
|
|
|
26192
26200
|
BaseRender = __decorate$1v([injectable()], BaseRender);
|
|
26193
26201
|
|
|
26194
26202
|
function drawSegments(path, segPath, percent, clipRangeByDimension, params) {
|
|
26203
|
+
if (!segPath) return;
|
|
26195
26204
|
const {
|
|
26196
26205
|
offsetX = 0,
|
|
26197
26206
|
offsetY = 0,
|
|
@@ -26294,6 +26303,7 @@
|
|
|
26294
26303
|
}
|
|
26295
26304
|
drawSegmentItem(context, cache, fill, stroke, fillOpacity, strokeOpacity, attribute, defaultAttribute, clipRange, clipRangeByDimension, offsetX, offsetY, line, fillCb, strokeCb) {
|
|
26296
26305
|
var _a;
|
|
26306
|
+
if (!cache) return;
|
|
26297
26307
|
context.beginPath();
|
|
26298
26308
|
const z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
|
|
26299
26309
|
drawSegments(context.camera ? context : context.nativeContext, cache, clipRange, clipRangeByDimension, {
|
|
@@ -26318,7 +26328,7 @@
|
|
|
26318
26328
|
lineWidth = lineAttribute.lineWidth,
|
|
26319
26329
|
visible = lineAttribute.visible
|
|
26320
26330
|
} = line.attribute,
|
|
26321
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
26331
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
26322
26332
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
26323
26333
|
doFill = runFill(fill),
|
|
26324
26334
|
doStroke = runStroke(stroke, lineWidth);
|
|
@@ -26499,12 +26509,13 @@
|
|
|
26499
26509
|
opacity = areaAttribute.opacity,
|
|
26500
26510
|
visible = areaAttribute.visible,
|
|
26501
26511
|
z = areaAttribute.z,
|
|
26512
|
+
background: background,
|
|
26502
26513
|
stroke = area.attribute.stroke,
|
|
26503
26514
|
lineWidth = areaAttribute.lineWidth,
|
|
26504
26515
|
strokeOpacity = areaAttribute.strokeOpacity
|
|
26505
26516
|
} = area.attribute,
|
|
26506
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
26507
|
-
doFill = runFill(fill),
|
|
26517
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
26518
|
+
doFill = runFill(fill, background),
|
|
26508
26519
|
doStroke = runStroke(stroke, lineWidth),
|
|
26509
26520
|
sVisible = strokeVisible(opacity, strokeOpacity);
|
|
26510
26521
|
if (!area.valid || !visible) return;
|
|
@@ -26605,6 +26616,7 @@
|
|
|
26605
26616
|
drawPathProxy(area, context, x, y, drawContext, params) || this.drawShape(area, context, x, y, drawContext, params), context.highPerformanceRestore();
|
|
26606
26617
|
}
|
|
26607
26618
|
drawSegmentItem(context, cache, fill, fillOpacity, stroke, strokeOpacity, attribute, defaultAttribute, clipRange, offsetX, offsetY, offsetZ, area, drawContext, fillCb, strokeCb) {
|
|
26619
|
+
if (!cache) return;
|
|
26608
26620
|
context.beginPath();
|
|
26609
26621
|
drawAreaSegments(context.camera ? context : context.nativeContext, cache, clipRange, {
|
|
26610
26622
|
offsetX: offsetX,
|
|
@@ -26673,11 +26685,11 @@
|
|
|
26673
26685
|
y: originY = pathAttribute.y
|
|
26674
26686
|
} = path.attribute,
|
|
26675
26687
|
z = null !== (_a = this.z) && void 0 !== _a ? _a : 0,
|
|
26676
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
26688
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
26677
26689
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
26678
|
-
doFill = runFill(fill),
|
|
26690
|
+
doFill = runFill(fill, background),
|
|
26679
26691
|
doStroke = runStroke(stroke, lineWidth);
|
|
26680
|
-
if (path.valid && visible && (doFill || doStroke
|
|
26692
|
+
if (path.valid && visible && (doFill || doStroke) && (fVisible || sVisible || fillCb || strokeCb || background)) {
|
|
26681
26693
|
if (context.beginPath(), path.pathShape) renderCommandList(path.pathShape.commandList, context, x, y, 1, 1, z);else {
|
|
26682
26694
|
const path2D = null !== (_b = path.attribute.path) && void 0 !== _b ? _b : pathAttribute.path;
|
|
26683
26695
|
renderCommandList(path2D.commandList, context, x, y, 1, 1, z);
|
|
@@ -26799,12 +26811,12 @@
|
|
|
26799
26811
|
x: originX = rectAttribute.x,
|
|
26800
26812
|
y: originY = rectAttribute.y
|
|
26801
26813
|
} = rect.attribute,
|
|
26802
|
-
fVisible = rectFillVisible(opacity, fillOpacity, width, height),
|
|
26814
|
+
fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
|
|
26803
26815
|
sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height),
|
|
26804
|
-
doFill = runFill(fill),
|
|
26816
|
+
doFill = runFill(fill, background),
|
|
26805
26817
|
doStroke = runStroke(stroke, lineWidth);
|
|
26806
26818
|
if (!rect.valid || !visible) return;
|
|
26807
|
-
if (!
|
|
26819
|
+
if (!doFill && !doStroke) return;
|
|
26808
26820
|
if (!(fVisible || sVisible || fillCb || strokeCb || background)) return;
|
|
26809
26821
|
0 === cornerRadius || isArray$3(cornerRadius) && cornerRadius.every(num => 0 === num) ? (context.beginPath(), context.rect(x, y, width, height)) : (context.beginPath(), createRectPath(context, x, y, width, height, cornerRadius)), this._rectRenderContribitions || (this._rectRenderContribitions = this.rectRenderContribitions.getContributions() || [], this._rectRenderContribitions.sort((a, b) => b.order - a.order));
|
|
26810
26822
|
const doFillOrStroke = {
|
|
@@ -26874,12 +26886,12 @@
|
|
|
26874
26886
|
scaleX = symbolAttribute.scaleX,
|
|
26875
26887
|
scaleY = symbolAttribute.scaleY
|
|
26876
26888
|
} = symbol.attribute,
|
|
26877
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
26889
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
26878
26890
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
26879
|
-
doFill = runFill(fill),
|
|
26891
|
+
doFill = runFill(fill, background),
|
|
26880
26892
|
doStroke = runStroke(stroke, lineWidth);
|
|
26881
26893
|
if (!symbol.valid || !visible) return;
|
|
26882
|
-
if (!
|
|
26894
|
+
if (!doFill && !doStroke) return;
|
|
26883
26895
|
if (!(fVisible || sVisible || fillCb || strokeCb || background)) return;
|
|
26884
26896
|
const parsedPath = symbol.getParsedPath();
|
|
26885
26897
|
if (!parsedPath) return;
|
|
@@ -26957,7 +26969,7 @@
|
|
|
26957
26969
|
y: originY = textAttribute.y
|
|
26958
26970
|
} = text.attribute,
|
|
26959
26971
|
lineHeight = null !== (_a = text.attribute.lineHeight) && void 0 !== _a ? _a : fontSize,
|
|
26960
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
26972
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
26961
26973
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
26962
26974
|
doFill = runFill(fill),
|
|
26963
26975
|
doStroke = runStroke(stroke, lineWidth);
|
|
@@ -27170,11 +27182,11 @@
|
|
|
27170
27182
|
x: originX = polygonAttribute.x,
|
|
27171
27183
|
y: originY = polygonAttribute.y
|
|
27172
27184
|
} = polygon.attribute,
|
|
27173
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
27185
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
27174
27186
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
27175
|
-
doFill = runFill(fill),
|
|
27187
|
+
doFill = runFill(fill, background),
|
|
27176
27188
|
doStroke = runStroke(stroke, lineWidth);
|
|
27177
|
-
polygon.valid && visible && (doFill || doStroke
|
|
27189
|
+
polygon.valid && visible && (doFill || doStroke) && (fVisible || sVisible || fillCb || strokeCb || background) && (context.beginPath(), cornerRadius <= 0 || isArray$3(cornerRadius) && cornerRadius.every(num => 0 === num) ? drawPolygon(context.camera ? context : context.nativeContext, points, x, y) : drawRoundedPolygon(context.camera ? context : context.nativeContext, points, x, y, cornerRadius), context.closePath(), this._polygonRenderContribitions || (this._polygonRenderContribitions = this.polygonRenderContribitions.getContributions() || [], this._polygonRenderContribitions.sort((a, b) => b.order - a.order)), this._polygonRenderContribitions.forEach(c => {
|
|
27178
27190
|
c.time === BaseRenderContributionTime.beforeFillStroke && c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
|
|
27179
27191
|
}), context.setShadowStyle && context.setShadowStyle(polygon, polygon.attribute, polygonAttribute), doFill && (fillCb ? fillCb(context, polygon.attribute, polygonAttribute) : fillOpacity && (context.setCommonStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.fill())), doStroke && (strokeCb ? strokeCb(context, polygon.attribute, polygonAttribute) : strokeOpacity && (context.setStrokeStyle(polygon, polygon.attribute, originX - x, originY - y, polygonAttribute), context.stroke())), this._polygonRenderContribitions.forEach(c => {
|
|
27180
27192
|
c.time === BaseRenderContributionTime.afterFillStroke && c.drawShape(polygon, context, x, y, doFill, doStroke, fVisible, sVisible, polygonAttribute, drawContext, fillCb, strokeCb);
|
|
@@ -27233,7 +27245,7 @@
|
|
|
27233
27245
|
repeatY = imageAttribute.repeatY,
|
|
27234
27246
|
image: url
|
|
27235
27247
|
} = image.attribute,
|
|
27236
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
27248
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
27237
27249
|
doFill = runFill(fill);
|
|
27238
27250
|
if (image.valid && visible && doFill && (fVisible || fillCb)) {
|
|
27239
27251
|
if (this._imageRenderContribitions || (this._imageRenderContribitions = this.imageRenderContribitions.getContributions() || []), this._imageRenderContribitions.forEach(c => {
|
|
@@ -32352,13 +32364,13 @@
|
|
|
32352
32364
|
lineWidth = groupAttribute.lineWidth,
|
|
32353
32365
|
visible = groupAttribute.visible
|
|
32354
32366
|
} = group.attribute,
|
|
32355
|
-
fVisible = rectFillVisible(opacity, fillOpacity, width, height),
|
|
32367
|
+
fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
|
|
32356
32368
|
sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height),
|
|
32357
|
-
doFill = runFill(fill),
|
|
32369
|
+
doFill = runFill(fill, background),
|
|
32358
32370
|
doStroke = runStroke(stroke, lineWidth);
|
|
32359
32371
|
if (!group.valid || !visible) return;
|
|
32360
32372
|
if (!clip) {
|
|
32361
|
-
if (!
|
|
32373
|
+
if (!doFill && !doStroke) return;
|
|
32362
32374
|
if (!(fVisible || sVisible || fillCb || strokeCb || background)) return;
|
|
32363
32375
|
}
|
|
32364
32376
|
if (path && path.length && drawContext.drawContribution) {
|
|
@@ -32440,7 +32452,7 @@
|
|
|
32440
32452
|
lineWidth = lineAttribute.lineWidth,
|
|
32441
32453
|
visible = lineAttribute.visible
|
|
32442
32454
|
} = line.attribute,
|
|
32443
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
32455
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
32444
32456
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
32445
32457
|
doFill = runFill(fill),
|
|
32446
32458
|
doStroke = runStroke(stroke, lineWidth);
|
|
@@ -32490,7 +32502,7 @@
|
|
|
32490
32502
|
opacity = areaAttribute.opacity,
|
|
32491
32503
|
visible = areaAttribute.visible
|
|
32492
32504
|
} = area.attribute,
|
|
32493
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
32505
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
32494
32506
|
doFill = runFill(fill);
|
|
32495
32507
|
if (!area.valid || !visible) return;
|
|
32496
32508
|
if (!doFill) return;
|
|
@@ -32680,7 +32692,7 @@
|
|
|
32680
32692
|
visible = rectAttribute.visible
|
|
32681
32693
|
} = rect.attribute,
|
|
32682
32694
|
z = null !== (_a = this.z) && void 0 !== _a ? _a : 0,
|
|
32683
|
-
fVisible = rectFillVisible(opacity, fillOpacity, width, height),
|
|
32695
|
+
fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
|
|
32684
32696
|
sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height),
|
|
32685
32697
|
doFill = runFill(fill),
|
|
32686
32698
|
doStroke = runStroke(stroke, lineWidth);
|
|
@@ -32808,7 +32820,7 @@
|
|
|
32808
32820
|
visible = richtextAttribute.visible
|
|
32809
32821
|
} = richtext.attribute;
|
|
32810
32822
|
if (!richtext.valid || !visible) return;
|
|
32811
|
-
if (!fillVisible(opacity, fillOpacity)) return;
|
|
32823
|
+
if (!fillVisible(opacity, fillOpacity, !0)) return;
|
|
32812
32824
|
context.translate(x, y);
|
|
32813
32825
|
richtext.getFrameCache().draw(context, this.drawIcon);
|
|
32814
32826
|
}
|
|
@@ -32968,13 +32980,13 @@
|
|
|
32968
32980
|
strokeOpacity = arcAttribute.strokeOpacity,
|
|
32969
32981
|
visible = arcAttribute.visible
|
|
32970
32982
|
} = arc.attribute,
|
|
32971
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
32983
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
32972
32984
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
32973
|
-
doFill = runFill(fill),
|
|
32985
|
+
doFill = runFill(fill, background),
|
|
32974
32986
|
doStroke = runStroke(stroke, lineWidth),
|
|
32975
32987
|
z = null !== (_a = this.z) && void 0 !== _a ? _a : 0;
|
|
32976
32988
|
if (!arc.valid || !visible) return;
|
|
32977
|
-
if (!
|
|
32989
|
+
if (!doFill && !doStroke) return;
|
|
32978
32990
|
if (!(fVisible || sVisible || fillCb || strokeCb || background)) return;
|
|
32979
32991
|
const {
|
|
32980
32992
|
outerRadius = arcAttribute.outerRadius,
|
|
@@ -33061,7 +33073,7 @@
|
|
|
33061
33073
|
face = [!0, !0, !0, !0, !0, !0]
|
|
33062
33074
|
} = pyramid3d.attribute,
|
|
33063
33075
|
z = null !== (_a = this.z) && void 0 !== _a ? _a : 0,
|
|
33064
|
-
fVisible = fillVisible(opacity, fillOpacity),
|
|
33076
|
+
fVisible = fillVisible(opacity, fillOpacity, fill),
|
|
33065
33077
|
sVisible = strokeVisible(opacity, strokeOpacity),
|
|
33066
33078
|
doFill = runFill(fill),
|
|
33067
33079
|
doStroke = runStroke(stroke, lineWidth);
|
|
@@ -40526,7 +40538,8 @@
|
|
|
40526
40538
|
maxWidth: maxWidth,
|
|
40527
40539
|
padding = 4,
|
|
40528
40540
|
visible: visible,
|
|
40529
|
-
state: state
|
|
40541
|
+
state: state,
|
|
40542
|
+
formatMethod: formatMethod
|
|
40530
40543
|
} = this.attribute,
|
|
40531
40544
|
parsedPadding = normalizePadding$1(padding),
|
|
40532
40545
|
group = this.createOrUpdateChild("tag-content", {
|
|
@@ -40558,7 +40571,7 @@
|
|
|
40558
40571
|
}
|
|
40559
40572
|
tagWidth += symbolPlaceWidth, textX += symbolPlaceWidth;
|
|
40560
40573
|
const textAttrs = Object.assign(Object.assign({
|
|
40561
|
-
text: text,
|
|
40574
|
+
text: formatMethod ? formatMethod(text) : text,
|
|
40562
40575
|
visible: isValid(text) && !1 !== visible,
|
|
40563
40576
|
lineHeight: null == textStyle ? void 0 : textStyle.fontSize
|
|
40564
40577
|
}, textStyle), {
|
|
@@ -43506,13 +43519,14 @@
|
|
|
43506
43519
|
previewCallbackX: previewCallbackX,
|
|
43507
43520
|
previewCallbackY: previewCallbackY,
|
|
43508
43521
|
previewCallbackX1: previewCallbackX1,
|
|
43509
|
-
previewCallbackY1: previewCallbackY1
|
|
43522
|
+
previewCallbackY1: previewCallbackY1,
|
|
43523
|
+
updateStateCallback: updateStateCallback
|
|
43510
43524
|
} = this.attribute,
|
|
43511
43525
|
{
|
|
43512
43526
|
width: width,
|
|
43513
43527
|
height: height
|
|
43514
43528
|
} = size;
|
|
43515
|
-
start && (this.state.start = start), end && (this.state.end = end), this._isHorizontal = "top" === orient || "bottom" === orient, this._layoutCache.max = this._isHorizontal ? width : height, this._layoutCache.attPos = this._isHorizontal ? "x" : "y", this._layoutCache.attSize = this._isHorizontal ? "width" : "height", this._activeCache.startPos = position, this._activeCache.lastPos = position, this._showText = "auto" !== showDetail && showDetail, previewData && (this._previewData = previewData), isFunction(previewCallbackX) && (this._previewCallbackX = previewCallbackX), isFunction(previewCallbackY) && (this._previewCallbackY = previewCallbackY), isFunction(previewCallbackX1) && (this._previewCallbackX1 = previewCallbackX1), isFunction(previewCallbackY1) && (this._previewCallbackY1 = previewCallbackY1);
|
|
43529
|
+
start && (this.state.start = start), end && (this.state.end = end), this._isHorizontal = "top" === orient || "bottom" === orient, this._layoutCache.max = this._isHorizontal ? width : height, this._layoutCache.attPos = this._isHorizontal ? "x" : "y", this._layoutCache.attSize = this._isHorizontal ? "width" : "height", this._activeCache.startPos = position, this._activeCache.lastPos = position, this._showText = "auto" !== showDetail && showDetail, previewData && (this._previewData = previewData), isFunction(previewCallbackX) && (this._previewCallbackX = previewCallbackX), isFunction(previewCallbackY) && (this._previewCallbackY = previewCallbackY), isFunction(previewCallbackX1) && (this._previewCallbackX1 = previewCallbackX1), isFunction(previewCallbackY1) && (this._previewCallbackY1 = previewCallbackY1), isFunction(updateStateCallback) && (this._updateStateCallback = updateStateCallback);
|
|
43516
43530
|
}
|
|
43517
43531
|
bindEvents() {
|
|
43518
43532
|
const {
|
|
@@ -43942,10 +43956,10 @@
|
|
|
43942
43956
|
start: startAttr,
|
|
43943
43957
|
end: endAttr
|
|
43944
43958
|
} = this.attribute;
|
|
43945
|
-
isValid(start) && isValid(end) && (start !== this.state.start || end !== this.state.end) && (this.state.start = start, this.state.end = end, startAttr === this.state.start && endAttr === this.state.end || this.setAttributes({
|
|
43959
|
+
isValid(start) && isValid(end) && (start !== this.state.start || end !== this.state.end) && (this.state.start = start, this.state.end = end, startAttr === this.state.start && endAttr === this.state.end || (this.setAttributes({
|
|
43946
43960
|
start: start,
|
|
43947
43961
|
end: end
|
|
43948
|
-
}));
|
|
43962
|
+
}), this._updateStateCallback && this._updateStateCallback(start, end)));
|
|
43949
43963
|
}
|
|
43950
43964
|
setPreviewData(data) {
|
|
43951
43965
|
this._previewData = data;
|
|
@@ -44986,7 +45000,7 @@
|
|
|
44986
45000
|
const innerGroupBounds = innerGroup.AABBBounds,
|
|
44987
45001
|
innerGroupWidth = innerGroupBounds.width(),
|
|
44988
45002
|
innerGroupHeight = innerGroupBounds.height(),
|
|
44989
|
-
itemGroupWidth = this.
|
|
45003
|
+
itemGroupWidth = isValid(this.attribute.item.width) ? this.attribute.item.width : innerGroupWidth + parsedPadding[1] + parsedPadding[3],
|
|
44990
45004
|
itemGroupHeight = this._itemHeightByUser || innerGroupHeight + parsedPadding[0] + parsedPadding[2];
|
|
44991
45005
|
return itemGroup.attribute.width = itemGroupWidth, itemGroup.attribute.height = itemGroupHeight, innerGroup.translateTo(-innerGroupBounds.x1 + parsedPadding[3], -innerGroupBounds.y1 + parsedPadding[0]), itemGroup;
|
|
44992
45006
|
}
|
|
@@ -58028,7 +58042,7 @@
|
|
|
58028
58042
|
VChart.useMark([ComponentMark, GroupMark, ImageMark]);
|
|
58029
58043
|
Factory.registerRegion('region', Region);
|
|
58030
58044
|
Factory.registerLayout('base', Layout);
|
|
58031
|
-
const version = "1.1.
|
|
58045
|
+
const version = "1.1.3-beta.1";
|
|
58032
58046
|
Logger.getInstance(LoggerLevel.Error);
|
|
58033
58047
|
|
|
58034
58048
|
var SeriesMarkNameEnum;
|
|
@@ -64919,7 +64933,7 @@
|
|
|
64919
64933
|
coordinate = 'geo';
|
|
64920
64934
|
_mapViewData;
|
|
64921
64935
|
getMapViewData() {
|
|
64922
|
-
return this._mapViewData
|
|
64936
|
+
return this._mapViewData?.getDataView();
|
|
64923
64937
|
}
|
|
64924
64938
|
_mapViewDataStatistics;
|
|
64925
64939
|
_nameField;
|
|
@@ -70778,6 +70792,16 @@
|
|
|
70778
70792
|
}
|
|
70779
70793
|
setValueFieldToPercent() {
|
|
70780
70794
|
}
|
|
70795
|
+
updateSpec(spec) {
|
|
70796
|
+
const originalSpec = this._originalSpec;
|
|
70797
|
+
const result = super.updateSpec(spec);
|
|
70798
|
+
if (!isEqual$1(originalSpec, spec)) {
|
|
70799
|
+
result.reMake = true;
|
|
70800
|
+
result.reCompile = true;
|
|
70801
|
+
return result;
|
|
70802
|
+
}
|
|
70803
|
+
return result;
|
|
70804
|
+
}
|
|
70781
70805
|
}
|
|
70782
70806
|
|
|
70783
70807
|
class WordCloudSeries extends BaseWordCloudSeries {
|
|
@@ -73793,6 +73817,29 @@
|
|
|
73793
73817
|
else {
|
|
73794
73818
|
data = data[0];
|
|
73795
73819
|
}
|
|
73820
|
+
if (op.sourceField !== 'source' || op.targetField !== 'target') {
|
|
73821
|
+
for (const key in data) {
|
|
73822
|
+
if (key === 'links') {
|
|
73823
|
+
const updatedData = [];
|
|
73824
|
+
data[key].forEach((datum) => {
|
|
73825
|
+
const updatedDatum = {};
|
|
73826
|
+
for (const key in datum) {
|
|
73827
|
+
if (key === op.sourceField) {
|
|
73828
|
+
updatedDatum.source = datum[op.sourceField];
|
|
73829
|
+
}
|
|
73830
|
+
else if (key === op.targetField) {
|
|
73831
|
+
updatedDatum.target = datum[op.targetField];
|
|
73832
|
+
}
|
|
73833
|
+
else {
|
|
73834
|
+
updatedDatum[key] = datum[key];
|
|
73835
|
+
}
|
|
73836
|
+
}
|
|
73837
|
+
updatedData.push(updatedDatum);
|
|
73838
|
+
});
|
|
73839
|
+
data[key] = updatedData;
|
|
73840
|
+
}
|
|
73841
|
+
}
|
|
73842
|
+
}
|
|
73796
73843
|
const layout = new SankeyLayout(op);
|
|
73797
73844
|
const result = [];
|
|
73798
73845
|
result.push(layout.layout(data, view));
|
|
@@ -73972,13 +74019,15 @@
|
|
|
73972
74019
|
y1: this._viewBox.y2
|
|
73973
74020
|
};
|
|
73974
74021
|
},
|
|
74022
|
+
sourceField: this._spec.sourceField,
|
|
74023
|
+
targetField: this._spec.targetField,
|
|
73975
74024
|
direction: this._spec.direction,
|
|
73976
|
-
nodeAlign: this._spec.nodeAlign,
|
|
73977
|
-
nodeGap: this._spec.nodeGap,
|
|
73978
|
-
nodeWidth: this._spec.nodeWidth,
|
|
74025
|
+
nodeAlign: this._spec.nodeAlign ?? 'justify',
|
|
74026
|
+
nodeGap: this._spec.nodeGap ?? 8,
|
|
74027
|
+
nodeWidth: this._spec.nodeWidth ?? 10,
|
|
73979
74028
|
linkWidth: this._spec.linkWidth,
|
|
73980
74029
|
minStepWidth: this._spec.minStepWidth,
|
|
73981
|
-
minNodeHeight: this._spec.minNodeHeight,
|
|
74030
|
+
minNodeHeight: this._spec.minNodeHeight ?? 4,
|
|
73982
74031
|
minLinkHeight: this._spec.minLinkHeight,
|
|
73983
74032
|
iterations: this._spec.iterations,
|
|
73984
74033
|
nodeKey: this._spec.nodeKey,
|
|
@@ -77149,6 +77198,7 @@
|
|
|
77149
77198
|
_getDefaultSeriesSpec(spec) {
|
|
77150
77199
|
return {
|
|
77151
77200
|
...super._getDefaultSeriesSpec(spec),
|
|
77201
|
+
bar: spec.bar,
|
|
77152
77202
|
stackLabel: spec.stackLabel,
|
|
77153
77203
|
leaderLine: spec.leaderLine,
|
|
77154
77204
|
total: spec.total
|
|
@@ -77896,9 +77946,6 @@
|
|
|
77896
77946
|
return allDomain.slice(Math.min(startIndex, endIndex), Math.max(startIndex, endIndex) + 1);
|
|
77897
77947
|
}
|
|
77898
77948
|
_handleStateChange = (startValue, endValue) => {
|
|
77899
|
-
if (startValue === this._startValue && endValue === this._endValue) {
|
|
77900
|
-
return false;
|
|
77901
|
-
}
|
|
77902
77949
|
this._startValue = startValue;
|
|
77903
77950
|
this._endValue = endValue;
|
|
77904
77951
|
this._newDomain = this._parseDomainFromState(this._startValue, this._endValue);
|
|
@@ -78145,12 +78192,12 @@
|
|
|
78145
78192
|
this._middleHandlerSize = this._computeMiddleHandlerSize();
|
|
78146
78193
|
this._width = this._computeWidth();
|
|
78147
78194
|
this._height = this._computeHeight();
|
|
78148
|
-
if (this._originalSpec
|
|
78195
|
+
if (isNil(this._originalSpec?.startHandler?.style?.size)) {
|
|
78149
78196
|
this._spec.startHandler.style.size = this._isHorizontal
|
|
78150
78197
|
? this._height - this._middleHandlerSize
|
|
78151
78198
|
: this._width - this._middleHandlerSize;
|
|
78152
78199
|
}
|
|
78153
|
-
if (this._originalSpec
|
|
78200
|
+
if (isNil(this._originalSpec?.startHandler?.style?.size)) {
|
|
78154
78201
|
this._spec.endHandler.style.size = this._isHorizontal
|
|
78155
78202
|
? this._height - this._middleHandlerSize
|
|
78156
78203
|
: this._width - this._middleHandlerSize;
|
|
@@ -78233,7 +78280,8 @@
|
|
|
78233
78280
|
const offsetLeft = this._orient === 'left' ? this._middleHandlerSize : 0;
|
|
78234
78281
|
const offsetHandler = this._isHorizontal ? this._startHandlerSize / 2 : 0;
|
|
78235
78282
|
const xScale = this._isHorizontal ? this._stateScale : this._valueScale;
|
|
78236
|
-
|
|
78283
|
+
const xField = this._isHorizontal ? this._stateField : this._valueField;
|
|
78284
|
+
return xScale.scale(datum[xField]) + this.getLayoutStartPoint().x + offsetLeft + offsetHandler;
|
|
78237
78285
|
};
|
|
78238
78286
|
_dataToPositionX2 = (datum) => {
|
|
78239
78287
|
const offsetLeft = this._orient === 'left' ? this._middleHandlerSize : 0;
|
|
@@ -78246,7 +78294,8 @@
|
|
|
78246
78294
|
const offsetTop = this._isHorizontal ? this._middleHandlerSize : 0;
|
|
78247
78295
|
const offsetHandler = this._isHorizontal ? 0 : this._startHandlerSize / 2;
|
|
78248
78296
|
const yScale = this._isHorizontal ? this._valueScale : this._stateScale;
|
|
78249
|
-
|
|
78297
|
+
const yField = this._isHorizontal ? this._valueField : this._stateField;
|
|
78298
|
+
return yScale.scale(datum[yField]) + this.getLayoutStartPoint().y + offsetTop + offsetHandler;
|
|
78250
78299
|
};
|
|
78251
78300
|
_dataToPositionY2 = (datum) => {
|
|
78252
78301
|
const offsetTop = this._isHorizontal ? this._middleHandlerSize : 0;
|
|
@@ -82008,7 +82057,7 @@
|
|
|
82008
82057
|
selectedData.forEach(s => {
|
|
82009
82058
|
selectedFilter[s] = true;
|
|
82010
82059
|
});
|
|
82011
|
-
const datumField = field();
|
|
82060
|
+
const datumField = field() ?? DEFAULT_DATA_SERIES_FIELD;
|
|
82012
82061
|
if (isValid(datumField)) {
|
|
82013
82062
|
data = data.filter(d => selectedFilter[d[datumField]] === true);
|
|
82014
82063
|
}
|