@@ -32209,7 +32209,7 @@ function shiftY(texts, option) {
32209
32209
deltaYTolerance = Number.MAX_VALUE
32210
32210
} = globalShiftY;
32211
32211
for (let iter = 0; iter < maxIterations; iter++) {
32212
- texts.sort((a, b) => getY1 (a) - getY1 (b));
32212
+ texts.sort((a, b) => getY1Initial (a) - getY1Initial (b));
32213
32213
let error = 0;
32214
32214
for (let i = 0; i < n - 1; i++) {
32215
32215
const curText = texts[i];
@@ -61928,7 +61928,7 @@ const registerVChartCore = () => {
61928
61928
};
61929
61929
registerVChartCore();
61930
61930
61931
- const version = "1.12.15 ";
61931
+ const version = "1.12.16 ";
61932
61932
61933
61933
const addVChartProperty = (data, op) => {
61934
61934
const context = op.beforeCall();
@@ -63573,7 +63573,9 @@ class BaseSeries extends BaseModel {
63573
63573
_updateExtensionMarkSpec() {
63574
63574
var _a;
63575
63575
(_a = this._spec.extensionMark) === null || _a === void 0 ? void 0 : _a.forEach((spec, i) => {
63576
- const mark = this._marks.getMarkWithInfo({ name: `${this._getExtensionMarkNamePrefix()}_${i}` });
63576
+ const mark = this._marks.getMarkWithInfo({
63577
+ name: isValid$1(spec.name) ? `${spec.name}` : `${this._getExtensionMarkNamePrefix()}_${i}`
63578
+ });
63577
63579
if (!mark) {
63578
63580
return;
63579
63581
}
@@ -63797,7 +63799,7 @@ class BaseSeries extends BaseModel {
63797
63799
_compareExtensionMarksSpec(newMarks, prevMarks, compareResult) {
63798
63800
if (newMarks.length !== prevMarks.length ||
63799
63801
prevMarks.some((prev, index) => {
63800
- return prev.type !== newMarks[index].type || prev.id !== newMarks[index].id;
63802
+ return ( prev.type !== newMarks[index].type || prev.id !== newMarks[index].id || prev.name !== newMarks[index].name) ;
63801
63803
})) {
63802
63804
compareResult.reMake = true;
63803
63805
}
@@ -93028,12 +93030,13 @@ const lockStatisticsFilter = (statisticsData, op) => {
93028
93030
return statisticsData;
93029
93031
}
93030
93032
const fields = originalFields();
93031
- if (statisticsData[datumField] &&
93033
+ const realField = isArray$1(datumField) ? datumField[0] : datumField;
93034
+ if (statisticsData[realField] &&
93032
93035
fields &&
93033
- fields[datumField ] &&
93034
- fields[datumField ].lockStatisticsByDomain &&
93036
+ fields[realField ] &&
93037
+ fields[realField ].lockStatisticsByDomain &&
93035
93038
!isContinuous()) {
93036
- statisticsData[datumField ].values = newDomain;
93039
+ statisticsData[realField ].values = newDomain;
93037
93040
}
93038
93041
return statisticsData;
93039
93042
};
@@ -94034,32 +94037,32 @@ class DataZoom extends DataFilterBaseComponent {
94034
94037
this._startHandlerSize / 2,
94035
94038
defaultSize + this._startHandlerSize / 2
94036
94039
];
94040
+ const compWidth = this._computeWidth();
94041
+ const compHeight = this._computeHeight();
94037
94042
if (this._isHorizontal) {
94038
94043
stateScaleRange = this._visible
94039
- ? [this._startHandlerSize / 2, this._computeWidth() - handlerSize + this._startHandlerSize / 2]
94044
+ ? [this._startHandlerSize / 2, compWidth - handlerSize + this._startHandlerSize / 2]
94040
94045
: defaultRange;
94041
94046
this._stateScale.range(stateScaleRange);
94042
- this._valueScale.range([this._computeHeight() - this._middleHandlerSize, 0]);
94043
- }
94044
- else if (this.layoutOrient === 'left') {
94045
- stateScaleRange = this._visible
94046
- ? [this._startHandlerSize / 2, this._computeHeight() - handlerSize + this._startHandlerSize / 2]
94047
- : defaultRange;
94048
- this._stateScale.range(stateScaleRange);
94049
- this._valueScale.range([this._computeWidth() - this._middleHandlerSize, 0]);
94047
+ this._valueScale.range([compHeight - this._middleHandlerSize, 0]);
94050
94048
}
94051
94049
else {
94052
94050
stateScaleRange = this._visible
94053
- ? [this._startHandlerSize / 2, this._computeHeight() - handlerSize + this._startHandlerSize / 2]
94051
+ ? [this._startHandlerSize / 2, compHeight - handlerSize + this._startHandlerSize / 2]
94054
94052
: defaultRange;
94055
94053
this._stateScale.range(stateScaleRange);
94056
- this._valueScale.range([0, this._computeWidth() - this._middleHandlerSize]);
94054
+ if (this.layoutOrient === 'left') {
94055
+ this._valueScale.range([compWidth - this._middleHandlerSize, 0]);
94056
+ }
94057
+ else {
94058
+ this._valueScale.range([0, compWidth - this._middleHandlerSize]);
94059
+ }
94057
94060
}
94058
94061
if (this._component && this._cacheVisibility !== false) {
94059
94062
this._component.setAttributes({
94060
94063
size: {
94061
- width: this._computeWidth() ,
94062
- height: this._computeHeight()
94064
+ width: compWidth ,
94065
+ height: compHeight
94063
94066
},
94064
94067
position: {
94065
94068
x: this.getLayoutStartPoint().x,
@@ -94105,7 +94108,7 @@ class DataZoom extends DataFilterBaseComponent {
94105
94108
if (this._isHorizontal) {
94106
94109
return this._backgroundSize + this._middleHandlerSize;
94107
94110
}
94108
- return this.getLayoutRect().height - (this._startHandlerSize + this._endHandlerSize) / 2 ;
94111
+ return this.getLayoutRect().height;
94109
94112
}
94110
94113
_isScaleValid(scale) {
94111
94114
if (!scale || !scale.domain()) {
@@ -94127,8 +94130,8 @@ class DataZoom extends DataFilterBaseComponent {
94127
94130
x: this.getLayoutStartPoint().x,
94128
94131
y: this.getLayoutStartPoint().y
94129
94132
}, orient: this._orient, size: {
94130
- width: this.getLayoutRect().width ,
94131
- height: this.getLayoutRect().height
94133
+ width: this._computeWidth() ,
94134
+ height: this._computeHeight()
94132
94135
}, showDetail: spec.showDetail, brushSelect: (_b = spec.brushSelect) !== null && _b !== void 0 ? _b : false, zoomLock: (_c = spec.zoomLock) !== null && _c !== void 0 ? _c : false, minSpan: this._minSpan, maxSpan: this._maxSpan, delayType: spec.delayType, delayTime: isValid$1(spec.delayType) ? (_d = spec.delayTime) !== null && _d !== void 0 ? _d : 30 : 0, realTime: (_e = spec.realTime) !== null && _e !== void 0 ? _e : true, previewData: isNeedPreview && this._data.getLatestData(), previewPointsX: isNeedPreview && this._dataToPositionX, previewPointsY: isNeedPreview && this._dataToPositionY, tolerance: this._spec.tolerance }, this._getComponentAttrs(isNeedPreview));
94133
94136
}
94134
94137
_createOrUpdateComponent() {
@@ -94579,6 +94582,13 @@ class Indicator extends BaseComponent {
94579
94582
}, content: contentComponentSpec }, restSpec);
94580
94583
}
94581
94584
_createOrUpdateIndicatorComponent(attrs) {
94585
+ if (attrs.visible === false) {
94586
+ if (this._indicatorComponent && this._indicatorComponent.parent) {
94587
+ this._indicatorComponent.parent.removeChild(this._indicatorComponent);
94588
+ }
94589
+ this._indicatorComponent = null;
94590
+ return;
94591
+ }
94582
94592
if (this._indicatorComponent) {
94583
94593
if (!isEqual(attrs, this._cacheAttrs)) {
94584
94594
this._indicatorComponent.setAttributes(attrs);
@@ -94593,7 +94603,6 @@ class Indicator extends BaseComponent {
94593
94603
this._indicatorComponent.on('*', (event, type) => this._delegateEvent(this._indicatorComponent, event, type));
94594
94604
}
94595
94605
this._cacheAttrs = attrs;
94596
- return this._indicatorComponent;
94597
94606
}
94598
94607
_createText(field, text) {
94599
94608
var _a;
0 commit comments