@visactor/vchart 1.12.13 → 1.12.14-alpha.0
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 +74 -60
- package/build/index.min.js +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/cjs/compile/compilable-base.js +1 -2
- package/cjs/compile/compiler.js +2 -0
- package/cjs/compile/compiler.js.map +1 -1
- package/cjs/compile/interface/compiler.d.ts +1 -0
- package/cjs/compile/interface/compiler.js.map +1 -1
- package/cjs/component/data-zoom/data-filter-base-component.d.ts +1 -0
- package/cjs/component/data-zoom/data-filter-base-component.js +2 -1
- package/cjs/component/data-zoom/data-filter-base-component.js.map +1 -1
- package/cjs/component/index.js +2 -1
- package/cjs/component/marker/base-marker.d.ts +4 -1
- package/cjs/component/marker/base-marker.js +12 -1
- package/cjs/component/marker/base-marker.js.map +1 -1
- package/cjs/component/marker/interface.d.ts +9 -2
- package/cjs/component/marker/interface.js.map +1 -1
- package/cjs/component/marker/mark-area/base-mark-area.js +5 -5
- package/cjs/component/marker/mark-area/base-mark-area.js.map +1 -1
- package/cjs/component/marker/mark-line/base-mark-line.js +9 -9
- package/cjs/component/marker/mark-line/base-mark-line.js.map +1 -1
- package/cjs/component/marker/mark-point/base-mark-point.js +16 -15
- package/cjs/component/marker/mark-point/base-mark-point.js.map +1 -1
- package/cjs/component/marker/utils.d.ts +4 -4
- package/cjs/component/marker/utils.js +7 -7
- package/cjs/component/marker/utils.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/series/bar/bar.d.ts +2 -2
- package/cjs/series/bar/bar.js +15 -14
- package/cjs/series/bar/bar.js.map +1 -1
- package/cjs/series/progress/linear/linear.js +4 -4
- package/cjs/series/progress/linear/linear.js.map +1 -1
- package/cjs/util/scale.d.ts +1 -1
- package/cjs/util/scale.js +2 -2
- package/cjs/util/scale.js.map +1 -1
- package/esm/compile/compilable-base.js +1 -2
- package/esm/compile/compiler.js +1 -0
- package/esm/compile/compiler.js.map +1 -1
- package/esm/compile/interface/compiler.d.ts +1 -0
- package/esm/compile/interface/compiler.js.map +1 -1
- package/esm/component/data-zoom/data-filter-base-component.d.ts +1 -0
- package/esm/component/data-zoom/data-filter-base-component.js +2 -1
- package/esm/component/data-zoom/data-filter-base-component.js.map +1 -1
- package/esm/component/index.js +2 -1
- package/esm/component/marker/base-marker.d.ts +4 -1
- package/esm/component/marker/base-marker.js +12 -1
- package/esm/component/marker/base-marker.js.map +1 -1
- package/esm/component/marker/interface.d.ts +9 -2
- package/esm/component/marker/interface.js.map +1 -1
- package/esm/component/marker/mark-area/base-mark-area.js +5 -5
- package/esm/component/marker/mark-area/base-mark-area.js.map +1 -1
- package/esm/component/marker/mark-line/base-mark-line.js +9 -9
- package/esm/component/marker/mark-line/base-mark-line.js.map +1 -1
- package/esm/component/marker/mark-point/base-mark-point.js +15 -15
- package/esm/component/marker/mark-point/base-mark-point.js.map +1 -1
- package/esm/component/marker/utils.d.ts +4 -4
- package/esm/component/marker/utils.js +8 -7
- package/esm/component/marker/utils.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/series/bar/bar.d.ts +2 -2
- package/esm/series/bar/bar.js +15 -14
- package/esm/series/bar/bar.js.map +1 -1
- package/esm/series/progress/linear/linear.js +4 -4
- package/esm/series/progress/linear/linear.js.map +1 -1
- package/esm/util/scale.d.ts +1 -1
- package/esm/util/scale.js +2 -2
- package/esm/util/scale.js.map +1 -1
- package/package.json +2 -2
package/build/index.js
CHANGED
|
@@ -44070,11 +44070,12 @@
|
|
|
44070
44070
|
scale.specified(spec.specified);
|
|
44071
44071
|
}
|
|
44072
44072
|
}
|
|
44073
|
-
function valueInScaleRange(v, s) {
|
|
44073
|
+
function valueInScaleRange(v, s, useWholeRange) {
|
|
44074
44074
|
if (!s) {
|
|
44075
44075
|
return v;
|
|
44076
44076
|
}
|
|
44077
|
-
const
|
|
44077
|
+
const scaleRange = s.range();
|
|
44078
|
+
const range = useWholeRange && s._calculateWholeRange ? s._calculateWholeRange(scaleRange) : s.range();
|
|
44078
44079
|
const min = Math.min(range[0], range[range.length - 1]);
|
|
44079
44080
|
const max = Math.max(range[0], range[range.length - 1]);
|
|
44080
44081
|
return Math.min(Math.max(min, v), max);
|
|
@@ -56535,7 +56536,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
56535
56536
|
(_b = (_a = this._option) === null || _a === void 0 ? void 0 : _a.onError) === null || _b === void 0 ? void 0 : _b.call(_a, ...args);
|
|
56536
56537
|
});
|
|
56537
56538
|
}
|
|
56538
|
-
this._view = new View(Object.assign(Object.assign({ width: this._width, height: this._height, container: (_c = this._container.dom) !== null && _c !== void 0 ? _c : null, renderCanvas: (_d = this._container.canvas) !== null && _d !== void 0 ? _d : null, hooks: this._option.performanceHook }, this._option), { mode: toRenderMode(this._option.mode), autoFit: false, eventConfig: {
|
|
56539
|
+
this._view = new View(Object.assign(Object.assign({ width: this._width, height: this._height, container: (_c = this._container.dom) !== null && _c !== void 0 ? _c : null, renderCanvas: (_d = this._container.canvas) !== null && _d !== void 0 ? _d : null, hooks: this._option.performanceHook }, this._option), { autoRefresh: isValid$1(this._option.autoRefreshDpr) ? this._option.autoRefreshDpr : !isValid$1(this._option.dpr), mode: toRenderMode(this._option.mode), autoFit: false, eventConfig: {
|
|
56539
56540
|
gesture: isValid$1(this._option.gestureConfig)
|
|
56540
56541
|
? this._option.gestureConfig
|
|
56541
56542
|
: isMobileLikeMode(this._option.mode),
|
|
@@ -61880,7 +61881,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
61880
61881
|
};
|
|
61881
61882
|
registerVChartCore();
|
|
61882
61883
|
|
|
61883
|
-
const version = "1.12.
|
|
61884
|
+
const version = "1.12.14-alpha.0";
|
|
61884
61885
|
|
|
61885
61886
|
const addVChartProperty = (data, op) => {
|
|
61886
61887
|
const context = op.beforeCall();
|
|
@@ -70412,22 +70413,22 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70412
70413
|
this._barMarkType = "rect";
|
|
70413
70414
|
this.transformerConstructor = BarSeriesSpecTransformer;
|
|
70414
70415
|
this._bandPosition = 0;
|
|
70415
|
-
this._getBarXStart = (datum, scale) => {
|
|
70416
|
+
this._getBarXStart = (datum, scale, useWholeRange) => {
|
|
70416
70417
|
if (this._shouldDoPreCalculate()) {
|
|
70417
70418
|
this._calculateStackRectPosition(false);
|
|
70418
70419
|
return datum[RECT_X];
|
|
70419
70420
|
}
|
|
70420
70421
|
if (this._spec.barMinHeight) {
|
|
70421
|
-
return this._calculateRectPosition(datum, false);
|
|
70422
|
+
return this._calculateRectPosition(datum, false, useWholeRange);
|
|
70422
70423
|
}
|
|
70423
|
-
return valueInScaleRange(this._dataToPosX(datum), scale);
|
|
70424
|
+
return valueInScaleRange(this._dataToPosX(datum), scale, useWholeRange);
|
|
70424
70425
|
};
|
|
70425
|
-
this._getBarXEnd = (datum, scale) => {
|
|
70426
|
+
this._getBarXEnd = (datum, scale, useWholeRange) => {
|
|
70426
70427
|
if (this._shouldDoPreCalculate()) {
|
|
70427
70428
|
this._calculateStackRectPosition(false);
|
|
70428
70429
|
return datum[RECT_X1];
|
|
70429
70430
|
}
|
|
70430
|
-
return valueInScaleRange(this._dataToPosX1(datum), scale);
|
|
70431
|
+
return valueInScaleRange(this._dataToPosX1(datum), scale, useWholeRange);
|
|
70431
70432
|
};
|
|
70432
70433
|
this._getBarYStart = (datum, scale) => {
|
|
70433
70434
|
if (this._shouldDoPreCalculate()) {
|
|
@@ -70677,7 +70678,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70677
70678
|
}
|
|
70678
70679
|
}
|
|
70679
70680
|
}
|
|
70680
|
-
_calculateRectPosition(datum, isVertical) {
|
|
70681
|
+
_calculateRectPosition(datum, isVertical, useWholeRange) {
|
|
70681
70682
|
var _a, _b;
|
|
70682
70683
|
let startMethod;
|
|
70683
70684
|
let endMethod;
|
|
@@ -70695,8 +70696,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70695
70696
|
const seriesScale = (_b = (_a = this[axisHelper]).getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0);
|
|
70696
70697
|
const inverse = this[axisHelper].isInverse();
|
|
70697
70698
|
const barMinHeight = this._spec.barMinHeight;
|
|
70698
|
-
const y1 = valueInScaleRange(this[startMethod](datum), seriesScale);
|
|
70699
|
-
const y = valueInScaleRange(this[endMethod](datum), seriesScale);
|
|
70699
|
+
const y1 = valueInScaleRange(this[startMethod](datum), seriesScale, useWholeRange);
|
|
70700
|
+
const y = valueInScaleRange(this[endMethod](datum), seriesScale, useWholeRange);
|
|
70700
70701
|
let height = Math.abs(y1 - y);
|
|
70701
70702
|
if (height < barMinHeight) {
|
|
70702
70703
|
height = barMinHeight;
|
|
@@ -70813,24 +70814,24 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
70813
70814
|
if (this.direction === "horizontal") {
|
|
70814
70815
|
const yChannels = isValid$1(this._fieldY2)
|
|
70815
70816
|
? {
|
|
70816
|
-
y: (datum) => valueInScaleRange(this._dataToPosY(datum), yScale),
|
|
70817
|
-
y1: (datum) => valueInScaleRange(this._dataToPosY1(datum), yScale)
|
|
70817
|
+
y: (datum) => valueInScaleRange(this._dataToPosY(datum), yScale, true),
|
|
70818
|
+
y1: (datum) => valueInScaleRange(this._dataToPosY1(datum), yScale, true)
|
|
70818
70819
|
}
|
|
70819
70820
|
: {
|
|
70820
|
-
y: (datum) => valueInScaleRange(this._dataToPosY(datum) - this._getBarWidth(this._yAxisHelper) / 2, yScale),
|
|
70821
|
+
y: (datum) => valueInScaleRange(this._dataToPosY(datum) - this._getBarWidth(this._yAxisHelper) / 2, yScale, true),
|
|
70821
70822
|
height: (datum) => this._getBarWidth(this._yAxisHelper)
|
|
70822
70823
|
};
|
|
70823
|
-
this.setMarkStyle(this._barMark, Object.assign({ x: (datum) => this._getBarXStart(datum, xScale), x1: (datum) => this._getBarXEnd(datum, xScale) }, yChannels), 'normal', AttributeLevel.Series);
|
|
70824
|
+
this.setMarkStyle(this._barMark, Object.assign({ x: (datum) => this._getBarXStart(datum, xScale, true), x1: (datum) => this._getBarXEnd(datum, xScale, true) }, yChannels), 'normal', AttributeLevel.Series);
|
|
70824
70825
|
this.setMarkStyle(this._barBackgroundMark, Object.assign({ x: () => this._getBarBackgroundXStart(xScale), x1: () => this._getBarBackgroundXEnd(xScale) }, yChannels), 'normal', AttributeLevel.Series);
|
|
70825
70826
|
}
|
|
70826
70827
|
else {
|
|
70827
70828
|
const xChannels = isValid$1(this._fieldX2)
|
|
70828
70829
|
? {
|
|
70829
|
-
x: (datum) => valueInScaleRange(this._dataToPosX(datum), xScale),
|
|
70830
|
-
x1: (datum) => valueInScaleRange(this._dataToPosX1(datum), xScale)
|
|
70830
|
+
x: (datum) => valueInScaleRange(this._dataToPosX(datum), xScale, true),
|
|
70831
|
+
x1: (datum) => valueInScaleRange(this._dataToPosX1(datum), xScale, true)
|
|
70831
70832
|
}
|
|
70832
70833
|
: {
|
|
70833
|
-
x: (datum) => valueInScaleRange(this._dataToPosX(datum) - this._getBarWidth(this._xAxisHelper) / 2, xScale),
|
|
70834
|
+
x: (datum) => valueInScaleRange(this._dataToPosX(datum) - this._getBarWidth(this._xAxisHelper) / 2, xScale, true),
|
|
70834
70835
|
width: (datum) => this._getBarWidth(this._xAxisHelper)
|
|
70835
70836
|
};
|
|
70836
70837
|
this.setMarkStyle(this._barMark, Object.assign(Object.assign({}, xChannels), { y: datum => this._getBarYStart(datum, yScale), y1: datum => this._getBarYEnd(datum, yScale) }), 'normal', AttributeLevel.Series);
|
|
@@ -78258,7 +78259,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
78258
78259
|
this.setMarkStyle(progressMark, {
|
|
78259
78260
|
x: (datum) => {
|
|
78260
78261
|
var _a, _b;
|
|
78261
|
-
return (valueInScaleRange(this.dataToPositionX(datum), (_b = (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0)) -
|
|
78262
|
+
return (valueInScaleRange(this.dataToPositionX(datum), (_b = (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0), true) -
|
|
78262
78263
|
this._spec.bandWidth / 2 +
|
|
78263
78264
|
leftPadding);
|
|
78264
78265
|
},
|
|
@@ -78277,7 +78278,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
78277
78278
|
x1: (datum) => { var _a, _b; return valueInScaleRange(this.dataToPositionX(datum), (_b = (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0)); },
|
|
78278
78279
|
y: (datum) => {
|
|
78279
78280
|
var _a, _b;
|
|
78280
|
-
return (valueInScaleRange(this.dataToPositionY(datum), (_b = (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0)) -
|
|
78281
|
+
return (valueInScaleRange(this.dataToPositionY(datum), (_b = (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0), true) -
|
|
78281
78282
|
this._spec.bandWidth / 2 +
|
|
78282
78283
|
topPadding);
|
|
78283
78284
|
},
|
|
@@ -78305,7 +78306,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
78305
78306
|
this.setMarkStyle(trackMark, {
|
|
78306
78307
|
x: (datum) => {
|
|
78307
78308
|
var _a, _b;
|
|
78308
|
-
return (valueInScaleRange(this.dataToPositionX(datum), (_b = (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0)) -
|
|
78309
|
+
return (valueInScaleRange(this.dataToPositionX(datum), (_b = (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0), true) -
|
|
78309
78310
|
this._spec.bandWidth / 2);
|
|
78310
78311
|
},
|
|
78311
78312
|
y: 0,
|
|
@@ -78319,7 +78320,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
78319
78320
|
x: 0,
|
|
78320
78321
|
y: (datum) => {
|
|
78321
78322
|
var _a, _b;
|
|
78322
|
-
return (valueInScaleRange(this.dataToPositionY(datum), (_b = (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0)) -
|
|
78323
|
+
return (valueInScaleRange(this.dataToPositionY(datum), (_b = (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.getScale) === null || _b === void 0 ? void 0 : _b.call(_a, 0), true) -
|
|
78323
78324
|
this._spec.bandWidth / 2);
|
|
78324
78325
|
},
|
|
78325
78326
|
height: this._spec.bandWidth,
|
|
@@ -93373,7 +93374,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
93373
93374
|
const domain = this._computeDomainOfStateScale(isContinuous(this._stateScale.type));
|
|
93374
93375
|
this._stateScale.domain(domain, false);
|
|
93375
93376
|
this._handleChange(this._start, this._end, true);
|
|
93376
|
-
if (this._spec.auto) {
|
|
93377
|
+
if (this._spec.auto && !isEqual(this._domainCache, domain)) {
|
|
93378
|
+
this._domainCache = domain;
|
|
93377
93379
|
this._dataUpdating = true;
|
|
93378
93380
|
(_a = this.getChart()) === null || _a === void 0 ? void 0 : _a.setLayoutTag(true, null, false);
|
|
93379
93381
|
}
|
|
@@ -94854,7 +94856,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
94854
94856
|
});
|
|
94855
94857
|
return { minX, maxX, minY, maxY };
|
|
94856
94858
|
}
|
|
94857
|
-
function transformLabelAttributes(label, markerData) {
|
|
94859
|
+
function transformLabelAttributes(label, markerData, markAttributeContext) {
|
|
94858
94860
|
const { labelBackground = {}, style, shape } = label, restLabel = __rest$e(label, ["labelBackground", "style", "shape"]);
|
|
94859
94861
|
if (label.visible !== false) {
|
|
94860
94862
|
const labelAttrs = restLabel;
|
|
@@ -94867,7 +94869,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
94867
94869
|
};
|
|
94868
94870
|
}
|
|
94869
94871
|
if (labelBackground.visible !== false) {
|
|
94870
|
-
labelAttrs.panel = Object.assign({ visible: true, customShape: labelBackground.customShape }, transformStyle(transformToGraphic(labelBackground.style), markerData));
|
|
94872
|
+
labelAttrs.panel = Object.assign({ visible: true, customShape: labelBackground.customShape }, transformStyle(transformToGraphic(labelBackground.style), markerData, markAttributeContext));
|
|
94871
94873
|
if (isValid$1(labelBackground.padding)) {
|
|
94872
94874
|
labelAttrs.padding = normalizePadding$1(labelBackground.padding);
|
|
94873
94875
|
}
|
|
@@ -94879,7 +94881,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
94879
94881
|
labelAttrs.padding = 0;
|
|
94880
94882
|
}
|
|
94881
94883
|
if (style) {
|
|
94882
|
-
labelAttrs.textStyle = transformStyle(transformToGraphic(style), markerData);
|
|
94884
|
+
labelAttrs.textStyle = transformStyle(transformToGraphic(style), markerData, markAttributeContext);
|
|
94883
94885
|
}
|
|
94884
94886
|
return labelAttrs;
|
|
94885
94887
|
}
|
|
@@ -94887,17 +94889,17 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
94887
94889
|
visible: false
|
|
94888
94890
|
};
|
|
94889
94891
|
}
|
|
94890
|
-
function transformState(state, markerData) {
|
|
94892
|
+
function transformState(state, markerData, markerAttributeContext) {
|
|
94891
94893
|
for (const stateKey in state) {
|
|
94892
94894
|
if (isFunction$1(state[stateKey])) {
|
|
94893
|
-
state[stateKey] = state[stateKey](markerData);
|
|
94895
|
+
state[stateKey] = state[stateKey](markerData, markerAttributeContext);
|
|
94894
94896
|
}
|
|
94895
94897
|
}
|
|
94896
94898
|
return state;
|
|
94897
94899
|
}
|
|
94898
|
-
function transformStyle(style, markerData) {
|
|
94900
|
+
function transformStyle(style, markerData, markerAttributeContext) {
|
|
94899
94901
|
if (isFunction$1(style)) {
|
|
94900
|
-
return style(markerData);
|
|
94902
|
+
return style(markerData, markerAttributeContext);
|
|
94901
94903
|
}
|
|
94902
94904
|
return style;
|
|
94903
94905
|
}
|
|
@@ -95265,11 +95267,23 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
95265
95267
|
return s.visible !== false && this._getMarkerCoordinateType(s) === this.coordinateType;
|
|
95266
95268
|
});
|
|
95267
95269
|
}
|
|
95270
|
+
getMarkAttributeContext() {
|
|
95271
|
+
return this._markAttributeContext;
|
|
95272
|
+
}
|
|
95273
|
+
_buildMarkerAttributeContext() {
|
|
95274
|
+
this._markAttributeContext = {
|
|
95275
|
+
relativeSeries: this._relativeSeries,
|
|
95276
|
+
startRelativeSeries: this._startRelativeSeries,
|
|
95277
|
+
endRelativeSeries: this._endRelativeSeries,
|
|
95278
|
+
vchart: this._option.globalInstance
|
|
95279
|
+
};
|
|
95280
|
+
}
|
|
95268
95281
|
created() {
|
|
95269
95282
|
super.created();
|
|
95270
95283
|
this._bindSeries();
|
|
95271
95284
|
this._initDataView();
|
|
95272
95285
|
this.initEvent();
|
|
95286
|
+
this._buildMarkerAttributeContext();
|
|
95273
95287
|
}
|
|
95274
95288
|
_getAllRelativeSeries() {
|
|
95275
95289
|
return {
|
|
@@ -95461,15 +95475,15 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
95461
95475
|
radius: 0,
|
|
95462
95476
|
startAngle: 0,
|
|
95463
95477
|
endAngle: 0,
|
|
95464
|
-
lineStyle: transformStyle(transformToGraphic((_d = this._spec.line) === null || _d === void 0 ? void 0 : _d.style), this._markerData),
|
|
95478
|
+
lineStyle: transformStyle(transformToGraphic((_d = this._spec.line) === null || _d === void 0 ? void 0 : _d.style), this._markerData, this._markAttributeContext),
|
|
95465
95479
|
clipInRange: (_e = this._spec.clip) !== null && _e !== void 0 ? _e : false,
|
|
95466
|
-
label: transformLabelAttributes(label, this._markerData),
|
|
95480
|
+
label: transformLabelAttributes(label, this._markerData, this._markAttributeContext),
|
|
95467
95481
|
state: {
|
|
95468
|
-
line: transformState((_g = (_f = this._spec.line) === null || _f === void 0 ? void 0 : _f.state) !== null && _g !== void 0 ? _g : {}, this._markerData),
|
|
95469
|
-
lineStartSymbol: transformState((_j = (_h = this._spec.startSymbol) === null || _h === void 0 ? void 0 : _h.state) !== null && _j !== void 0 ? _j : {}, this._markerData),
|
|
95470
|
-
lineEndSymbol: transformState((_l = (_k = this._spec.endSymbol) === null || _k === void 0 ? void 0 : _k.state) !== null && _l !== void 0 ? _l : {}, this._markerData),
|
|
95471
|
-
label: transformState((_p = (_o = (_m = this._spec) === null || _m === void 0 ? void 0 : _m.label) === null || _o === void 0 ? void 0 : _o.state) !== null && _p !== void 0 ? _p : {}, this._markerData),
|
|
95472
|
-
labelBackground: transformState((_t = (_s = (_r = (_q = this._spec) === null || _q === void 0 ? void 0 : _q.label) === null || _r === void 0 ? void 0 : _r.labelBackground) === null || _s === void 0 ? void 0 : _s.state) !== null && _t !== void 0 ? _t : {}, this._markerData)
|
|
95482
|
+
line: transformState((_g = (_f = this._spec.line) === null || _f === void 0 ? void 0 : _f.state) !== null && _g !== void 0 ? _g : {}, this._markerData, this._markAttributeContext),
|
|
95483
|
+
lineStartSymbol: transformState((_j = (_h = this._spec.startSymbol) === null || _h === void 0 ? void 0 : _h.state) !== null && _j !== void 0 ? _j : {}, this._markerData, this._markAttributeContext),
|
|
95484
|
+
lineEndSymbol: transformState((_l = (_k = this._spec.endSymbol) === null || _k === void 0 ? void 0 : _k.state) !== null && _l !== void 0 ? _l : {}, this._markerData, this._markAttributeContext),
|
|
95485
|
+
label: transformState((_p = (_o = (_m = this._spec) === null || _m === void 0 ? void 0 : _m.label) === null || _o === void 0 ? void 0 : _o.state) !== null && _p !== void 0 ? _p : {}, this._markerData, this._markAttributeContext),
|
|
95486
|
+
labelBackground: transformState((_t = (_s = (_r = (_q = this._spec) === null || _q === void 0 ? void 0 : _q.label) === null || _r === void 0 ? void 0 : _r.labelBackground) === null || _s === void 0 ? void 0 : _s.state) !== null && _t !== void 0 ? _t : {}, this._markerData, this._markAttributeContext)
|
|
95473
95487
|
},
|
|
95474
95488
|
animation: (_u = this._spec.animation) !== null && _u !== void 0 ? _u : false,
|
|
95475
95489
|
animationEnter: this._spec.animationEnter,
|
|
@@ -95477,7 +95491,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
95477
95491
|
animationUpdate: this._spec.animationUpdate
|
|
95478
95492
|
};
|
|
95479
95493
|
if (startSymbol.visible) {
|
|
95480
|
-
markLineAttrs.startSymbol = Object.assign(Object.assign({}, startSymbol), { visible: true, style: transformToGraphic(startSymbol.style) });
|
|
95494
|
+
markLineAttrs.startSymbol = Object.assign(Object.assign({}, startSymbol), { visible: true, style: transformStyle(transformToGraphic(startSymbol.style), this._markerData, this._markAttributeContext) });
|
|
95481
95495
|
}
|
|
95482
95496
|
else {
|
|
95483
95497
|
markLineAttrs.startSymbol = {
|
|
@@ -95485,7 +95499,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
95485
95499
|
};
|
|
95486
95500
|
}
|
|
95487
95501
|
if (endSymbol.visible) {
|
|
95488
|
-
markLineAttrs.endSymbol = Object.assign(Object.assign({}, endSymbol), { visible: true, style: transformToGraphic(endSymbol.style) });
|
|
95502
|
+
markLineAttrs.endSymbol = Object.assign(Object.assign({}, endSymbol), { visible: true, style: transformStyle(transformToGraphic(endSymbol.style), this._markerData, this._markAttributeContext) });
|
|
95489
95503
|
}
|
|
95490
95504
|
else {
|
|
95491
95505
|
markLineAttrs.endSymbol = {
|
|
@@ -96070,13 +96084,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
96070
96084
|
outerRadius: 0,
|
|
96071
96085
|
startAngle: 0,
|
|
96072
96086
|
endAngle: 0,
|
|
96073
|
-
areaStyle: transformStyle(transformToGraphic((_e = this._spec.area) === null || _e === void 0 ? void 0 : _e.style), this._markerData),
|
|
96087
|
+
areaStyle: transformStyle(transformToGraphic((_e = this._spec.area) === null || _e === void 0 ? void 0 : _e.style), this._markerData, this._markAttributeContext),
|
|
96074
96088
|
clipInRange: (_f = this._spec.clip) !== null && _f !== void 0 ? _f : false,
|
|
96075
|
-
label: transformLabelAttributes(label, this._markerData),
|
|
96089
|
+
label: transformLabelAttributes(label, this._markerData, this._markAttributeContext),
|
|
96076
96090
|
state: {
|
|
96077
|
-
area: transformState((_g = this._spec.area) === null || _g === void 0 ? void 0 : _g.state, this._markerData),
|
|
96078
|
-
label: transformState((_h = this._spec.label) === null || _h === void 0 ? void 0 : _h.state, this._markerData),
|
|
96079
|
-
labelBackground: transformState((_l = (_k = (_j = this._spec) === null || _j === void 0 ? void 0 : _j.label) === null || _k === void 0 ? void 0 : _k.labelBackground) === null || _l === void 0 ? void 0 : _l.state, this._markerData)
|
|
96091
|
+
area: transformState((_g = this._spec.area) === null || _g === void 0 ? void 0 : _g.state, this._markerData, this._markAttributeContext),
|
|
96092
|
+
label: transformState((_h = this._spec.label) === null || _h === void 0 ? void 0 : _h.state, this._markerData, this._markAttributeContext),
|
|
96093
|
+
labelBackground: transformState((_l = (_k = (_j = this._spec) === null || _j === void 0 ? void 0 : _j.label) === null || _k === void 0 ? void 0 : _k.labelBackground) === null || _l === void 0 ? void 0 : _l.state, this._markerData, this._markAttributeContext)
|
|
96080
96094
|
},
|
|
96081
96095
|
animation: (_m = this._spec.animation) !== null && _m !== void 0 ? _m : false,
|
|
96082
96096
|
animationEnter: this._spec.animationEnter,
|
|
@@ -97231,19 +97245,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
97231
97245
|
offset: (_e = targetSymbol.offset) !== null && _e !== void 0 ? _e : 0,
|
|
97232
97246
|
visible: (_f = targetSymbol.visible) !== null && _f !== void 0 ? _f : false,
|
|
97233
97247
|
size: (_g = targetSymbol.size) !== null && _g !== void 0 ? _g : 20,
|
|
97234
|
-
style: transformStyle(targetSymbol.style, this._markerData)
|
|
97248
|
+
style: transformStyle(targetSymbol.style, this._markerData, this._markAttributeContext)
|
|
97235
97249
|
},
|
|
97236
97250
|
state: {
|
|
97237
|
-
line: transformState((_j = (_h = this._spec.itemLine.line) === null || _h === void 0 ? void 0 : _h.state) !== null && _j !== void 0 ? _j : {}, this._markerData),
|
|
97238
|
-
lineStartSymbol: transformState((_l = (_k = this._spec.itemLine.startSymbol) === null || _k === void 0 ? void 0 : _k.state) !== null && _l !== void 0 ? _l : {}, this._markerData),
|
|
97239
|
-
lineEndSymbol: transformState((_o = (_m = this._spec.itemLine.endSymbol) === null || _m === void 0 ? void 0 : _m.state) !== null && _o !== void 0 ? _o : {}, this._markerData),
|
|
97240
|
-
symbol: transformState((_q = (_p = this._spec.itemContent.symbol) === null || _p === void 0 ? void 0 : _p.state) !== null && _q !== void 0 ? _q : {}, this._markerData),
|
|
97241
|
-
image: transformState((_s = (_r = this._spec.itemContent.image) === null || _r === void 0 ? void 0 : _r.state) !== null && _s !== void 0 ? _s : {}, this._markerData),
|
|
97242
|
-
text: transformState((_u = (_t = this._spec.itemContent.text) === null || _t === void 0 ? void 0 : _t.state) !== null && _u !== void 0 ? _u : {}, this._markerData),
|
|
97243
|
-
textBackground: transformState((_w = (_v = this._spec.itemContent.text) === null || _v === void 0 ? void 0 : _v.labelBackground) === null || _w === void 0 ? void 0 : _w.state, this._markerData),
|
|
97244
|
-
richText: transformState((_y = (_x = this._spec.itemContent.richText) === null || _x === void 0 ? void 0 : _x.state) !== null && _y !== void 0 ? _y : {}, this._markerData),
|
|
97245
|
-
customMark: transformState((_0 = (_z = this._spec.itemContent.customMark) === null || _z === void 0 ? void 0 : _z.state) !== null && _0 !== void 0 ? _0 : {}, this._markerData),
|
|
97246
|
-
targetItem: transformState((_2 = (_1 = this._spec.targetSymbol) === null || _1 === void 0 ? void 0 : _1.state) !== null && _2 !== void 0 ? _2 : {}, this._markerData)
|
|
97251
|
+
line: transformState((_j = (_h = this._spec.itemLine.line) === null || _h === void 0 ? void 0 : _h.state) !== null && _j !== void 0 ? _j : {}, this._markerData, this._markAttributeContext),
|
|
97252
|
+
lineStartSymbol: transformState((_l = (_k = this._spec.itemLine.startSymbol) === null || _k === void 0 ? void 0 : _k.state) !== null && _l !== void 0 ? _l : {}, this._markerData, this._markAttributeContext),
|
|
97253
|
+
lineEndSymbol: transformState((_o = (_m = this._spec.itemLine.endSymbol) === null || _m === void 0 ? void 0 : _m.state) !== null && _o !== void 0 ? _o : {}, this._markerData, this._markAttributeContext),
|
|
97254
|
+
symbol: transformState((_q = (_p = this._spec.itemContent.symbol) === null || _p === void 0 ? void 0 : _p.state) !== null && _q !== void 0 ? _q : {}, this._markerData, this._markAttributeContext),
|
|
97255
|
+
image: transformState((_s = (_r = this._spec.itemContent.image) === null || _r === void 0 ? void 0 : _r.state) !== null && _s !== void 0 ? _s : {}, this._markerData, this._markAttributeContext),
|
|
97256
|
+
text: transformState((_u = (_t = this._spec.itemContent.text) === null || _t === void 0 ? void 0 : _t.state) !== null && _u !== void 0 ? _u : {}, this._markerData, this._markAttributeContext),
|
|
97257
|
+
textBackground: transformState((_w = (_v = this._spec.itemContent.text) === null || _v === void 0 ? void 0 : _v.labelBackground) === null || _w === void 0 ? void 0 : _w.state, this._markerData, this._markAttributeContext),
|
|
97258
|
+
richText: transformState((_y = (_x = this._spec.itemContent.richText) === null || _x === void 0 ? void 0 : _x.state) !== null && _y !== void 0 ? _y : {}, this._markerData, this._markAttributeContext),
|
|
97259
|
+
customMark: transformState((_0 = (_z = this._spec.itemContent.customMark) === null || _z === void 0 ? void 0 : _z.state) !== null && _0 !== void 0 ? _0 : {}, this._markerData, this._markAttributeContext),
|
|
97260
|
+
targetItem: transformState((_2 = (_1 = this._spec.targetSymbol) === null || _1 === void 0 ? void 0 : _1.state) !== null && _2 !== void 0 ? _2 : {}, this._markerData, this._markAttributeContext)
|
|
97247
97261
|
},
|
|
97248
97262
|
animation: (_3 = this._spec.animation) !== null && _3 !== void 0 ? _3 : false,
|
|
97249
97263
|
animationEnter: this._spec.animationEnter,
|
|
@@ -97251,16 +97265,16 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
97251
97265
|
animationUpdate: this._spec.animationUpdate
|
|
97252
97266
|
};
|
|
97253
97267
|
if (symbol === null || symbol === void 0 ? void 0 : symbol.style) {
|
|
97254
|
-
markPointAttrs.itemContent.symbolStyle = transformToGraphic(transformStyle(symbol.style, this._markerData));
|
|
97268
|
+
markPointAttrs.itemContent.symbolStyle = transformToGraphic(transformStyle(symbol.style, this._markerData, this._markAttributeContext));
|
|
97255
97269
|
}
|
|
97256
97270
|
if (image === null || image === void 0 ? void 0 : image.style) {
|
|
97257
|
-
markPointAttrs.itemContent.imageStyle = transformStyle(image.style, this._markerData);
|
|
97271
|
+
markPointAttrs.itemContent.imageStyle = transformStyle(image.style, this._markerData, this._markAttributeContext);
|
|
97258
97272
|
}
|
|
97259
97273
|
if (label) {
|
|
97260
|
-
markPointAttrs.itemContent.textStyle = transformLabelAttributes(label, this._markerData);
|
|
97274
|
+
markPointAttrs.itemContent.textStyle = transformLabelAttributes(label, this._markerData, this._markAttributeContext);
|
|
97261
97275
|
}
|
|
97262
97276
|
if (richText === null || richText === void 0 ? void 0 : richText.style) {
|
|
97263
|
-
markPointAttrs.itemContent.richTextStyle = transformStyle(richText.style, this._markerData);
|
|
97277
|
+
markPointAttrs.itemContent.richTextStyle = transformStyle(richText.style, this._markerData, this._markAttributeContext);
|
|
97264
97278
|
}
|
|
97265
97279
|
const { visible, line = {} } = itemLine, restItemLine = __rest$e(itemLine, ["visible", "line"]);
|
|
97266
97280
|
if (visible !== false) {
|