@visactor/vchart 1.11.2 → 1.12.0-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.es.js +73 -73
- package/build/index.js +73 -73
- package/build/index.min.js +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/cjs/chart/stack.js +2 -1
- package/cjs/compile/grammar-item.js +1 -2
- package/cjs/constant/scroll-bar.js +1 -2
- package/cjs/constant/waterfall.js +2 -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/core/instance-manager.js +2 -1
- package/cjs/event/event-dispatcher.js +1 -2
- package/cjs/series/progress/linear/linear.d.ts +1 -3
- package/cjs/series/progress/linear/linear.js +46 -61
- package/cjs/series/progress/linear/linear.js.map +1 -1
- package/esm/chart/stack.js +2 -1
- package/esm/compile/grammar-item.js +1 -2
- package/esm/constant/scroll-bar.js +1 -2
- package/esm/constant/waterfall.js +2 -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/core/instance-manager.js +2 -1
- package/esm/event/event-dispatcher.js +1 -2
- package/esm/series/progress/linear/linear.d.ts +1 -3
- package/esm/series/progress/linear/linear.js +46 -62
- package/esm/series/progress/linear/linear.js.map +1 -1
- package/package.json +4 -4
package/build/index.es.js
CHANGED
|
@@ -66274,7 +66274,7 @@ const registerCanvasTooltipHandler = () => {
|
|
|
66274
66274
|
registerComponentPlugin(CanvasTooltipHandler);
|
|
66275
66275
|
};
|
|
66276
66276
|
|
|
66277
|
-
const version = "1.
|
|
66277
|
+
const version = "1.12.0-alpha.0";
|
|
66278
66278
|
|
|
66279
66279
|
const addVChartProperty = (data, op) => {
|
|
66280
66280
|
const context = op.beforeCall();
|
|
@@ -80874,35 +80874,90 @@ class LinearProgressSeries extends CartesianSeries {
|
|
|
80874
80874
|
this.type = SeriesTypeEnum.linearProgress;
|
|
80875
80875
|
this._progressMark = null;
|
|
80876
80876
|
this._trackMark = null;
|
|
80877
|
-
this.
|
|
80877
|
+
this._defaultProgressCustomShape = (datum, attrs, path) => {
|
|
80878
|
+
const cornerRadius = this._spec.cornerRadius;
|
|
80879
|
+
const width = isValid$1(attrs.width) ? attrs.width : attrs.x1 - attrs.x;
|
|
80880
|
+
const height = isValid$1(attrs.height) ? attrs.height : attrs.y1 - attrs.y;
|
|
80881
|
+
const x0 = Math.min(0, width);
|
|
80882
|
+
const x1 = Math.max(0, width);
|
|
80883
|
+
const y0 = Math.min(0, height);
|
|
80884
|
+
const y1 = Math.max(0, height);
|
|
80885
|
+
if (cornerRadius > 0) {
|
|
80886
|
+
let realCornerRadius = cornerRadius;
|
|
80887
|
+
if (this._spec.direction === 'vertical') {
|
|
80888
|
+
realCornerRadius = Math.min(Math.abs(width / 2), cornerRadius);
|
|
80889
|
+
if (2 * realCornerRadius > Math.abs(height)) {
|
|
80890
|
+
const angle = Math.acos((realCornerRadius - Math.abs(height) / 2) / realCornerRadius);
|
|
80891
|
+
path.moveTo(x0 + realCornerRadius, y0);
|
|
80892
|
+
path.arc(x0 + realCornerRadius, y0 + realCornerRadius, realCornerRadius, 1.5 * Math.PI, 1.5 * Math.PI - angle, true);
|
|
80893
|
+
path.arc(x0 + realCornerRadius, y1 - realCornerRadius, realCornerRadius, angle + Math.PI / 2, Math.PI / 2, true);
|
|
80894
|
+
path.lineTo(x1 - cornerRadius, y1);
|
|
80895
|
+
path.arc(x1 - realCornerRadius, y1 - realCornerRadius, realCornerRadius, Math.PI / 2, Math.PI / 2 - angle, true);
|
|
80896
|
+
path.arc(x1 - realCornerRadius, y0 + realCornerRadius, realCornerRadius, -Math.PI / 2 + angle, -Math.PI / 2, true);
|
|
80897
|
+
path.lineTo(x0 + realCornerRadius, y0);
|
|
80898
|
+
path.closePath();
|
|
80899
|
+
return path;
|
|
80900
|
+
}
|
|
80901
|
+
}
|
|
80902
|
+
else {
|
|
80903
|
+
realCornerRadius = Math.min(Math.abs(height / 2), cornerRadius);
|
|
80904
|
+
if (2 * realCornerRadius > Math.abs(width)) {
|
|
80905
|
+
const angle = Math.acos((realCornerRadius - Math.abs(width) / 2) / realCornerRadius);
|
|
80906
|
+
path.moveTo(x0, y0 + realCornerRadius);
|
|
80907
|
+
path.arc(x0 + realCornerRadius, y0 + realCornerRadius, realCornerRadius, Math.PI, Math.PI + angle);
|
|
80908
|
+
path.arc(x1 - realCornerRadius, y0 + realCornerRadius, realCornerRadius, -angle, 0);
|
|
80909
|
+
path.lineTo(x1, y1 - realCornerRadius);
|
|
80910
|
+
path.arc(x1 - realCornerRadius, y1 - realCornerRadius, realCornerRadius, 0, angle);
|
|
80911
|
+
path.arc(x0 + realCornerRadius, y1 - realCornerRadius, realCornerRadius, Math.PI - angle, Math.PI);
|
|
80912
|
+
path.closePath();
|
|
80913
|
+
return path;
|
|
80914
|
+
}
|
|
80915
|
+
}
|
|
80916
|
+
path.moveTo(x0, y0 + realCornerRadius);
|
|
80917
|
+
path.arc(x0 + realCornerRadius, y0 + realCornerRadius, realCornerRadius, Math.PI, 1.5 * Math.PI);
|
|
80918
|
+
path.lineTo(x1 - realCornerRadius, y0);
|
|
80919
|
+
path.arc(x1 - realCornerRadius, y0 + realCornerRadius, realCornerRadius, -Math.PI / 2, 0);
|
|
80920
|
+
path.lineTo(x1, y1 - realCornerRadius);
|
|
80921
|
+
path.arc(x1 - realCornerRadius, y1 - realCornerRadius, realCornerRadius, 0, Math.PI / 2);
|
|
80922
|
+
path.lineTo(x0 + realCornerRadius, y1);
|
|
80923
|
+
path.arc(x0 + realCornerRadius, y1 - realCornerRadius, realCornerRadius, Math.PI / 2, Math.PI);
|
|
80924
|
+
path.closePath();
|
|
80925
|
+
}
|
|
80926
|
+
else {
|
|
80927
|
+
path.moveTo(x0, y0);
|
|
80928
|
+
path.lineTo(x1, y0);
|
|
80929
|
+
path.lineTo(x1, y1);
|
|
80930
|
+
path.lineTo(x0, y1);
|
|
80931
|
+
path.closePath();
|
|
80932
|
+
}
|
|
80933
|
+
return path;
|
|
80934
|
+
};
|
|
80878
80935
|
}
|
|
80879
80936
|
initMark() {
|
|
80880
|
-
this._initProgressGroupMark();
|
|
80881
80937
|
this._initTrackMark();
|
|
80882
80938
|
this._initProgressMark();
|
|
80883
80939
|
}
|
|
80884
80940
|
initMarkStyle() {
|
|
80885
|
-
this._initProgressGroupMarkStyle();
|
|
80886
80941
|
this._initTrackMarkStyle();
|
|
80887
80942
|
this._initProgressMarkStyle();
|
|
80888
80943
|
}
|
|
80889
80944
|
_initProgressMark() {
|
|
80890
|
-
var _a, _b;
|
|
80945
|
+
var _a, _b, _c;
|
|
80891
80946
|
this._progressMark = this._createMark(LinearProgressSeries.mark.progress, {
|
|
80892
80947
|
isSeriesMark: true,
|
|
80893
|
-
|
|
80894
|
-
|
|
80895
|
-
stateSort: (_b = this._spec.progress) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
80948
|
+
customShape: (_b = (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.customShape) !== null && _b !== void 0 ? _b : this._defaultProgressCustomShape,
|
|
80949
|
+
stateSort: (_c = this._spec.progress) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
80896
80950
|
});
|
|
80897
80951
|
return this._progressMark;
|
|
80898
80952
|
}
|
|
80899
80953
|
_initProgressMarkStyle() {
|
|
80900
|
-
var _a, _b, _c, _d
|
|
80954
|
+
var _a, _b, _c, _d;
|
|
80901
80955
|
const progressMark = this._progressMark;
|
|
80902
80956
|
if (progressMark) {
|
|
80903
80957
|
if (this._spec.direction === 'vertical') {
|
|
80904
|
-
const
|
|
80905
|
-
const
|
|
80958
|
+
const progress = this._spec.progress || {};
|
|
80959
|
+
const leftPadding = (_a = progress.leftPadding) !== null && _a !== void 0 ? _a : 0;
|
|
80960
|
+
const rightPadding = (_b = progress.rightPadding) !== null && _b !== void 0 ? _b : 0;
|
|
80906
80961
|
this.setMarkStyle(progressMark, {
|
|
80907
80962
|
x: (datum) => {
|
|
80908
80963
|
var _a, _b;
|
|
@@ -80910,22 +80965,19 @@ class LinearProgressSeries extends CartesianSeries {
|
|
|
80910
80965
|
this._spec.bandWidth / 2 +
|
|
80911
80966
|
leftPadding);
|
|
80912
80967
|
},
|
|
80913
|
-
|
|
80914
|
-
|
|
80968
|
+
y1: (datum) => { var _a, _b; 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)); },
|
|
80969
|
+
y: () => { var _a; return (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.dataToPosition([0], { bandPosition: this._bandPosition }); },
|
|
80915
80970
|
width: this._spec.bandWidth - leftPadding - rightPadding,
|
|
80916
80971
|
cornerRadius: this._spec.cornerRadius,
|
|
80917
80972
|
fill: this.getColorAttribute()
|
|
80918
80973
|
}, 'normal', AttributeLevel.Series);
|
|
80919
80974
|
}
|
|
80920
80975
|
else {
|
|
80921
|
-
const
|
|
80922
|
-
const
|
|
80976
|
+
const progress = this._spec.progress || {};
|
|
80977
|
+
const topPadding = (_c = progress.topPadding) !== null && _c !== void 0 ? _c : 0;
|
|
80978
|
+
const bottomPadding = (_d = progress.bottomPadding) !== null && _d !== void 0 ? _d : 0;
|
|
80923
80979
|
this.setMarkStyle(progressMark, {
|
|
80924
|
-
|
|
80925
|
-
var _a, _b;
|
|
80926
|
-
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)) -
|
|
80927
|
-
this._xAxisHelper.dataToPosition([1], { bandPosition: this._bandPosition });
|
|
80928
|
-
},
|
|
80980
|
+
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)); },
|
|
80929
80981
|
y: (datum) => {
|
|
80930
80982
|
var _a, _b;
|
|
80931
80983
|
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)) -
|
|
@@ -80933,7 +80985,7 @@ class LinearProgressSeries extends CartesianSeries {
|
|
|
80933
80985
|
topPadding);
|
|
80934
80986
|
},
|
|
80935
80987
|
height: this._spec.bandWidth - topPadding - bottomPadding,
|
|
80936
|
-
|
|
80988
|
+
x: () => { var _a; return (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.dataToPosition([0], { bandPosition: this._bandPosition }); },
|
|
80937
80989
|
cornerRadius: this._spec.cornerRadius,
|
|
80938
80990
|
fill: this.getColorAttribute()
|
|
80939
80991
|
}, 'normal', AttributeLevel.Series);
|
|
@@ -80943,7 +80995,6 @@ class LinearProgressSeries extends CartesianSeries {
|
|
|
80943
80995
|
_initTrackMark() {
|
|
80944
80996
|
var _a, _b;
|
|
80945
80997
|
this._trackMark = this._createMark(LinearProgressSeries.mark.track, {
|
|
80946
|
-
parent: this._progressGroupMark,
|
|
80947
80998
|
customShape: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.customShape,
|
|
80948
80999
|
stateSort: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
80949
81000
|
});
|
|
@@ -80980,57 +81031,6 @@ class LinearProgressSeries extends CartesianSeries {
|
|
|
80980
81031
|
}
|
|
80981
81032
|
}
|
|
80982
81033
|
}
|
|
80983
|
-
_initProgressGroupMark() {
|
|
80984
|
-
this._progressGroupMark = this._createMark(LinearProgressSeries.mark.group, {
|
|
80985
|
-
skipBeforeLayouted: false
|
|
80986
|
-
});
|
|
80987
|
-
return this._progressGroupMark;
|
|
80988
|
-
}
|
|
80989
|
-
_initProgressGroupMarkStyle() {
|
|
80990
|
-
const groupMark = this._progressGroupMark;
|
|
80991
|
-
groupMark.setZIndex(this.layoutZIndex);
|
|
80992
|
-
groupMark.created();
|
|
80993
|
-
this.setMarkStyle(groupMark, {
|
|
80994
|
-
clip: true,
|
|
80995
|
-
x: 0,
|
|
80996
|
-
y: 0,
|
|
80997
|
-
path: () => {
|
|
80998
|
-
var _a;
|
|
80999
|
-
const rectPaths = [];
|
|
81000
|
-
(_a = this._rawData) === null || _a === void 0 ? void 0 : _a.rawData.forEach((datum, index) => {
|
|
81001
|
-
var _a, _b, _c, _d;
|
|
81002
|
-
if (this._spec.direction === 'vertical') {
|
|
81003
|
-
const x = 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)) -
|
|
81004
|
-
this._spec.bandWidth / 2;
|
|
81005
|
-
const height = this._scaleY.range()[0];
|
|
81006
|
-
rectPaths.push(createRect({
|
|
81007
|
-
x: x,
|
|
81008
|
-
y: 0,
|
|
81009
|
-
height: height,
|
|
81010
|
-
width: this._spec.bandWidth,
|
|
81011
|
-
cornerRadius: this._spec.cornerRadius,
|
|
81012
|
-
fill: true
|
|
81013
|
-
}));
|
|
81014
|
-
}
|
|
81015
|
-
else {
|
|
81016
|
-
const y = valueInScaleRange(this.dataToPositionY(datum), (_d = (_c = this._yAxisHelper) === null || _c === void 0 ? void 0 : _c.getScale) === null || _d === void 0 ? void 0 : _d.call(_c, 0)) -
|
|
81017
|
-
this._spec.bandWidth / 2;
|
|
81018
|
-
const width = this._scaleX.range()[1];
|
|
81019
|
-
rectPaths.push(createRect({
|
|
81020
|
-
x: 0,
|
|
81021
|
-
y: y,
|
|
81022
|
-
height: this._spec.bandWidth,
|
|
81023
|
-
width: width,
|
|
81024
|
-
cornerRadius: this._spec.cornerRadius,
|
|
81025
|
-
fill: true
|
|
81026
|
-
}));
|
|
81027
|
-
}
|
|
81028
|
-
});
|
|
81029
|
-
return rectPaths;
|
|
81030
|
-
}
|
|
81031
|
-
}, 'normal', AttributeLevel.Series);
|
|
81032
|
-
this._progressGroupMark.setInteractive(false);
|
|
81033
|
-
}
|
|
81034
81034
|
initInteraction() {
|
|
81035
81035
|
const marks = [];
|
|
81036
81036
|
if (this._trackMark) {
|
package/build/index.js
CHANGED
|
@@ -66280,7 +66280,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
66280
66280
|
registerComponentPlugin(CanvasTooltipHandler);
|
|
66281
66281
|
};
|
|
66282
66282
|
|
|
66283
|
-
const version = "1.
|
|
66283
|
+
const version = "1.12.0-alpha.0";
|
|
66284
66284
|
|
|
66285
66285
|
const addVChartProperty = (data, op) => {
|
|
66286
66286
|
const context = op.beforeCall();
|
|
@@ -80880,35 +80880,90 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80880
80880
|
this.type = exports.SeriesTypeEnum.linearProgress;
|
|
80881
80881
|
this._progressMark = null;
|
|
80882
80882
|
this._trackMark = null;
|
|
80883
|
-
this.
|
|
80883
|
+
this._defaultProgressCustomShape = (datum, attrs, path) => {
|
|
80884
|
+
const cornerRadius = this._spec.cornerRadius;
|
|
80885
|
+
const width = isValid$1(attrs.width) ? attrs.width : attrs.x1 - attrs.x;
|
|
80886
|
+
const height = isValid$1(attrs.height) ? attrs.height : attrs.y1 - attrs.y;
|
|
80887
|
+
const x0 = Math.min(0, width);
|
|
80888
|
+
const x1 = Math.max(0, width);
|
|
80889
|
+
const y0 = Math.min(0, height);
|
|
80890
|
+
const y1 = Math.max(0, height);
|
|
80891
|
+
if (cornerRadius > 0) {
|
|
80892
|
+
let realCornerRadius = cornerRadius;
|
|
80893
|
+
if (this._spec.direction === 'vertical') {
|
|
80894
|
+
realCornerRadius = Math.min(Math.abs(width / 2), cornerRadius);
|
|
80895
|
+
if (2 * realCornerRadius > Math.abs(height)) {
|
|
80896
|
+
const angle = Math.acos((realCornerRadius - Math.abs(height) / 2) / realCornerRadius);
|
|
80897
|
+
path.moveTo(x0 + realCornerRadius, y0);
|
|
80898
|
+
path.arc(x0 + realCornerRadius, y0 + realCornerRadius, realCornerRadius, 1.5 * Math.PI, 1.5 * Math.PI - angle, true);
|
|
80899
|
+
path.arc(x0 + realCornerRadius, y1 - realCornerRadius, realCornerRadius, angle + Math.PI / 2, Math.PI / 2, true);
|
|
80900
|
+
path.lineTo(x1 - cornerRadius, y1);
|
|
80901
|
+
path.arc(x1 - realCornerRadius, y1 - realCornerRadius, realCornerRadius, Math.PI / 2, Math.PI / 2 - angle, true);
|
|
80902
|
+
path.arc(x1 - realCornerRadius, y0 + realCornerRadius, realCornerRadius, -Math.PI / 2 + angle, -Math.PI / 2, true);
|
|
80903
|
+
path.lineTo(x0 + realCornerRadius, y0);
|
|
80904
|
+
path.closePath();
|
|
80905
|
+
return path;
|
|
80906
|
+
}
|
|
80907
|
+
}
|
|
80908
|
+
else {
|
|
80909
|
+
realCornerRadius = Math.min(Math.abs(height / 2), cornerRadius);
|
|
80910
|
+
if (2 * realCornerRadius > Math.abs(width)) {
|
|
80911
|
+
const angle = Math.acos((realCornerRadius - Math.abs(width) / 2) / realCornerRadius);
|
|
80912
|
+
path.moveTo(x0, y0 + realCornerRadius);
|
|
80913
|
+
path.arc(x0 + realCornerRadius, y0 + realCornerRadius, realCornerRadius, Math.PI, Math.PI + angle);
|
|
80914
|
+
path.arc(x1 - realCornerRadius, y0 + realCornerRadius, realCornerRadius, -angle, 0);
|
|
80915
|
+
path.lineTo(x1, y1 - realCornerRadius);
|
|
80916
|
+
path.arc(x1 - realCornerRadius, y1 - realCornerRadius, realCornerRadius, 0, angle);
|
|
80917
|
+
path.arc(x0 + realCornerRadius, y1 - realCornerRadius, realCornerRadius, Math.PI - angle, Math.PI);
|
|
80918
|
+
path.closePath();
|
|
80919
|
+
return path;
|
|
80920
|
+
}
|
|
80921
|
+
}
|
|
80922
|
+
path.moveTo(x0, y0 + realCornerRadius);
|
|
80923
|
+
path.arc(x0 + realCornerRadius, y0 + realCornerRadius, realCornerRadius, Math.PI, 1.5 * Math.PI);
|
|
80924
|
+
path.lineTo(x1 - realCornerRadius, y0);
|
|
80925
|
+
path.arc(x1 - realCornerRadius, y0 + realCornerRadius, realCornerRadius, -Math.PI / 2, 0);
|
|
80926
|
+
path.lineTo(x1, y1 - realCornerRadius);
|
|
80927
|
+
path.arc(x1 - realCornerRadius, y1 - realCornerRadius, realCornerRadius, 0, Math.PI / 2);
|
|
80928
|
+
path.lineTo(x0 + realCornerRadius, y1);
|
|
80929
|
+
path.arc(x0 + realCornerRadius, y1 - realCornerRadius, realCornerRadius, Math.PI / 2, Math.PI);
|
|
80930
|
+
path.closePath();
|
|
80931
|
+
}
|
|
80932
|
+
else {
|
|
80933
|
+
path.moveTo(x0, y0);
|
|
80934
|
+
path.lineTo(x1, y0);
|
|
80935
|
+
path.lineTo(x1, y1);
|
|
80936
|
+
path.lineTo(x0, y1);
|
|
80937
|
+
path.closePath();
|
|
80938
|
+
}
|
|
80939
|
+
return path;
|
|
80940
|
+
};
|
|
80884
80941
|
}
|
|
80885
80942
|
initMark() {
|
|
80886
|
-
this._initProgressGroupMark();
|
|
80887
80943
|
this._initTrackMark();
|
|
80888
80944
|
this._initProgressMark();
|
|
80889
80945
|
}
|
|
80890
80946
|
initMarkStyle() {
|
|
80891
|
-
this._initProgressGroupMarkStyle();
|
|
80892
80947
|
this._initTrackMarkStyle();
|
|
80893
80948
|
this._initProgressMarkStyle();
|
|
80894
80949
|
}
|
|
80895
80950
|
_initProgressMark() {
|
|
80896
|
-
var _a, _b;
|
|
80951
|
+
var _a, _b, _c;
|
|
80897
80952
|
this._progressMark = this._createMark(LinearProgressSeries.mark.progress, {
|
|
80898
80953
|
isSeriesMark: true,
|
|
80899
|
-
|
|
80900
|
-
|
|
80901
|
-
stateSort: (_b = this._spec.progress) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
80954
|
+
customShape: (_b = (_a = this._spec.progress) === null || _a === void 0 ? void 0 : _a.customShape) !== null && _b !== void 0 ? _b : this._defaultProgressCustomShape,
|
|
80955
|
+
stateSort: (_c = this._spec.progress) === null || _c === void 0 ? void 0 : _c.stateSort
|
|
80902
80956
|
});
|
|
80903
80957
|
return this._progressMark;
|
|
80904
80958
|
}
|
|
80905
80959
|
_initProgressMarkStyle() {
|
|
80906
|
-
var _a, _b, _c, _d
|
|
80960
|
+
var _a, _b, _c, _d;
|
|
80907
80961
|
const progressMark = this._progressMark;
|
|
80908
80962
|
if (progressMark) {
|
|
80909
80963
|
if (this._spec.direction === 'vertical') {
|
|
80910
|
-
const
|
|
80911
|
-
const
|
|
80964
|
+
const progress = this._spec.progress || {};
|
|
80965
|
+
const leftPadding = (_a = progress.leftPadding) !== null && _a !== void 0 ? _a : 0;
|
|
80966
|
+
const rightPadding = (_b = progress.rightPadding) !== null && _b !== void 0 ? _b : 0;
|
|
80912
80967
|
this.setMarkStyle(progressMark, {
|
|
80913
80968
|
x: (datum) => {
|
|
80914
80969
|
var _a, _b;
|
|
@@ -80916,22 +80971,19 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80916
80971
|
this._spec.bandWidth / 2 +
|
|
80917
80972
|
leftPadding);
|
|
80918
80973
|
},
|
|
80919
|
-
|
|
80920
|
-
|
|
80974
|
+
y1: (datum) => { var _a, _b; 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)); },
|
|
80975
|
+
y: () => { var _a; return (_a = this._yAxisHelper) === null || _a === void 0 ? void 0 : _a.dataToPosition([0], { bandPosition: this._bandPosition }); },
|
|
80921
80976
|
width: this._spec.bandWidth - leftPadding - rightPadding,
|
|
80922
80977
|
cornerRadius: this._spec.cornerRadius,
|
|
80923
80978
|
fill: this.getColorAttribute()
|
|
80924
80979
|
}, 'normal', exports.AttributeLevel.Series);
|
|
80925
80980
|
}
|
|
80926
80981
|
else {
|
|
80927
|
-
const
|
|
80928
|
-
const
|
|
80982
|
+
const progress = this._spec.progress || {};
|
|
80983
|
+
const topPadding = (_c = progress.topPadding) !== null && _c !== void 0 ? _c : 0;
|
|
80984
|
+
const bottomPadding = (_d = progress.bottomPadding) !== null && _d !== void 0 ? _d : 0;
|
|
80929
80985
|
this.setMarkStyle(progressMark, {
|
|
80930
|
-
|
|
80931
|
-
var _a, _b;
|
|
80932
|
-
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)) -
|
|
80933
|
-
this._xAxisHelper.dataToPosition([1], { bandPosition: this._bandPosition });
|
|
80934
|
-
},
|
|
80986
|
+
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)); },
|
|
80935
80987
|
y: (datum) => {
|
|
80936
80988
|
var _a, _b;
|
|
80937
80989
|
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)) -
|
|
@@ -80939,7 +80991,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80939
80991
|
topPadding);
|
|
80940
80992
|
},
|
|
80941
80993
|
height: this._spec.bandWidth - topPadding - bottomPadding,
|
|
80942
|
-
|
|
80994
|
+
x: () => { var _a; return (_a = this._xAxisHelper) === null || _a === void 0 ? void 0 : _a.dataToPosition([0], { bandPosition: this._bandPosition }); },
|
|
80943
80995
|
cornerRadius: this._spec.cornerRadius,
|
|
80944
80996
|
fill: this.getColorAttribute()
|
|
80945
80997
|
}, 'normal', exports.AttributeLevel.Series);
|
|
@@ -80949,7 +81001,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80949
81001
|
_initTrackMark() {
|
|
80950
81002
|
var _a, _b;
|
|
80951
81003
|
this._trackMark = this._createMark(LinearProgressSeries.mark.track, {
|
|
80952
|
-
parent: this._progressGroupMark,
|
|
80953
81004
|
customShape: (_a = this._spec.track) === null || _a === void 0 ? void 0 : _a.customShape,
|
|
80954
81005
|
stateSort: (_b = this._spec.track) === null || _b === void 0 ? void 0 : _b.stateSort
|
|
80955
81006
|
});
|
|
@@ -80986,57 +81037,6 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
|
|
|
80986
81037
|
}
|
|
80987
81038
|
}
|
|
80988
81039
|
}
|
|
80989
|
-
_initProgressGroupMark() {
|
|
80990
|
-
this._progressGroupMark = this._createMark(LinearProgressSeries.mark.group, {
|
|
80991
|
-
skipBeforeLayouted: false
|
|
80992
|
-
});
|
|
80993
|
-
return this._progressGroupMark;
|
|
80994
|
-
}
|
|
80995
|
-
_initProgressGroupMarkStyle() {
|
|
80996
|
-
const groupMark = this._progressGroupMark;
|
|
80997
|
-
groupMark.setZIndex(this.layoutZIndex);
|
|
80998
|
-
groupMark.created();
|
|
80999
|
-
this.setMarkStyle(groupMark, {
|
|
81000
|
-
clip: true,
|
|
81001
|
-
x: 0,
|
|
81002
|
-
y: 0,
|
|
81003
|
-
path: () => {
|
|
81004
|
-
var _a;
|
|
81005
|
-
const rectPaths = [];
|
|
81006
|
-
(_a = this._rawData) === null || _a === void 0 ? void 0 : _a.rawData.forEach((datum, index) => {
|
|
81007
|
-
var _a, _b, _c, _d;
|
|
81008
|
-
if (this._spec.direction === 'vertical') {
|
|
81009
|
-
const x = 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)) -
|
|
81010
|
-
this._spec.bandWidth / 2;
|
|
81011
|
-
const height = this._scaleY.range()[0];
|
|
81012
|
-
rectPaths.push(createRect({
|
|
81013
|
-
x: x,
|
|
81014
|
-
y: 0,
|
|
81015
|
-
height: height,
|
|
81016
|
-
width: this._spec.bandWidth,
|
|
81017
|
-
cornerRadius: this._spec.cornerRadius,
|
|
81018
|
-
fill: true
|
|
81019
|
-
}));
|
|
81020
|
-
}
|
|
81021
|
-
else {
|
|
81022
|
-
const y = valueInScaleRange(this.dataToPositionY(datum), (_d = (_c = this._yAxisHelper) === null || _c === void 0 ? void 0 : _c.getScale) === null || _d === void 0 ? void 0 : _d.call(_c, 0)) -
|
|
81023
|
-
this._spec.bandWidth / 2;
|
|
81024
|
-
const width = this._scaleX.range()[1];
|
|
81025
|
-
rectPaths.push(createRect({
|
|
81026
|
-
x: 0,
|
|
81027
|
-
y: y,
|
|
81028
|
-
height: this._spec.bandWidth,
|
|
81029
|
-
width: width,
|
|
81030
|
-
cornerRadius: this._spec.cornerRadius,
|
|
81031
|
-
fill: true
|
|
81032
|
-
}));
|
|
81033
|
-
}
|
|
81034
|
-
});
|
|
81035
|
-
return rectPaths;
|
|
81036
|
-
}
|
|
81037
|
-
}, 'normal', exports.AttributeLevel.Series);
|
|
81038
|
-
this._progressGroupMark.setInteractive(false);
|
|
81039
|
-
}
|
|
81040
81040
|
initInteraction() {
|
|
81041
81041
|
const marks = [];
|
|
81042
81042
|
if (this._trackMark) {
|