You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by sh...@apache.org on 2020/03/18 14:41:04 UTC
[incubator-echarts] 01/02: ts: bug squash
This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch typescript
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 2332594292029c39d99842f4dae9c63130e5ed1b
Author: pissang <bm...@gmail.com>
AuthorDate: Wed Mar 18 22:28:01 2020 +0800
ts: bug squash
---
src/chart/lines/LinesSeries.ts | 2 +-
src/chart/pie/PieView.ts | 6 +++---
src/chart/sunburst/SunburstSeries.ts | 2 +-
src/component/timeline/SliderTimelineView.ts | 10 +++++-----
src/component/visualMap/PiecewiseModel.ts | 1 +
test/asset/echarts-logo.png | Bin 0 -> 3410 bytes
test/bar.html | 2 +-
test/symbol.html | 2 +-
8 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/chart/lines/LinesSeries.ts b/src/chart/lines/LinesSeries.ts
index 2aa62b6..765fe55 100644
--- a/src/chart/lines/LinesSeries.ts
+++ b/src/chart/lines/LinesSeries.ts
@@ -149,7 +149,7 @@ class LinesSeriesModel extends SeriesModel<LinesSeriesOption> {
static readonly dependencies = ['grid', 'polar', 'geo', 'calendar']
- visualColorAccessPath: ['lineStyle', 'color']
+ visualColorAccessPath = ['lineStyle', 'color']
private _flatCoords: ArrayLike<number>
private _flatCoordsOffset: ArrayLike<number>
diff --git a/src/chart/pie/PieView.ts b/src/chart/pie/PieView.ts
index 955134b..0970a66 100644
--- a/src/chart/pie/PieView.ts
+++ b/src/chart/pie/PieView.ts
@@ -124,10 +124,10 @@ class PiePiece extends graphic.Group {
var itemModel = data.getItemModel<PieDataItemOption>(idx);
var layout = data.getItemLayout(idx) as graphic.Sector['shape'];
var sectorShape = zrUtil.extend({
- label: ''
+ label: null
}, layout);
- // @ts-ignore FIXME:TS label?
- // sectorShape.label = null;
+ // Not animate label
+ sectorShape.label = null;
var animationTypeUpdate = seriesModel.getShallow('animationTypeUpdate');
diff --git a/src/chart/sunburst/SunburstSeries.ts b/src/chart/sunburst/SunburstSeries.ts
index c03233a..aa159e7 100644
--- a/src/chart/sunburst/SunburstSeries.ts
+++ b/src/chart/sunburst/SunburstSeries.ts
@@ -187,7 +187,7 @@ class SunburstSeriesModel extends SeriesModel<SunburstSeriesOption> {
return params;
}
- defaultOption: SunburstSeriesOption = {
+ static defaultOption: SunburstSeriesOption = {
zlevel: 0,
z: 2,
diff --git a/src/component/timeline/SliderTimelineView.ts b/src/component/timeline/SliderTimelineView.ts
index aae646c..33191cd 100644
--- a/src/component/timeline/SliderTimelineView.ts
+++ b/src/component/timeline/SliderTimelineView.ts
@@ -112,10 +112,6 @@ class SliderTimelineView extends TimelineView {
var mainGroup = this._createGroup('_mainGroup');
var labelGroup = this._createGroup('_labelGroup');
- /**
- * @private
- * @type {module:echarts/component/timeline/TimelineAxis}
- */
var axis = this._axis = this._createAxis(layoutInfo, timelineModel);
timelineModel.formatTooltip = function (dataIndex: number) {
@@ -169,6 +165,10 @@ class SliderTimelineView extends TimelineView {
vertical: {left: '-', right: '+'}
} as const)[orient][labelPosOpt];
}
+ else {
+ // is number
+ parsedLabelPos = labelPosOpt;
+ }
var labelAlignMap = {
horizontal: 'center',
@@ -284,7 +284,7 @@ class SliderTimelineView extends TimelineView {
var labelPosOpt = layoutInfo.labelPosOpt;
- if (isString(labelPosOpt)) { // '+' or '-'
+ if (labelPosOpt == null || isString(labelPosOpt)) { // '+' or '-'
var mainBoundIdx = labelPosOpt === '+' ? 0 : 1;
toBound(mainPosition, mainBound, viewBound, 1, mainBoundIdx);
toBound(labelsPosition, labelBound, viewBound, 1, 1 - mainBoundIdx);
diff --git a/src/component/visualMap/PiecewiseModel.ts b/src/component/visualMap/PiecewiseModel.ts
index d0afc4d..da91dcd 100644
--- a/src/component/visualMap/PiecewiseModel.ts
+++ b/src/component/visualMap/PiecewiseModel.ts
@@ -140,6 +140,7 @@ class PiecewiseModel extends VisualMapModel<PiecewiseVisualMapOption> {
var mode = this._mode = this._determineMode();
+ this._pieceList = [];
resetMethods[this._mode].call(this, this._pieceList);
this._resetSelected(newOption, isInit);
diff --git a/test/asset/echarts-logo.png b/test/asset/echarts-logo.png
new file mode 100644
index 0000000..09b3822
Binary files /dev/null and b/test/asset/echarts-logo.png differ
diff --git a/test/bar.html b/test/bar.html
index fbb3137..ad8923d 100644
--- a/test/bar.html
+++ b/test/bar.html
@@ -164,7 +164,7 @@ under the License.
myTool2: {
show: true,
title: '自定义扩展方法2',
- icon: 'image://http://echarts.baidu.com/images/favicon.png',
+ icon: 'image://./asset/echarts-logo.png',
onclick: function (){
alert('myToolHandler2')
}
diff --git a/test/symbol.html b/test/symbol.html
index e306b89..5290570 100644
--- a/test/symbol.html
+++ b/test/symbol.html
@@ -51,7 +51,7 @@ under the License.
'triangle',
'diamond',
'pin',
- 'image://http://echarts.baidu.com/doc/asset/img/echarts-logo.png',
+ 'image://./asset/echarts-logo.png',
'path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.06 [...]
'emptyPath://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,4 [...]
];
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org