Skip to content

Commit ca9ed74

Browse files
committed
chore: release 5.6.0
1 parent 9557620 commit ca9ed74

18 files changed

+552
-130
lines changed

dist/echarts.common.js

Lines changed: 83 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
else {
177177
text = text || '';
178178
font = font || DEFAULT_FONT;
179-
var res = /(\d+)px/.exec(font);
179+
var res = /((?:\d+)?\.?\d*)px/.exec(font);
180180
var fontSize = res && +res[1] || DEFAULT_FONT_SIZE;
181181
var width = 0;
182182
if (font.indexOf('mono') >= 0) {
@@ -7370,7 +7370,7 @@
73707370
function registerSSRDataGetter(getter) {
73717371
ssrDataGetter = getter;
73727372
}
7373-
var version = '5.5.0';
7373+
var version = '5.6.0';
73747374

73757375
var zrender = /*#__PURE__*/Object.freeze({
73767376
__proto__: null,
@@ -16102,13 +16102,15 @@
1610216102
var m = date[minutesGetterName(isUTC)]();
1610316103
var s = date[secondsGetterName(isUTC)]();
1610416104
var S = date[millisecondsGetterName(isUTC)]();
16105+
var a = H >= 12 ? 'pm' : 'am';
16106+
var A = a.toUpperCase();
1610516107
var localeModel = lang instanceof Model ? lang : getLocaleModel(lang || SYSTEM_LANG) || getDefaultLocaleModel();
1610616108
var timeModel = localeModel.getModel('time');
1610716109
var month = timeModel.get('month');
1610816110
var monthAbbr = timeModel.get('monthAbbr');
1610916111
var dayOfWeek = timeModel.get('dayOfWeek');
1611016112
var dayOfWeekAbbr = timeModel.get('dayOfWeekAbbr');
16111-
return (template || '').replace(/{yyyy}/g, y + '').replace(/{yy}/g, pad(y % 100 + '', 2)).replace(/{Q}/g, q + '').replace(/{MMMM}/g, month[M - 1]).replace(/{MMM}/g, monthAbbr[M - 1]).replace(/{MM}/g, pad(M, 2)).replace(/{M}/g, M + '').replace(/{dd}/g, pad(d, 2)).replace(/{d}/g, d + '').replace(/{eeee}/g, dayOfWeek[e]).replace(/{ee}/g, dayOfWeekAbbr[e]).replace(/{e}/g, e + '').replace(/{HH}/g, pad(H, 2)).replace(/{H}/g, H + '').replace(/{hh}/g, pad(h + '', 2)).replace(/{h}/g, h + '').replace(/{mm}/g, pad(m, 2)).replace(/{m}/g, m + '').replace(/{ss}/g, pad(s, 2)).replace(/{s}/g, s + '').replace(/{SSS}/g, pad(S, 3)).replace(/{S}/g, S + '');
16113+
return (template || '').replace(/{a}/g, a + '').replace(/{A}/g, A + '').replace(/{yyyy}/g, y + '').replace(/{yy}/g, pad(y % 100 + '', 2)).replace(/{Q}/g, q + '').replace(/{MMMM}/g, month[M - 1]).replace(/{MMM}/g, monthAbbr[M - 1]).replace(/{MM}/g, pad(M, 2)).replace(/{M}/g, M + '').replace(/{dd}/g, pad(d, 2)).replace(/{d}/g, d + '').replace(/{eeee}/g, dayOfWeek[e]).replace(/{ee}/g, dayOfWeekAbbr[e]).replace(/{e}/g, e + '').replace(/{HH}/g, pad(H, 2)).replace(/{H}/g, H + '').replace(/{hh}/g, pad(h + '', 2)).replace(/{h}/g, h + '').replace(/{mm}/g, pad(m, 2)).replace(/{m}/g, m + '').replace(/{ss}/g, pad(s, 2)).replace(/{s}/g, s + '').replace(/{SSS}/g, pad(S, 3)).replace(/{S}/g, S + '');
1611216114
}
1611316115
function leveledFormat(tick, idx, formatter, lang, isUTC) {
1611416116
var template = null;
@@ -17443,8 +17445,8 @@
1744317445
function detectValue(val) {
1744417446
var beStr = isString(val);
1744517447
// Consider usage convenience, '1', '2' will be treated as "number".
17446-
// `isFinit('')` get `true`.
17447-
if (val != null && isFinite(val) && val !== '') {
17448+
// `Number('')` (or any whitespace) is `0`.
17449+
if (val != null && Number.isFinite(Number(val)) && val !== '') {
1744817450
return beStr ? BE_ORDINAL.Might : BE_ORDINAL.Not;
1744917451
} else if (beStr && val !== '-') {
1745017452
return BE_ORDINAL.Must;
@@ -20203,7 +20205,7 @@
2020320205
return value == null || value === '' ? NaN
2020420206
// If string (like '-'), using '+' parse to NaN
2020520207
// If object, also parse to NaN
20206-
: +value;
20208+
: Number(value);
2020720209
}
2020820210
var valueParserMap = createHashMap({
2020920211
'number': function (val) {
@@ -22463,7 +22465,7 @@
2246322465
var task = getCurrentTask(this);
2246422466
if (task) {
2246522467
var data = task.context.data;
22466-
return dataType == null ? data : data.getLinkedData(dataType);
22468+
return dataType == null || !data.getLinkedData ? data : data.getLinkedData(dataType);
2246722469
} else {
2246822470
// When series is not alive (that may happen when click toolbox
2246922471
// restore or setOption with not merge mode), series data may
@@ -25937,9 +25939,9 @@
2593725939
return implsStore[name];
2593825940
}
2593925941

25940-
var version$1 = '5.5.0';
25942+
var version$1 = '5.6.0';
2594125943
var dependencies = {
25942-
zrender: '5.5.0'
25944+
zrender: '5.6.0'
2594325945
};
2594425946
var TEST_FRAME_REMAIN_TIME = 1;
2594525947
var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
@@ -31280,11 +31282,11 @@
3128031282
var value = store.get(stacked ? stackedDimIdx : valueDimIdx, dataIndex);
3128131283
var baseValue = store.get(baseDimIdx, dataIndex);
3128231284
var baseCoord = valueAxisStart;
31283-
var startValue = void 0;
31285+
var stackStartValue = void 0;
3128431286
// Because of the barMinHeight, we can not use the value in
3128531287
// stackResultDimension directly.
3128631288
if (stacked) {
31287-
startValue = +value - store.get(valueDimIdx, dataIndex);
31289+
stackStartValue = +value - store.get(valueDimIdx, dataIndex);
3128831290
}
3128931291
var x = void 0;
3129031292
var y = void 0;
@@ -31293,7 +31295,7 @@
3129331295
if (isValueAxisH) {
3129431296
var coord = cartesian.dataToPoint([value, baseValue]);
3129531297
if (stacked) {
31296-
var startCoord = cartesian.dataToPoint([startValue, baseValue]);
31298+
var startCoord = cartesian.dataToPoint([stackStartValue, baseValue]);
3129731299
baseCoord = startCoord[0];
3129831300
}
3129931301
x = baseCoord;
@@ -31306,7 +31308,7 @@
3130631308
} else {
3130731309
var coord = cartesian.dataToPoint([baseValue, value]);
3130831310
if (stacked) {
31309-
var startCoord = cartesian.dataToPoint([baseValue, startValue]);
31311+
var startCoord = cartesian.dataToPoint([baseValue, stackStartValue]);
3131031312
baseCoord = startCoord[1];
3131131313
}
3131231314
x = coord[0] + columnOffset;
@@ -31359,7 +31361,11 @@
3135931361
}
3136031362
// See cases in `test/bar-start.html` and `#7412`, `#8747`.
3136131363
function getValueAxisStart(baseAxis, valueAxis) {
31362-
return valueAxis.toGlobalCoord(valueAxis.dataToCoord(valueAxis.type === 'log' ? 1 : 0));
31364+
var startValue = valueAxis.model.get('startValue');
31365+
if (!startValue) {
31366+
startValue = 0;
31367+
}
31368+
return valueAxis.toGlobalCoord(valueAxis.dataToCoord(valueAxis.type === 'log' ? startValue > 0 ? startValue : 1 : startValue));
3136331369
}
3136431370

3136531371
// FIXME 公用?
@@ -31951,7 +31957,11 @@
3195131957
this._dataMax = dataExtent[1];
3195231958
var isOrdinal = this._isOrdinal = scale.type === 'ordinal';
3195331959
this._needCrossZero = scale.type === 'interval' && model.getNeedCrossZero && model.getNeedCrossZero();
31954-
var modelMinRaw = this._modelMinRaw = model.get('min', true);
31960+
var axisMinValue = model.get('min', true);
31961+
if (axisMinValue == null) {
31962+
axisMinValue = model.get('startValue', true);
31963+
}
31964+
var modelMinRaw = this._modelMinRaw = axisMinValue;
3195531965
if (isFunction(modelMinRaw)) {
3195631966
// This callback always provides users the full data extent (before data is filtered).
3195731967
this._modelMinNum = parseAxisModelMinMax(scale, modelMinRaw({
@@ -33002,7 +33012,36 @@
3300233012
});
3300333013

3300433014
var inner$5 = makeInner();
33015+
function tickValuesToNumbers(axis, values) {
33016+
var nums = map(values, function (val) {
33017+
return axis.scale.parse(val);
33018+
});
33019+
if (axis.type === 'time' && nums.length > 0) {
33020+
// Time axis needs duplicate first/last tick (see TimeScale.getTicks())
33021+
// The first and last tick/label don't get drawn
33022+
nums.sort();
33023+
nums.unshift(nums[0]);
33024+
nums.push(nums[nums.length - 1]);
33025+
}
33026+
return nums;
33027+
}
3300533028
function createAxisLabels(axis) {
33029+
var custom = axis.getLabelModel().get('customValues');
33030+
if (custom) {
33031+
var labelFormatter_1 = makeLabelFormatter(axis);
33032+
return {
33033+
labels: tickValuesToNumbers(axis, custom).map(function (numval) {
33034+
var tick = {
33035+
value: numval
33036+
};
33037+
return {
33038+
formattedLabel: labelFormatter_1(tick),
33039+
rawLabel: axis.scale.getLabel(tick),
33040+
tickValue: numval
33041+
};
33042+
})
33043+
};
33044+
}
3300633045
// Only ordinal scale support tick interval
3300733046
return axis.type === 'category' ? makeCategoryLabels(axis) : makeRealNumberLabels(axis);
3300833047
}
@@ -33015,6 +33054,12 @@
3301533054
* }
3301633055
*/
3301733056
function createAxisTicks(axis, tickModel) {
33057+
var custom = axis.getTickModel().get('customValues');
33058+
if (custom) {
33059+
return {
33060+
ticks: tickValuesToNumbers(axis, custom)
33061+
};
33062+
}
3301833063
// Only ordinal scale support tick interval
3301933064
return axis.type === 'category' ? makeCategoryTicks(axis, tickModel) : {
3302033065
ticks: map(axis.scale.getTicks(), function (tick) {
@@ -40359,6 +40404,10 @@
4035940404
var halfPadAngle = dir * padAngle / 2;
4036040405
normalizeArcAngles(angles, !clockwise);
4036140406
startAngle = angles[0], endAngle = angles[1];
40407+
var layoutData = getSeriesLayoutData(seriesModel);
40408+
layoutData.startAngle = startAngle;
40409+
layoutData.endAngle = endAngle;
40410+
layoutData.clockwise = clockwise;
4036240411
var angleRange = Math.abs(endAngle - startAngle);
4036340412
// In the case some sector angle is smaller than minAngle
4036440413
var restAngle = angleRange;
@@ -40467,6 +40516,7 @@
4046740516
}
4046840517
});
4046940518
}
40519+
var getSeriesLayoutData = makeInner();
4047040520

4047140521
/*
4047240522
* Licensed to the Apache Software Foundation (ASF) under one
@@ -41147,8 +41197,9 @@
4114741197
}
4114841198
// when all data are filtered, show lightgray empty circle
4114941199
if (data.count() === 0 && seriesModel.get('showEmptyCircle')) {
41200+
var layoutData = getSeriesLayoutData(seriesModel);
4115041201
var sector = new Sector({
41151-
shape: getBasicPieLayout(seriesModel, api)
41202+
shape: extend(getBasicPieLayout(seriesModel, api), layoutData)
4115241203
});
4115341204
sector.useStyle(seriesModel.getModel('emptyCircleStyle').getItemStyle());
4115441205
this._emptyCircleSector = sector;
@@ -47990,7 +48041,6 @@
4799048041
return featureName.indexOf('my') === 0;
4799148042
}
4799248043

47993-
/* global window, document */
4799448044
var SaveAsImage = /** @class */function (_super) {
4799548045
__extends(SaveAsImage, _super);
4799648046
function SaveAsImage() {
@@ -48010,7 +48060,7 @@
4801048060
});
4801148061
var browser = env.browser;
4801248062
// Chrome, Firefox, New Edge
48013-
if (isFunction(MouseEvent) && (browser.newEdge || !browser.ie && !browser.edge)) {
48063+
if (typeof MouseEvent === 'function' && (browser.newEdge || !browser.ie && !browser.edge)) {
4801448064
var $a = document.createElement('a');
4801548065
$a.download = title + '.' + type;
4801648066
$a.target = '_blank';
@@ -51787,6 +51837,16 @@
5178751837
MarkerModel.prototype.setData = function (data) {
5178851838
this._data = data;
5178951839
};
51840+
MarkerModel.prototype.getDataParams = function (dataIndex, dataType) {
51841+
var params = DataFormatMixin.prototype.getDataParams.call(this, dataIndex, dataType);
51842+
var hostSeries = this.__hostSeries;
51843+
if (hostSeries) {
51844+
params.seriesId = hostSeries.id;
51845+
params.seriesName = hostSeries.name;
51846+
params.seriesType = hostSeries.subType;
51847+
}
51848+
return params;
51849+
};
5179051850
MarkerModel.getMarkerModelFromSeries = function (seriesModel,
5179151851
// Support three types of markers. Strict check.
5179251852
componentType) {
@@ -56267,13 +56327,17 @@
5626756327
}
5626856328
}
5626956329
function setLabel() {
56330+
var dom = api.getZr().dom;
56331+
// TODO: support for SSR
56332+
if (!dom) {
56333+
return;
56334+
}
5627056335
var labelLocale = ecModel.getLocaleModel().get('aria');
5627156336
var labelModel = ariaModel.getModel('label');
5627256337
labelModel.option = defaults(labelModel.option, labelLocale);
5627356338
if (!labelModel.get('enabled')) {
5627456339
return;
5627556340
}
56276-
var dom = api.getZr().dom;
5627756341
if (labelModel.get('description')) {
5627856342
dom.setAttribute('aria-label', labelModel.get('description'));
5627956343
return;

dist/echarts.common.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.common.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)