未验证 提交 000ee7d2 编写于 作者: Y Yi Shen 提交者: GitHub

Merge pull request #15951 from apache/release-dev

Release 5.2.2
......@@ -16453,7 +16453,6 @@
}
function getTextRect(text, font, align, verticalAlign, padding, rich, truncate, lineHeight) {
deprecateLog('getTextRect is deprecated.');
var textEl = new ZRText({
style: {
text: text,
......@@ -16545,7 +16544,7 @@
var numericResult = numericToNumber(value);
return isNumberUserReadable(numericResult) ? addCommas(numericResult) : isStringSafe(value) ? stringToUserReadable(value) : '-';
return isNumberUserReadable(numericResult) ? addCommas(numericResult) : isStringSafe(value) ? stringToUserReadable(value) : typeof value === 'boolean' ? value + '' : '-';
}
var TPL_VAR_ALIAS = ['a', 'b', 'c', 'd', 'e', 'f', 'g'];
......@@ -29103,7 +29102,7 @@
var lifecycle = new Eventful();
var hasWindow = typeof window !== 'undefined';
var version$1 = '5.2.1';
var version$1 = '5.2.2';
var dependencies = {
zrender: '5.2.1'
};
......@@ -36104,12 +36103,6 @@
(min == null || !isFinite(min)) && (min = NaN);
(max == null || !isFinite(max)) && (max = NaN);
if (min > max) {
min = NaN;
max = NaN;
}
var isBlank = eqNaN(min) || eqNaN(max) || isOrdinal && !axisDataLen; // If data extent modified, need to recalculated to ensure cross zero.
if (this._needCrossZero) {
......@@ -40484,7 +40477,8 @@
hoverLayerThreshold: Infinity,
universalTransition: {
divideShape: 'clone'
}
},
triggerLineEvent: false
};
return LineSeriesModel;
}(SeriesModel);
......@@ -41322,7 +41316,20 @@
if (smooth > 0) {
var nextIdx = idx + dir;
var nextX = points[nextIdx * 2];
var nextY = points[nextIdx * 2 + 1];
var nextY = points[nextIdx * 2 + 1]; // Ignore duplicate point
while (nextX === x && nextY === y && k < segLen) {
k++;
nextIdx += dir;
idx += dir;
nextX = points[nextIdx * 2];
nextY = points[nextIdx * 2 + 1];
x = points[idx * 2];
y = points[idx * 2 + 1];
dx = x - prevX;
dy = y - prevY;
}
var tmpK = k + 1;
if (connectNulls) {
......@@ -41918,6 +41925,9 @@
} else if (coord > maxSize) {
if (prevInRangeColorStop) {
newColorStops.push(lerpStop(prevInRangeColorStop, stop_1, maxSize));
} else if (prevOutOfRangeColorStop) {
// If there are two stops and coord range is between these two stops
newColorStops.push(lerpStop(prevOutOfRangeColorStop, stop_1, 0), lerpStop(prevOutOfRangeColorStop, stop_1, maxSize));
} // All following stop will be out of range. So just ignore them.
......@@ -42005,7 +42015,7 @@
return colorStops[0].coord < 0 ? outerColors[1] ? outerColors[1] : colorStops[stopLen - 1].color : outerColors[0] ? outerColors[0] : colorStops[0].color;
}
var tinyExtent = 0; // Arbitrary value: 10px
var tinyExtent = 10; // Arbitrary value: 10px
var minCoord = colorStopsInRange[0].coord - tinyExtent;
var maxCoord = colorStopsInRange[inRangeStopLen - 1].coord + tinyExtent;
......@@ -42469,9 +42479,23 @@
this._points = points;
this._step = step;
this._valueOrigin = valueOrigin;
if (seriesModel.get('triggerLineEvent')) {
this.packEventData(seriesModel, polyline);
polygon && this.packEventData(seriesModel, polygon);
}
};
LineView.prototype.dispose = function () {};
LineView.prototype.packEventData = function (seriesModel, el) {
getECData(el).eventData = {
componentType: 'series',
componentSubType: 'line',
componentIndex: seriesModel.componentIndex,
seriesIndex: seriesModel.seriesIndex,
seriesName: seriesModel.name,
seriesType: 'line'
};
};
LineView.prototype.highlight = function (seriesModel, ecModel, api, payload) {
var data = seriesModel.getData();
......@@ -43719,6 +43743,19 @@
}
var el = elementCreator[coord.type](seriesModel, data, dataIndex, layout, isHorizontalOrRadial, animationModel, baseAxis.model, false, roundCap);
if (realtimeSortCfg) {
/**
* Force label animation because even if the element is
* ignored because it's clipped, it may not be clipped after
* changing order. Then, if not using forceLabelAnimation,
* the label animation was never started, in which case,
* the label will be the final value and doesn't have label
* animation.
*/
el.forceLabelAnimation = true;
}
updateStyle(el, data, dataIndex, itemModel, layout, seriesModel, isHorizontalOrRadial, coord.type === 'polar');
if (isInitSort) {
......@@ -43784,6 +43821,28 @@
el = elementCreator[coord.type](seriesModel, data, newIndex, layout, isHorizontalOrRadial, animationModel, baseAxis.model, !!el, roundCap);
} else {
saveOldStyle(el);
}
if (realtimeSortCfg) {
el.forceLabelAnimation = true;
}
if (isChangeOrder) {
var textEl = el.getTextContent();
if (textEl) {
var labelInnerStore = labelInner(textEl);
if (labelInnerStore.prevValue != null) {
/**
* Set preValue to be value so that no new label
* should be started, otherwise, it will take a full
* `animationDurationUpdate` time to finish the
* animation, which is not expected.
*/
labelInnerStore.prevValue = labelInnerStore.value;
}
}
} // Not change anything if only order changed.
// Especially not change label.
......@@ -61674,22 +61733,22 @@
seriesLabel += labelModel.get(['data', 'allData']);
}
var middleSeparator_1 = labelModel.get(['data', 'separator', 'middle']);
var endSeparator_1 = labelModel.get(['data', 'separator', 'end']);
var dataLabels = [];
for (var i = 0; i < data.count(); i++) {
if (i < maxDataCnt) {
var name_1 = data.getName(i);
var value = retrieveRawValue(data, i);
var value = data.getValues(i);
var dataLabel = labelModel.get(['data', name_1 ? 'withName' : 'withoutName']);
dataLabels.push(replace(dataLabel, {
name: name_1,
value: value
value: value.join(middleSeparator_1)
}));
}
}
var middleSeparator_1 = labelModel.get(['data', 'separator', 'middle']);
var endSeparator_1 = labelModel.get(['data', 'separator', 'end']);
seriesLabel += dataLabels.join(middleSeparator_1) + endSeparator_1;
seriesLabels_1.push(seriesLabel);
}
此差异已折叠。
此差异已折叠。
......@@ -15521,7 +15521,8 @@ function setLabelValueAnimation(label, labelStatesModels, value, getDefaultText)
function animateLabelValue(textEl, dataIndex, data, animatableModel, labelFetcher) {
var labelInnerStore = labelInner(textEl);
if (!labelInnerStore.valueAnimation) {
if (!labelInnerStore.valueAnimation || labelInnerStore.prevValue === labelInnerStore.value) {
// Value not changed, no new label animation
return;
}
......@@ -15542,7 +15543,11 @@ function animateLabelValue(textEl, dataIndex, data, animatableModel, labelFetche
setLabelText(textEl, labelText);
}
(labelInnerStore.prevValue == null ? initProps : updateProps)(textEl, {}, animatableModel, dataIndex, null, during);
textEl.percent = 0;
(labelInnerStore.prevValue == null ? initProps : updateProps)(textEl, {
// percent is used to prevent animation from being aborted #15916
percent: 1
}, animatableModel, dataIndex, null, during);
}
var PATH_COLOR = ['textStyle', 'color']; // TODO Performance improvement?
......@@ -16590,7 +16595,6 @@ function millisecondsSetterName(isUTC) {
}
function getTextRect(text, font, align, verticalAlign, padding, rich, truncate, lineHeight) {
deprecateLog('getTextRect is deprecated.');
var textEl = new ZRText({
style: {
text: text,
......@@ -16682,7 +16686,7 @@ function makeValueReadable(value, valueType, useUTC) {
var numericResult = numericToNumber(value);
return isNumberUserReadable(numericResult) ? addCommas(numericResult) : isStringSafe(value) ? stringToUserReadable(value) : '-';
return isNumberUserReadable(numericResult) ? addCommas(numericResult) : isStringSafe(value) ? stringToUserReadable(value) : typeof value === 'boolean' ? value + '' : '-';
}
var TPL_VAR_ALIAS = ['a', 'b', 'c', 'd', 'e', 'f', 'g'];
......@@ -29427,7 +29431,7 @@ var geoSourceManager = {
var lifecycle = new Eventful();
var hasWindow = typeof window !== 'undefined';
var version$1 = '5.2.1';
var version$1 = '5.2.2';
var dependencies = {
zrender: '5.2.1'
};
......@@ -36463,12 +36467,6 @@ function () {
(min == null || !isFinite(min)) && (min = NaN);
(max == null || !isFinite(max)) && (max = NaN);
if (min > max) {
min = NaN;
max = NaN;
}
var isBlank = eqNaN(min) || eqNaN(max) || isOrdinal && !axisDataLen; // If data extent modified, need to recalculated to ensure cross zero.
if (this._needCrossZero) {
......@@ -38928,7 +38926,7 @@ function () {
var ignoreLabelLineUpdate = chartView.ignoreLabelLineUpdate;
var animationEnabled = seriesModel.isAnimationEnabled();
chartView.group.traverse(function (child) {
if (child.ignore) {
if (child.ignore && !child.forceLabelAnimation) {
return true; // Stop traverse descendants.
}
......@@ -38975,7 +38973,8 @@ function () {
var textEl = el.getTextContent();
var guideLine = el.getTextGuideLine(); // Animate
if (textEl && !textEl.ignore && !textEl.invisible && !el.disableLabelAnimation && !isElementRemoved(el)) {
if (textEl // `forceLabelAnimation` has the highest priority
&& (el.forceLabelAnimation || !textEl.ignore && !textEl.invisible && !el.disableLabelAnimation && !isElementRemoved(el))) {
var layoutStore = labelLayoutInnerStore(textEl);
var oldLayout = layoutStore.oldLayout;
var ecData = getECData(el);
......@@ -41604,7 +41603,8 @@ function (_super) {
hoverLayerThreshold: Infinity,
universalTransition: {
divideShape: 'clone'
}
},
triggerLineEvent: false
};
return LineSeriesModel;
}(SeriesModel);
......@@ -42442,7 +42442,20 @@ function drawSegment(ctx, points, start, segLen, allLen, dir, smooth, smoothMono
if (smooth > 0) {
var nextIdx = idx + dir;
var nextX = points[nextIdx * 2];
var nextY = points[nextIdx * 2 + 1];
var nextY = points[nextIdx * 2 + 1]; // Ignore duplicate point
while (nextX === x && nextY === y && k < segLen) {
k++;
nextIdx += dir;
idx += dir;
nextX = points[nextIdx * 2];
nextY = points[nextIdx * 2 + 1];
x = points[idx * 2];
y = points[idx * 2 + 1];
dx = x - prevX;
dy = y - prevY;
}
var tmpK = k + 1;
if (connectNulls) {
......@@ -43038,6 +43051,9 @@ function clipColorStops(colorStops, maxSize) {
} else if (coord > maxSize) {
if (prevInRangeColorStop) {
newColorStops.push(lerpStop(prevInRangeColorStop, stop_1, maxSize));
} else if (prevOutOfRangeColorStop) {
// If there are two stops and coord range is between these two stops
newColorStops.push(lerpStop(prevOutOfRangeColorStop, stop_1, 0), lerpStop(prevOutOfRangeColorStop, stop_1, maxSize));
} // All following stop will be out of range. So just ignore them.
......@@ -43125,7 +43141,7 @@ function getVisualGradient(data, coordSys, api) {
return colorStops[0].coord < 0 ? outerColors[1] ? outerColors[1] : colorStops[stopLen - 1].color : outerColors[0] ? outerColors[0] : colorStops[0].color;
}
var tinyExtent = 0; // Arbitrary value: 10px
var tinyExtent = 10; // Arbitrary value: 10px
var minCoord = colorStopsInRange[0].coord - tinyExtent;
var maxCoord = colorStopsInRange[inRangeStopLen - 1].coord + tinyExtent;
......@@ -43589,9 +43605,23 @@ function (_super) {
this._points = points;
this._step = step;
this._valueOrigin = valueOrigin;
if (seriesModel.get('triggerLineEvent')) {
this.packEventData(seriesModel, polyline);
polygon && this.packEventData(seriesModel, polygon);
}
};
LineView.prototype.dispose = function () {};
LineView.prototype.packEventData = function (seriesModel, el) {
getECData(el).eventData = {
componentType: 'series',
componentSubType: 'line',
componentIndex: seriesModel.componentIndex,
seriesIndex: seriesModel.seriesIndex,
seriesName: seriesModel.name,
seriesType: 'line'
};
};
LineView.prototype.highlight = function (seriesModel, ecModel, api, payload) {
var data = seriesModel.getData();
......@@ -44839,6 +44869,19 @@ function (_super) {
}
var el = elementCreator[coord.type](seriesModel, data, dataIndex, layout, isHorizontalOrRadial, animationModel, baseAxis.model, false, roundCap);
if (realtimeSortCfg) {
/**
* Force label animation because even if the element is
* ignored because it's clipped, it may not be clipped after
* changing order. Then, if not using forceLabelAnimation,
* the label animation was never started, in which case,
* the label will be the final value and doesn't have label
* animation.
*/
el.forceLabelAnimation = true;
}
updateStyle(el, data, dataIndex, itemModel, layout, seriesModel, isHorizontalOrRadial, coord.type === 'polar');
if (isInitSort) {
......@@ -44904,6 +44947,28 @@ function (_super) {
el = elementCreator[coord.type](seriesModel, data, newIndex, layout, isHorizontalOrRadial, animationModel, baseAxis.model, !!el, roundCap);
} else {
saveOldStyle(el);
}
if (realtimeSortCfg) {
el.forceLabelAnimation = true;
}
if (isChangeOrder) {
var textEl = el.getTextContent();
if (textEl) {
var labelInnerStore = labelInner(textEl);
if (labelInnerStore.prevValue != null) {
/**
* Set preValue to be value so that no new label
* should be started, otherwise, it will take a full
* `animationDurationUpdate` time to finish the
* animation, which is not expected.
*/
labelInnerStore.prevValue = labelInnerStore.value;
}
}
} // Not change anything if only order changed.
// Especially not change label.
......@@ -55687,7 +55752,7 @@ function packEventData(el, seriesModel, itemNode) {
componentType: 'series',
componentSubType: 'treemap',
componentIndex: seriesModel.componentIndex,
seriesIndex: seriesModel.componentIndex,
seriesIndex: seriesModel.seriesIndex,
seriesName: seriesModel.name,
seriesType: 'treemap',
selfType: 'breadcrumb',
......@@ -76175,7 +76240,6 @@ function (_super) {
// start end
position: 'start',
margin: '50%',
nameMap: 'en',
color: '#000'
},
// month text style
......@@ -76186,8 +76250,6 @@ function (_super) {
margin: 5,
// center or left
align: 'center',
// cn en []
nameMap: 'en',
formatter: null,
color: '#000'
},
......@@ -76238,15 +76300,6 @@ function mergeAndNormalizeLayoutParams(target, raw) {
});
}
var MONTH_TEXT = {
EN: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
CN: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
};
var WEEK_TEXT = {
EN: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
CN: ['日', '一', '二', '三', '四', '五', '六']
};
var CalendarView =
/** @class */
function (_super) {
......@@ -76265,7 +76318,9 @@ function (_super) {
var coordSys = calendarModel.coordinateSystem; // range info
var rangeData = coordSys.getRangeInfo();
var orient = coordSys.getOrient();
var orient = coordSys.getOrient(); // locale
var localeModel = ecModel.getLocaleModel();
this._renderDayRect(calendarModel, rangeData, group); // _renderLines must be called prior to following function
......@@ -76274,9 +76329,9 @@ function (_super) {
this._renderYearText(calendarModel, rangeData, orient, group);
this._renderMonthText(calendarModel, orient, group);
this._renderMonthText(calendarModel, localeModel, orient, group);
this._renderWeekText(calendarModel, rangeData, orient, group);
this._renderWeekText(calendarModel, localeModel, rangeData, orient, group);
}; // render day rect
......@@ -76522,7 +76577,7 @@ function (_super) {
}; // render month and year text
CalendarView.prototype._renderMonthText = function (calendarModel, orient, group) {
CalendarView.prototype._renderMonthText = function (calendarModel, localeModel, orient, group) {
var monthLabel = calendarModel.getModel('monthLabel');
if (!monthLabel.get('show')) {
......@@ -76535,8 +76590,15 @@ function (_super) {
var align = monthLabel.get('align');
var termPoints = [this._tlpoints, this._blpoints];
if (isString(nameMap)) {
nameMap = MONTH_TEXT[nameMap.toUpperCase()] || [];
if (!nameMap || isString(nameMap)) {
if (nameMap) {
// case-sensitive
localeModel = getLocaleModel(nameMap) || localeModel;
} // PENDING
// for ZH locale, original form is `一月` but current form is `1月`
nameMap = localeModel.get(['time', 'monthAbbr']) || [];
}
var idx = pos === 'start' ? 0 : 1;
......@@ -76599,7 +76661,7 @@ function (_super) {
}; // render weeks
CalendarView.prototype._renderWeekText = function (calendarModel, rangeData, orient, group) {
CalendarView.prototype._renderWeekText = function (calendarModel, localeModel, rangeData, orient, group) {
var dayLabel = calendarModel.getModel('dayLabel');
if (!dayLabel.get('show')) {
......@@ -76612,8 +76674,17 @@ function (_super) {
var margin = dayLabel.get('margin');
var firstDayOfWeek = coordSys.getFirstDayOfWeek();
if (isString(nameMap)) {
nameMap = WEEK_TEXT[nameMap.toUpperCase()] || [];
if (!nameMap || isString(nameMap)) {
if (nameMap) {
// case-sensitive
localeModel = getLocaleModel(nameMap) || localeModel;
} // Use the first letter of `dayOfWeekAbbr` if `dayOfWeekShort` doesn't exist in the locale file
var dayOfWeekShort = localeModel.get(['time', 'dayOfWeekShort']);
nameMap = dayOfWeekShort || map(localeModel.get(['time', 'dayOfWeekAbbr']), function (val) {
return val[0];
});
}
var start = coordSys.getNextNDay(rangeData.end.time, 7 - rangeData.lweek).time;
......@@ -91209,22 +91280,22 @@ function ariaVisual(ecModel, api) {
seriesLabel += labelModel.get(['data', 'allData']);
}
var middleSeparator_1 = labelModel.get(['data', 'separator', 'middle']);
var endSeparator_1 = labelModel.get(['data', 'separator', 'end']);
var dataLabels = [];
for (var i = 0; i < data.count(); i++) {
if (i < maxDataCnt) {
var name_1 = data.getName(i);
var value = retrieveRawValue(data, i);
var value = data.getValues(i);
var dataLabel = labelModel.get(['data', name_1 ? 'withName' : 'withoutName']);
dataLabels.push(replace(dataLabel, {
name: name_1,
value: value
value: value.join(middleSeparator_1)
}));
}
}
var middleSeparator_1 = labelModel.get(['data', 'separator', 'middle']);
var endSeparator_1 = labelModel.get(['data', 'separator', 'end']);
seriesLabel += dataLabels.join(middleSeparator_1) + endSeparator_1;
seriesLabels_1.push(seriesLabel);
}
此差异已折叠。
此差异已折叠。
......@@ -15527,7 +15527,8 @@
function animateLabelValue(textEl, dataIndex, data, animatableModel, labelFetcher) {
var labelInnerStore = labelInner(textEl);
if (!labelInnerStore.valueAnimation) {
if (!labelInnerStore.valueAnimation || labelInnerStore.prevValue === labelInnerStore.value) {
// Value not changed, no new label animation
return;
}
......@@ -15548,7 +15549,11 @@
setLabelText(textEl, labelText);
}
(labelInnerStore.prevValue == null ? initProps : updateProps)(textEl, {}, animatableModel, dataIndex, null, during);
textEl.percent = 0;
(labelInnerStore.prevValue == null ? initProps : updateProps)(textEl, {
// percent is used to prevent animation from being aborted #15916
percent: 1
}, animatableModel, dataIndex, null, during);
}
var PATH_COLOR = ['textStyle', 'color']; // TODO Performance improvement?
......@@ -16596,7 +16601,6 @@
}
function getTextRect(text, font, align, verticalAlign, padding, rich, truncate, lineHeight) {
deprecateLog('getTextRect is deprecated.');
var textEl = new ZRText({
style: {
text: text,
......@@ -16688,7 +16692,7 @@
var numericResult = numericToNumber(value);
return isNumberUserReadable(numericResult) ? addCommas(numericResult) : isStringSafe(value) ? stringToUserReadable(value) : '-';
return isNumberUserReadable(numericResult) ? addCommas(numericResult) : isStringSafe(value) ? stringToUserReadable(value) : typeof value === 'boolean' ? value + '' : '-';
}
var TPL_VAR_ALIAS = ['a', 'b', 'c', 'd', 'e', 'f', 'g'];
......@@ -18354,7 +18358,7 @@
if (seriesImportName) {
error("Series " + subType + " is used but not imported.\nimport { " + seriesImportName + " } from 'echarts/charts';\necharts.use([" + seriesImportName + "]);");
} else {
error("Unknown series " + subType);
error("Unkown series " + subType);
}
}
}
......@@ -24765,7 +24769,7 @@
var styleMapper = seriesModel.visualStyleMapper || defaultStyleMappers[stylePath];
if (!styleMapper) {
console.warn("Unknown style type '" + stylePath + "'.");
console.warn("Unkown style type '" + stylePath + "'.");
return defaultStyleMappers.itemStyle;
}
......@@ -24777,7 +24781,7 @@
var colorKey = seriesModel.visualDrawType || defaultColorKey[stylePath];
if (!colorKey) {
console.warn("Unknown style type '" + stylePath + "'.");
console.warn("Unkown style type '" + stylePath + "'.");
return 'fill';
}
......@@ -29433,7 +29437,7 @@
var lifecycle = new Eventful();
var hasWindow = typeof window !== 'undefined';
var version$1 = '5.2.1';
var version$1 = '5.2.2';
var dependencies = {
zrender: '5.2.1'
};
......@@ -32813,7 +32817,7 @@
if ("development" !== 'production') {
if (dimIdx == null) {
throw new Error('Unknown dimension ' + dim);
throw new Error('Unkown dimension ' + dim);
}
}
......@@ -36469,12 +36473,6 @@
(min == null || !isFinite(min)) && (min = NaN);
(max == null || !isFinite(max)) && (max = NaN);
if (min > max) {
min = NaN;
max = NaN;
}
var isBlank = eqNaN(min) || eqNaN(max) || isOrdinal && !axisDataLen; // If data extent modified, need to recalculated to ensure cross zero.
if (this._needCrossZero) {
......@@ -38934,7 +38932,7 @@
var ignoreLabelLineUpdate = chartView.ignoreLabelLineUpdate;
var animationEnabled = seriesModel.isAnimationEnabled();
chartView.group.traverse(function (child) {
if (child.ignore) {
if (child.ignore && !child.forceLabelAnimation) {
return true; // Stop traverse descendants.
}
......@@ -38981,7 +38979,8 @@
var textEl = el.getTextContent();
var guideLine = el.getTextGuideLine(); // Animate
if (textEl && !textEl.ignore && !textEl.invisible && !el.disableLabelAnimation && !isElementRemoved(el)) {
if (textEl // `forceLabelAnimation` has the highest priority
&& (el.forceLabelAnimation || !textEl.ignore && !textEl.invisible && !el.disableLabelAnimation && !isElementRemoved(el))) {
var layoutStore = labelLayoutInnerStore(textEl);
var oldLayout = layoutStore.oldLayout;
var ecData = getECData(el);
......@@ -41256,7 +41255,7 @@
layer = this.getLayer(zlevel + (incrementalLayerCount > 0 ? EL_AFTER_INCREMENTAL_INC : 0), this._needsManuallyCompositing);
}
if (!layer.__builtin__) {
logError('ZLevel ' + zlevel + ' has been used by unknown layer ' + layer.id);
logError('ZLevel ' + zlevel + ' has been used by unkown layer ' + layer.id);
}
if (layer !== prevLayer) {
layer.__used = true;
......@@ -41610,7 +41609,8 @@
hoverLayerThreshold: Infinity,
universalTransition: {
divideShape: 'clone'
}
},
triggerLineEvent: false
};
return LineSeriesModel;
}(SeriesModel);
......@@ -42448,7 +42448,20 @@
if (smooth > 0) {
var nextIdx = idx + dir;
var nextX = points[nextIdx * 2];
var nextY = points[nextIdx * 2 + 1];
var nextY = points[nextIdx * 2 + 1]; // Ignore duplicate point
while (nextX === x && nextY === y && k < segLen) {
k++;
nextIdx += dir;
idx += dir;
nextX = points[nextIdx * 2];
nextY = points[nextIdx * 2 + 1];
x = points[idx * 2];
y = points[idx * 2 + 1];
dx = x - prevX;
dy = y - prevY;
}
var tmpK = k + 1;
if (connectNulls) {
......@@ -43044,6 +43057,9 @@
} else if (coord > maxSize) {
if (prevInRangeColorStop) {
newColorStops.push(lerpStop(prevInRangeColorStop, stop_1, maxSize));
} else if (prevOutOfRangeColorStop) {
// If there are two stops and coord range is between these two stops
newColorStops.push(lerpStop(prevOutOfRangeColorStop, stop_1, 0), lerpStop(prevOutOfRangeColorStop, stop_1, maxSize));
} // All following stop will be out of range. So just ignore them.
......@@ -43131,7 +43147,7 @@
return colorStops[0].coord < 0 ? outerColors[1] ? outerColors[1] : colorStops[stopLen - 1].color : outerColors[0] ? outerColors[0] : colorStops[0].color;
}
var tinyExtent = 0; // Arbitrary value: 10px
var tinyExtent = 10; // Arbitrary value: 10px
var minCoord = colorStopsInRange[0].coord - tinyExtent;
var maxCoord = colorStopsInRange[inRangeStopLen - 1].coord + tinyExtent;
......@@ -43595,9 +43611,23 @@
this._points = points;
this._step = step;
this._valueOrigin = valueOrigin;
if (seriesModel.get('triggerLineEvent')) {
this.packEventData(seriesModel, polyline);
polygon && this.packEventData(seriesModel, polygon);
}
};
LineView.prototype.dispose = function () {};
LineView.prototype.packEventData = function (seriesModel, el) {
getECData(el).eventData = {
componentType: 'series',
componentSubType: 'line',
componentIndex: seriesModel.componentIndex,
seriesIndex: seriesModel.seriesIndex,
seriesName: seriesModel.name,
seriesType: 'line'
};
};
LineView.prototype.highlight = function (seriesModel, ecModel, api, payload) {
var data = seriesModel.getData();
......@@ -44845,6 +44875,19 @@
}
var el = elementCreator[coord.type](seriesModel, data, dataIndex, layout, isHorizontalOrRadial, animationModel, baseAxis.model, false, roundCap);
if (realtimeSortCfg) {
/**
* Force label animation because even if the element is
* ignored because it's clipped, it may not be clipped after
* changing order. Then, if not using forceLabelAnimation,
* the label animation was never started, in which case,
* the label will be the final value and doesn't have label
* animation.
*/
el.forceLabelAnimation = true;
}
updateStyle(el, data, dataIndex, itemModel, layout, seriesModel, isHorizontalOrRadial, coord.type === 'polar');
if (isInitSort) {
......@@ -44910,6 +44953,28 @@
el = elementCreator[coord.type](seriesModel, data, newIndex, layout, isHorizontalOrRadial, animationModel, baseAxis.model, !!el, roundCap);
} else {
saveOldStyle(el);
}
if (realtimeSortCfg) {
el.forceLabelAnimation = true;
}
if (isChangeOrder) {
var textEl = el.getTextContent();
if (textEl) {
var labelInnerStore = labelInner(textEl);
if (labelInnerStore.prevValue != null) {
/**
* Set preValue to be value so that no new label
* should be started, otherwise, it will take a full
* `animationDurationUpdate` time to finish the
* animation, which is not expected.
*/
labelInnerStore.prevValue = labelInnerStore.value;
}
}
} // Not change anything if only order changed.
// Especially not change label.
......@@ -55693,7 +55758,7 @@
componentType: 'series',
componentSubType: 'treemap',
componentIndex: seriesModel.componentIndex,
seriesIndex: seriesModel.componentIndex,
seriesIndex: seriesModel.seriesIndex,
seriesName: seriesModel.name,
seriesType: 'treemap',
selfType: 'breadcrumb',
......@@ -68031,7 +68096,7 @@
var CoordSys = CoordinateSystemManager.get(option.coordinateSystem);
if (!CoordSys) {
throw new Error('Unknown coordinate system ' + option.coordinateSystem);
throw new Error('Unkown coordinate system ' + option.coordinateSystem);
}
}
......@@ -76181,7 +76246,6 @@
// start end
position: 'start',
margin: '50%',
nameMap: 'en',
color: '#000'
},
// month text style
......@@ -76192,8 +76256,6 @@
margin: 5,
// center or left
align: 'center',
// cn en []
nameMap: 'en',
formatter: null,
color: '#000'
},
......@@ -76244,15 +76306,6 @@
});
}
var MONTH_TEXT = {
EN: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
CN: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
};
var WEEK_TEXT = {
EN: ['S', 'M', 'T', 'W', 'T', 'F', 'S'],
CN: ['日', '一', '二', '三', '四', '五', '六']
};
var CalendarView =
/** @class */
function (_super) {
......@@ -76271,7 +76324,9 @@
var coordSys = calendarModel.coordinateSystem; // range info
var rangeData = coordSys.getRangeInfo();
var orient = coordSys.getOrient();
var orient = coordSys.getOrient(); // locale
var localeModel = ecModel.getLocaleModel();
this._renderDayRect(calendarModel, rangeData, group); // _renderLines must be called prior to following function
......@@ -76280,9 +76335,9 @@
this._renderYearText(calendarModel, rangeData, orient, group);
this._renderMonthText(calendarModel, orient, group);
this._renderMonthText(calendarModel, localeModel, orient, group);
this._renderWeekText(calendarModel, rangeData, orient, group);
this._renderWeekText(calendarModel, localeModel, rangeData, orient, group);
}; // render day rect
......@@ -76528,7 +76583,7 @@
}; // render month and year text
CalendarView.prototype._renderMonthText = function (calendarModel, orient, group) {
CalendarView.prototype._renderMonthText = function (calendarModel, localeModel, orient, group) {
var monthLabel = calendarModel.getModel('monthLabel');
if (!monthLabel.get('show')) {
......@@ -76541,8 +76596,15 @@
var align = monthLabel.get('align');
var termPoints = [this._tlpoints, this._blpoints];
if (isString(nameMap)) {
nameMap = MONTH_TEXT[nameMap.toUpperCase()] || [];
if (!nameMap || isString(nameMap)) {
if (nameMap) {
// case-sensitive
localeModel = getLocaleModel(nameMap) || localeModel;
} // PENDING
// for ZH locale, original form is `一月` but current form is `1月`
nameMap = localeModel.get(['time', 'monthAbbr']) || [];
}
var idx = pos === 'start' ? 0 : 1;
......@@ -76605,7 +76667,7 @@
}; // render weeks
CalendarView.prototype._renderWeekText = function (calendarModel, rangeData, orient, group) {
CalendarView.prototype._renderWeekText = function (calendarModel, localeModel, rangeData, orient, group) {
var dayLabel = calendarModel.getModel('dayLabel');
if (!dayLabel.get('show')) {
......@@ -76618,8 +76680,17 @@
var margin = dayLabel.get('margin');
var firstDayOfWeek = coordSys.getFirstDayOfWeek();
if (isString(nameMap)) {
nameMap = WEEK_TEXT[nameMap.toUpperCase()] || [];
if (!nameMap || isString(nameMap)) {
if (nameMap) {
// case-sensitive
localeModel = getLocaleModel(nameMap) || localeModel;
} // Use the first letter of `dayOfWeekAbbr` if `dayOfWeekShort` doesn't exist in the locale file
var dayOfWeekShort = localeModel.get(['time', 'dayOfWeekShort']);
nameMap = dayOfWeekShort || map(localeModel.get(['time', 'dayOfWeekAbbr']), function (val) {
return val[0];
});
}
var start = coordSys.getNextNDay(rangeData.end.time, 7 - rangeData.lweek).time;
......@@ -91215,22 +91286,22 @@
seriesLabel += labelModel.get(['data', 'allData']);
}
var middleSeparator_1 = labelModel.get(['data', 'separator', 'middle']);
var endSeparator_1 = labelModel.get(['data', 'separator', 'end']);
var dataLabels = [];
for (var i = 0; i < data.count(); i++) {
if (i < maxDataCnt) {
var name_1 = data.getName(i);
var value = retrieveRawValue(data, i);
var value = data.getValues(i);
var dataLabel = labelModel.get(['data', name_1 ? 'withName' : 'withoutName']);
dataLabels.push(replace(dataLabel, {
name: name_1,
value: value
value: value.join(middleSeparator_1)
}));
}
}
var middleSeparator_1 = labelModel.get(['data', 'separator', 'middle']);
var endSeparator_1 = labelModel.get(['data', 'separator', 'end']);
seriesLabel += dataLabels.join(middleSeparator_1) + endSeparator_1;
seriesLabels_1.push(seriesLabel);
}
此差异已折叠。
此差异已折叠。
......@@ -16246,7 +16246,6 @@
}
function getTextRect(text, font, align, verticalAlign, padding, rich, truncate, lineHeight) {
deprecateLog('getTextRect is deprecated.');
var textEl = new ZRText({
style: {
text: text,
......@@ -28215,7 +28214,7 @@
var lifecycle = new Eventful();
var hasWindow = typeof window !== 'undefined';
var version$1 = '5.2.1';
var version$1 = '5.2.2';
var dependencies = {
zrender: '5.2.1'
};
......@@ -35216,12 +35215,6 @@
(min == null || !isFinite(min)) && (min = NaN);
(max == null || !isFinite(max)) && (max = NaN);
if (min > max) {
min = NaN;
max = NaN;
}
var isBlank = eqNaN(min) || eqNaN(max) || isOrdinal && !axisDataLen; // If data extent modified, need to recalculated to ensure cross zero.
if (this._needCrossZero) {
......@@ -38177,7 +38170,8 @@
hoverLayerThreshold: Infinity,
universalTransition: {
divideShape: 'clone'
}
},
triggerLineEvent: false
};
return LineSeriesModel;
}(SeriesModel);
......@@ -39015,7 +39009,20 @@
if (smooth > 0) {
var nextIdx = idx + dir;
var nextX = points[nextIdx * 2];
var nextY = points[nextIdx * 2 + 1];
var nextY = points[nextIdx * 2 + 1]; // Ignore duplicate point
while (nextX === x && nextY === y && k < segLen) {
k++;
nextIdx += dir;
idx += dir;
nextX = points[nextIdx * 2];
nextY = points[nextIdx * 2 + 1];
x = points[idx * 2];
y = points[idx * 2 + 1];
dx = x - prevX;
dy = y - prevY;
}
var tmpK = k + 1;
if (connectNulls) {
......@@ -39611,6 +39618,9 @@
} else if (coord > maxSize) {
if (prevInRangeColorStop) {
newColorStops.push(lerpStop(prevInRangeColorStop, stop_1, maxSize));
} else if (prevOutOfRangeColorStop) {
// If there are two stops and coord range is between these two stops
newColorStops.push(lerpStop(prevOutOfRangeColorStop, stop_1, 0), lerpStop(prevOutOfRangeColorStop, stop_1, maxSize));
} // All following stop will be out of range. So just ignore them.
......@@ -39698,7 +39708,7 @@
return colorStops[0].coord < 0 ? outerColors[1] ? outerColors[1] : colorStops[stopLen - 1].color : outerColors[0] ? outerColors[0] : colorStops[0].color;
}
var tinyExtent = 0; // Arbitrary value: 10px
var tinyExtent = 10; // Arbitrary value: 10px
var minCoord = colorStopsInRange[0].coord - tinyExtent;
var maxCoord = colorStopsInRange[inRangeStopLen - 1].coord + tinyExtent;
......@@ -40162,9 +40172,23 @@
this._points = points;
this._step = step;
this._valueOrigin = valueOrigin;
if (seriesModel.get('triggerLineEvent')) {
this.packEventData(seriesModel, polyline);
polygon && this.packEventData(seriesModel, polygon);
}
};
LineView.prototype.dispose = function () {};
LineView.prototype.packEventData = function (seriesModel, el) {
getECData(el).eventData = {
componentType: 'series',
componentSubType: 'line',
componentIndex: seriesModel.componentIndex,
seriesIndex: seriesModel.seriesIndex,
seriesName: seriesModel.name,
seriesType: 'line'
};
};
LineView.prototype.highlight = function (seriesModel, ecModel, api, payload) {
var data = seriesModel.getData();
......@@ -41412,6 +41436,19 @@
}
var el = elementCreator[coord.type](seriesModel, data, dataIndex, layout, isHorizontalOrRadial, animationModel, baseAxis.model, false, roundCap);
if (realtimeSortCfg) {
/**
* Force label animation because even if the element is
* ignored because it's clipped, it may not be clipped after
* changing order. Then, if not using forceLabelAnimation,
* the label animation was never started, in which case,
* the label will be the final value and doesn't have label
* animation.
*/
el.forceLabelAnimation = true;
}
updateStyle(el, data, dataIndex, itemModel, layout, seriesModel, isHorizontalOrRadial, coord.type === 'polar');
if (isInitSort) {
......@@ -41477,6 +41514,28 @@
el = elementCreator[coord.type](seriesModel, data, newIndex, layout, isHorizontalOrRadial, animationModel, baseAxis.model, !!el, roundCap);
} else {
saveOldStyle(el);
}
if (realtimeSortCfg) {
el.forceLabelAnimation = true;
}
if (isChangeOrder) {
var textEl = el.getTextContent();
if (textEl) {
var labelInnerStore = labelInner(textEl);
if (labelInnerStore.prevValue != null) {
/**
* Set preValue to be value so that no new label
* should be started, otherwise, it will take a full
* `animationDurationUpdate` time to finish the
* animation, which is not expected.
*/
labelInnerStore.prevValue = labelInnerStore.value;
}
}
} // Not change anything if only order changed.
// Especially not change label.
......@@ -45871,22 +45930,22 @@
seriesLabel += labelModel.get(['data', 'allData']);
}
var middleSeparator_1 = labelModel.get(['data', 'separator', 'middle']);
var endSeparator_1 = labelModel.get(['data', 'separator', 'end']);
var dataLabels = [];
for (var i = 0; i < data.count(); i++) {
if (i < maxDataCnt) {
var name_1 = data.getName(i);
var value = retrieveRawValue(data, i);
var value = data.getValues(i);
var dataLabel = labelModel.get(['data', name_1 ? 'withName' : 'withoutName']);
dataLabels.push(replace(dataLabel, {
name: name_1,
value: value
value: value.join(middleSeparator_1)
}));
}
}
var middleSeparator_1 = labelModel.get(['data', 'separator', 'middle']);
var endSeparator_1 = labelModel.get(['data', 'separator', 'end']);
seriesLabel += dataLabels.join(middleSeparator_1) + endSeparator_1;
seriesLabels_1.push(seriesLabel);
}
此差异已折叠。
此差异已折叠。
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* AUTO-GENERATED FILE. DO NOT MODIFY.
*/
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['exports'], factory);
} else if (
typeof exports === 'object' &&
typeof exports.nodeName !== 'string'
) {
// CommonJS
factory(exports);
} else {
// Browser globals
factory({});
}
})(this, function(exports) {
/**
* Language: Polish
*/
var localeObj = {
time: {
month: [
'Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec',
'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień'
],
monthAbbr: [
'Sty', 'Lut', 'Mar', 'Kwi', 'Maj', 'Cze',
'Lip', 'Sie', 'Wrz', 'Paź', 'Lis', 'Gru'
],
dayOfWeek: [
'Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'
],
dayOfWeekAbbr: [
'Nie', 'Pon', 'Wto', 'Śro', 'Czw', 'Pią', 'Sob'
]
},
legend: {
selector: {
all: 'Wszystko',
inverse: 'Odwróć'
}
},
toolbox: {
brush: {
title: {
rect: 'Zaznaczenie prostokątne',
polygon: 'Zaznaczanie lasso',
lineX: 'Zaznaczenie poziome',
lineY: 'Zaznaczenie pionowe',
keep: 'Zachowaj zaznaczenie',
clear: 'Wyczyść zaznaczenie'
}
},
dataView: {
title: 'Widok danych',
lang: ['Widok danych', 'Zamknij', 'Odśwież']
},
dataZoom: {
title: {
zoom: 'Przybliżenie',
back: 'Resetuj przybliżenie'
}
},
magicType: {
title: {
line: 'Przełącz na wykres liniowy',
bar: 'Przełącz na wykres słupkowy',
stack: 'Przełącz na wykres słupkowy skumulowany',
tiled: 'Przełącz na kafelki'
}
},
restore: {
title: 'Przywróć'
},
saveAsImage: {
title: 'Zapisz jako obrazek',
lang: ['Kliknij prawym klawiszem myszy aby zapisać']
}
},
series: {
typeNames: {
pie: 'Wykres kołowy',
bar: 'Wykres słupkowy',
line: 'Wykres liniowy',
scatter: 'Wykres punktowy',
effectScatter: 'Wykres punktowy z efektem falowania',
radar: 'Wykres radarowy',
tree: 'Drzewo',
treemap: 'Mapa drzewa',
boxplot: 'Wykres pudełkowy',
candlestick: 'Wykres świecowy',
k: 'Wykres linii K',
heatmap: 'Mapa ciepła',
map: 'Mapa',
parallel: 'Wykres współrzędnych równoległych',
lines: 'Diagram linii',
graph: 'Graf relacji',
sankey: 'Wykres Sankeya',
funnel: 'Wykres lejkowy',
gauge: 'Wykres zegarowy',
pictorialBar: 'Wykres słupkowy obrazkowy',
themeRiver: 'Wykres rzeki tematycznej',
sunburst: 'Wykres hierarchiczny słonecznikowy'
}
},
aria: {
general: {
withTitle: 'To jest wykres dotyczący "{title}"',
withoutTitle: 'To jest wykres'
},
series: {
single: {
prefix: '',
withName: ' typu {seriesType} nazwana {seriesName}.',
withoutName: ' typu {seriesType}.'
},
multiple: {
prefix: '. Składający się z {seriesCount} serii danych.',
withName: ' Seria danych {seriesId} jest serią typu {seriesType} przedstawiającą {seriesName}.',
withoutName: ' Seria danych {seriesId} jest serią typu {seriesType}.',
separator: {
middle: '',
end: ''
}
}
},
data: {
allData: 'Dane są następujące: ',
partialData: 'Pierwszych {displayCnt} elementów to: ',
withName: 'dane dla {name} to {value}',
withoutName: '{value}',
separator: {
middle: ', ',
end: '. '
}
}
}
};
for (var key in localeObj) {
if (localeObj.hasOwnProperty(key)) {
exports[key] = localeObj[key];
}
}
});
\ No newline at end of file
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* AUTO-GENERATED FILE. DO NOT MODIFY.
*/
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['exports', 'echarts'], factory);
} else if (
typeof exports === 'object' &&
typeof exports.nodeName !== 'string'
) {
// CommonJS
factory(exports, require('echarts/lib/echarts'));
} else {
// Browser globals
factory({}, root.echarts);
}
})(this, function(exports, echarts) {
/**
* Language: Polish
*/
var localeObj = {
time: {
month: [
'Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec',
'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień'
],
monthAbbr: [
'Sty', 'Lut', 'Mar', 'Kwi', 'Maj', 'Cze',
'Lip', 'Sie', 'Wrz', 'Paź', 'Lis', 'Gru'
],
dayOfWeek: [
'Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'
],
dayOfWeekAbbr: [
'Nie', 'Pon', 'Wto', 'Śro', 'Czw', 'Pią', 'Sob'
]
},
legend: {
selector: {
all: 'Wszystko',
inverse: 'Odwróć'
}
},
toolbox: {
brush: {
title: {
rect: 'Zaznaczenie prostokątne',
polygon: 'Zaznaczanie lasso',
lineX: 'Zaznaczenie poziome',
lineY: 'Zaznaczenie pionowe',
keep: 'Zachowaj zaznaczenie',
clear: 'Wyczyść zaznaczenie'
}
},
dataView: {
title: 'Widok danych',
lang: ['Widok danych', 'Zamknij', 'Odśwież']
},
dataZoom: {
title: {
zoom: 'Przybliżenie',
back: 'Resetuj przybliżenie'
}
},
magicType: {
title: {
line: 'Przełącz na wykres liniowy',
bar: 'Przełącz na wykres słupkowy',
stack: 'Przełącz na wykres słupkowy skumulowany',
tiled: 'Przełącz na kafelki'
}
},
restore: {
title: 'Przywróć'
},
saveAsImage: {
title: 'Zapisz jako obrazek',
lang: ['Kliknij prawym klawiszem myszy aby zapisać']
}
},
series: {
typeNames: {
pie: 'Wykres kołowy',
bar: 'Wykres słupkowy',
line: 'Wykres liniowy',
scatter: 'Wykres punktowy',
effectScatter: 'Wykres punktowy z efektem falowania',
radar: 'Wykres radarowy',
tree: 'Drzewo',
treemap: 'Mapa drzewa',
boxplot: 'Wykres pudełkowy',
candlestick: 'Wykres świecowy',
k: 'Wykres linii K',
heatmap: 'Mapa ciepła',
map: 'Mapa',
parallel: 'Wykres współrzędnych równoległych',
lines: 'Diagram linii',
graph: 'Graf relacji',
sankey: 'Wykres Sankeya',
funnel: 'Wykres lejkowy',
gauge: 'Wykres zegarowy',
pictorialBar: 'Wykres słupkowy obrazkowy',
themeRiver: 'Wykres rzeki tematycznej',
sunburst: 'Wykres hierarchiczny słonecznikowy'
}
},
aria: {
general: {
withTitle: 'To jest wykres dotyczący "{title}"',
withoutTitle: 'To jest wykres'
},
series: {
single: {
prefix: '',
withName: ' typu {seriesType} nazwana {seriesName}.',
withoutName: ' typu {seriesType}.'
},
multiple: {
prefix: '. Składający się z {seriesCount} serii danych.',
withName: ' Seria danych {seriesId} jest serią typu {seriesType} przedstawiającą {seriesName}.',
withoutName: ' Seria danych {seriesId} jest serią typu {seriesType}.',
separator: {
middle: '',
end: ''
}
}
},
data: {
allData: 'Dane są następujące: ',
partialData: 'Pierwszych {displayCnt} elementów to: ',
withName: 'dane dla {name} to {value}',
withoutName: '{value}',
separator: {
middle: ', ',
end: '. '
}
}
}
};
echarts.registerLocale('PL', localeObj);
});
\ No newline at end of file
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* AUTO-GENERATED FILE. DO NOT MODIFY.
*/
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['exports'], factory);
} else if (
typeof exports === 'object' &&
typeof exports.nodeName !== 'string'
) {
// CommonJS
factory(exports);
} else {
// Browser globals
factory({});
}
})(this, function(exports) {
/**
* Language: Russian.
*/
var localeObj = {
time: {
month: [
'Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь',
'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'
],
monthAbbr: [
'Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн',
'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек'
],
dayOfWeek: [
'Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'
],
dayOfWeekAbbr: [
'вс', 'пн', 'вт', 'ср', 'чт', 'пт', 'сб'
]
},
legend: {
selector: {
all: 'Всё',
inverse: 'Обратить'
}
},
toolbox: {
brush: {
title: {
rect: 'Выделить область',
polygon: 'Инструмент «Лассо»',
lineX: 'Горизонтальное выделение',
lineY: 'Вертикальное выделение',
keep: 'Оставить выбранное',
clear: 'Очистить выбранное'
}
},
dataView: {
title: 'Данные',
lang: ['Данные', 'Закрыть', 'Обновить']
},
dataZoom: {
title: {
zoom: 'Увеличить',
back: 'Сбросить увеличение'
}
},
magicType: {
title: {
line: 'Переключиться на линейный график',
bar: 'Переключиться на столбчатую диаграмму',
stack: 'Стопка',
tiled: 'Плитка'
}
},
restore: {
title: 'Восстановить'
},
saveAsImage: {
title: 'Сохранить картинку',
lang: ['Правый клик, чтобы сохранить картинку']
}
},
series: {
typeNames: {
pie: 'Круговая диаграмма',
bar: 'Столбчатая диаграмма',
line: 'Линейный график',
scatter: 'Точечная диаграмма',
effectScatter: 'Точечная диаграмма с волнами',
radar: 'Лепестковая диаграмма',
tree: 'Дерево',
treemap: 'Плоское дерево',
boxplot: 'Ящик с усами',
candlestick: 'Свечной график',
k: 'График К-линий',
heatmap: 'Тепловая карта',
map: 'Карта',
parallel: 'Диаграмма параллельных координат',
lines: 'Линейный граф',
graph: 'Граф отношений',
sankey: 'Диаграмма Санкей',
funnel: 'Воронкообразная диаграмма',
gauge: 'Шкала',
pictorialBar: 'Столбец-картинка',
themeRiver: 'Тематическая река',
sunburst: 'Солнечные лучи'
}
},
aria: {
general: {
withTitle: 'Это график, показывающий "{title}"',
withoutTitle: 'Это график'
},
series: {
single: {
prefix: '',
withName: ' с типом {seriesType} и именем {seriesName}.',
withoutName: ' с типом {seriesType}.'
},
multiple: {
prefix: '. Он состоит из {seriesCount} серий.',
withName:
' Серия {seriesId} имеет тип {seriesType} и показывает {seriesName}.',
withoutName: ' Серия {seriesId} имеет тип {seriesType}.',
separator: {
middle: '',
end: ''
}
}
},
data: {
allData: 'Данные таковы: ',
partialData: 'Первые {displayCnt} элементов: ',
withName: 'значение для {name} — {value}',
withoutName: '{value}',
separator: {
middle: ', ',
end: '. '
}
}
}
};
for (var key in localeObj) {
if (localeObj.hasOwnProperty(key)) {
exports[key] = localeObj[key];
}
}
});
\ No newline at end of file
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
/**
* AUTO-GENERATED FILE. DO NOT MODIFY.
*/
(function(root, factory) {
if (typeof define === 'function' && define.amd) {
// AMD. Register as an anonymous module.
define(['exports', 'echarts'], factory);
} else if (
typeof exports === 'object' &&
typeof exports.nodeName !== 'string'
) {
// CommonJS
factory(exports, require('echarts/lib/echarts'));
} else {
// Browser globals
factory({}, root.echarts);
}
})(this, function(exports, echarts) {
/**
* Language: Russian.
*/
var localeObj = {
time: {
month: [
'Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь',
'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'
],
monthAbbr: [
'Янв', 'Фев', 'Мар', 'Апр', 'Май', 'Июн',
'Июл', 'Авг', 'Сен', 'Окт', 'Ноя', 'Дек'
],
dayOfWeek: [
'Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'
],
dayOfWeekAbbr: [
'вс', 'пн', 'вт', 'ср', 'чт', 'пт', 'сб'
]
},
legend: {
selector: {
all: 'Всё',
inverse: 'Обратить'
}
},
toolbox: {
brush: {
title: {
rect: 'Выделить область',
polygon: 'Инструмент «Лассо»',
lineX: 'Горизонтальное выделение',
lineY: 'Вертикальное выделение',
keep: 'Оставить выбранное',
clear: 'Очистить выбранное'
}
},
dataView: {
title: 'Данные',
lang: ['Данные', 'Закрыть', 'Обновить']
},
dataZoom: {
title: {
zoom: 'Увеличить',
back: 'Сбросить увеличение'
}
},
magicType: {
title: {
line: 'Переключиться на линейный график',
bar: 'Переключиться на столбчатую диаграмму',
stack: 'Стопка',
tiled: 'Плитка'
}
},
restore: {
title: 'Восстановить'
},
saveAsImage: {
title: 'Сохранить картинку',
lang: ['Правый клик, чтобы сохранить картинку']
}
},
series: {
typeNames: {
pie: 'Круговая диаграмма',
bar: 'Столбчатая диаграмма',
line: 'Линейный график',
scatter: 'Точечная диаграмма',
effectScatter: 'Точечная диаграмма с волнами',
radar: 'Лепестковая диаграмма',
tree: 'Дерево',
treemap: 'Плоское дерево',
boxplot: 'Ящик с усами',
candlestick: 'Свечной график',
k: 'График К-линий',
heatmap: 'Тепловая карта',
map: 'Карта',
parallel: 'Диаграмма параллельных координат',
lines: 'Линейный граф',
graph: 'Граф отношений',
sankey: 'Диаграмма Санкей',
funnel: 'Воронкообразная диаграмма',
gauge: 'Шкала',
pictorialBar: 'Столбец-картинка',
themeRiver: 'Тематическая река',
sunburst: 'Солнечные лучи'
}
},
aria: {
general: {
withTitle: 'Это график, показывающий "{title}"',
withoutTitle: 'Это график'
},
series: {
single: {
prefix: '',
withName: ' с типом {seriesType} и именем {seriesName}.',
withoutName: ' с типом {seriesType}.'
},
multiple: {
prefix: '. Он состоит из {seriesCount} серий.',
withName:
' Серия {seriesId} имеет тип {seriesType} и показывает {seriesName}.',
withoutName: ' Серия {seriesId} имеет тип {seriesType}.',
separator: {
middle: '',
end: ''
}
}
},
data: {
allData: 'Данные таковы: ',
partialData: 'Первые {displayCnt} элементов: ',
withName: 'значение для {name} — {value}',
withoutName: '{value}',
separator: {
middle: ', ',
end: '. '
}
}
}
};
echarts.registerLocale('RU', localeObj);
});
\ No newline at end of file
{
"name": "echarts",
"version": "5.2.1",
"version": "5.2.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
{
"name": "echarts",
"version": "5.2.1",
"version": "5.2.2",
"description": "Apache ECharts is a powerful, interactive charting and data visualization library for browser",
"license": "Apache-2.0",
"keywords": [
......
......@@ -139,7 +139,7 @@ type ModelFinder = modelUtil.ModelFinder;
const hasWindow = typeof window !== 'undefined';
export const version = '5.2.1';
export const version = '5.2.2';
export const dependencies = {
zrender: '5.2.1'
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册