Skip to content

Commit 90243fc

Browse files
authored
Merge pull request #13092 from apache/release-dev
Release 4.9.0
2 parents 68e965f + e5c8871 commit 90243fc

25 files changed

+2412
-1190
lines changed

dist/echarts-en.common.js

Lines changed: 284 additions & 93 deletions
Large diffs are not rendered by default.

dist/echarts-en.common.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/echarts-en.js

Lines changed: 816 additions & 284 deletions
Large diffs are not rendered by default.

dist/echarts-en.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/echarts-en.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/echarts-en.simple.js

Lines changed: 60 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11289,7 +11289,7 @@ var painterCtors = {
1128911289
/**
1129011290
* @type {string}
1129111291
*/
11292-
var version$1 = '4.3.1';
11292+
var version$1 = '4.3.2';
1129311293

1129411294
/**
1129511295
* Initializing a zrender instance
@@ -25578,7 +25578,7 @@ var proto = Scheduler.prototype;
2557825578
* @param {Object} payload
2557925579
*/
2558025580
proto.restoreData = function (ecModel, payload) {
25581-
// TODO: Only restroe needed series and components, but not all components.
25581+
// TODO: Only restore needed series and components, but not all components.
2558225582
// Currently `restoreData` of all of the series and component will be called.
2558325583
// But some independent components like `title`, `legend`, `graphic`, `toolbox`,
2558425584
// `tooltip`, `axisPointer`, etc, do not need series refresh when `setOption`,
@@ -27155,10 +27155,10 @@ var isFunction = isFunction$1;
2715527155
var isObject = isObject$1;
2715627156
var parseClassType = ComponentModel.parseClassType;
2715727157

27158-
var version = '4.8.0';
27158+
var version = '4.9.0';
2715927159

2716027160
var dependencies = {
27161-
zrender: '4.3.1'
27161+
zrender: '4.3.2'
2716227162
};
2716327163

2716427164
var TEST_FRAME_REMAIN_TIME = 1;
@@ -30401,7 +30401,7 @@ listProto.mapDimension = function (coordDim, idx) {
3040130401
* Initialize from data
3040230402
* @param {Array.<Object|number|Array>} data source or data or data provider.
3040330403
* @param {Array.<string>} [nameLIst] The name of a datum is used on data diff and
30404-
* defualt label/tooltip.
30404+
* default label/tooltip.
3040530405
* A name can be specified in encode.itemName,
3040630406
* or dataItem.name (only for series option data),
3040730407
* or provided in nameList from outside.
@@ -33594,7 +33594,7 @@ symbolProto._updateCommon = function (data, idx, symbolSize, seriesScope) {
3359433594
}
3359533595
else {
3359633596
symbolPath.setStyle({
33597-
opacity: null,
33597+
opacity: 1,
3359833598
shadowBlur: null,
3359933599
shadowOffsetX: null,
3360033600
shadowOffsetY: null,
@@ -35779,7 +35779,7 @@ var dataSample = function (seriesType) {
3577935779
var valueAxis = coordSys.getOtherAxis(baseAxis);
3578035780
var extent = baseAxis.getExtent();
3578135781
// Coordinste system has been resized
35782-
var size = extent[1] - extent[0];
35782+
var size = Math.abs(extent[1] - extent[0]);
3578335783
var rate = Math.round(data.count() / size);
3578435784
if (rate > 1) {
3578535785
var sampler;
@@ -37945,8 +37945,8 @@ function rotateTextRect(textRect, rotate) {
3794537945
var boundingBox = textRect.plain();
3794637946
var beforeWidth = boundingBox.width;
3794737947
var beforeHeight = boundingBox.height;
37948-
var afterWidth = beforeWidth * Math.cos(rotateRadians) + beforeHeight * Math.sin(rotateRadians);
37949-
var afterHeight = beforeWidth * Math.sin(rotateRadians) + beforeHeight * Math.cos(rotateRadians);
37948+
var afterWidth = beforeWidth * Math.abs(Math.cos(rotateRadians)) + Math.abs(beforeHeight * Math.sin(rotateRadians));
37949+
var afterHeight = beforeWidth * Math.abs(Math.sin(rotateRadians)) + Math.abs(beforeHeight * Math.cos(rotateRadians));
3795037950
var rotatedRect = new BoundingRect(boundingBox.x, boundingBox.y, afterWidth, afterHeight);
3795137951

3795237952
return rotatedRect;
@@ -39141,7 +39141,7 @@ var defaultOption = {
3914139141
name: '',
3914239142
// 'start' | 'middle' | 'end'
3914339143
nameLocation: 'end',
39144-
// By degree. By defualt auto rotate by nameLocation.
39144+
// By degree. By default auto rotate by nameLocation.
3914539145
nameRotate: null,
3914639146
nameTruncate: {
3914739147
maxWidth: null,
@@ -42231,20 +42231,25 @@ extendChartView({
4223142231
var bgEls = [];
4223242232
var oldBgEls = this._backgroundEls || [];
4223342233

42234+
var createBackground = function (dataIndex) {
42235+
var bgLayout = getLayout[coord.type](data, dataIndex);
42236+
var bgEl = createBackgroundEl(coord, isHorizontalOrRadial, bgLayout);
42237+
bgEl.useStyle(backgroundModel.getBarItemStyle());
42238+
// Only cartesian2d support borderRadius.
42239+
if (coord.type === 'cartesian2d') {
42240+
bgEl.setShape('r', barBorderRadius);
42241+
}
42242+
bgEls[dataIndex] = bgEl;
42243+
return bgEl;
42244+
};
42245+
4223442246
data.diff(oldData)
4223542247
.add(function (dataIndex) {
4223642248
var itemModel = data.getItemModel(dataIndex);
4223742249
var layout = getLayout[coord.type](data, dataIndex, itemModel);
4223842250

4223942251
if (drawBackground) {
42240-
var bgLayout = getLayout[coord.type](data, dataIndex);
42241-
var bgEl = createBackgroundEl(coord, isHorizontalOrRadial, bgLayout);
42242-
bgEl.useStyle(backgroundModel.getBarItemStyle());
42243-
// Only cartesian2d support borderRadius.
42244-
if (coord.type === 'cartesian2d') {
42245-
bgEl.setShape('r', barBorderRadius);
42246-
}
42247-
bgEls[dataIndex] = bgEl;
42252+
createBackground(dataIndex);
4224842253
}
4224942254

4225042255
// If dataZoom in filteMode: 'empty', the baseValue can be set as NaN in "axisProxy".
@@ -42278,13 +42283,19 @@ extendChartView({
4227842283
var layout = getLayout[coord.type](data, newIndex, itemModel);
4227942284

4228042285
if (drawBackground) {
42281-
var bgEl = oldBgEls[oldIndex];
42282-
bgEl.useStyle(backgroundModel.getBarItemStyle());
42283-
// Only cartesian2d support borderRadius.
42284-
if (coord.type === 'cartesian2d') {
42285-
bgEl.setShape('r', barBorderRadius);
42286+
var bgEl;
42287+
if (oldBgEls.length === 0) {
42288+
bgEl = createBackground(oldIndex);
42289+
}
42290+
else {
42291+
bgEl = oldBgEls[oldIndex];
42292+
bgEl.useStyle(backgroundModel.getBarItemStyle());
42293+
// Only cartesian2d support borderRadius.
42294+
if (coord.type === 'cartesian2d') {
42295+
bgEl.setShape('r', barBorderRadius);
42296+
}
42297+
bgEls[newIndex] = bgEl;
4228642298
}
42287-
bgEls[newIndex] = bgEl;
4228842299

4228942300
var bgLayout = getLayout[coord.type](data, newIndex);
4229042301
var shape = createBackgroundShape(isHorizontalOrRadial, bgLayout, coord);
@@ -42444,8 +42455,31 @@ var clip = {
4244442455
return clipped;
4244542456
},
4244642457

42447-
polar: function (coordSysClipArea) {
42448-
return false;
42458+
polar: function (coordSysClipArea, layout) {
42459+
var signR = layout.r0 <= layout.r ? 1 : -1;
42460+
// Make sure r is larger than r0
42461+
if (signR < 0) {
42462+
var r = layout.r;
42463+
layout.r = layout.r0;
42464+
layout.r0 = r;
42465+
}
42466+
42467+
var r = mathMin$4(layout.r, coordSysClipArea.r);
42468+
var r0 = mathMax$4(layout.r0, coordSysClipArea.r0);
42469+
42470+
layout.r = r;
42471+
layout.r0 = r0;
42472+
42473+
var clipped = r - r0 < 0;
42474+
42475+
// Reverse back
42476+
if (signR < 0) {
42477+
var r = layout.r;
42478+
layout.r = layout.r0;
42479+
layout.r0 = r;
42480+
}
42481+
42482+
return clipped;
4244942483
}
4245042484
};
4245142485

dist/echarts-en.simple.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)