2024-02-29 14:06:57 +02:00
|
|
|
diff --git a/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js b/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
|
2024-03-12 14:32:27 +02:00
|
|
|
index d6c05f3..d09baed 100644
|
2024-02-29 14:06:57 +02:00
|
|
|
--- a/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
|
|
|
|
|
+++ b/node_modules/echarts/lib/component/dataZoom/DataZoomModel.js
|
2024-03-12 14:32:27 +02:00
|
|
|
@@ -362,7 +362,10 @@ var DataZoomModel = /** @class */function (_super) {
|
2024-02-29 14:06:57 +02:00
|
|
|
return axisProxy.getDataValueWindow();
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
- return this.getAxisProxy(axisDim, axisIndex).getDataValueWindow();
|
|
|
|
|
+ var axisProxy = this.getAxisProxy(axisDim, axisIndex);
|
|
|
|
|
+ if (axisProxy) {
|
|
|
|
|
+ return axisProxy.getDataValueWindow();
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
/**
|
2024-03-12 14:32:27 +02:00
|
|
|
@@ -381,10 +384,10 @@ var DataZoomModel = /** @class */function (_super) {
|
|
|
|
|
var axisInfo = this._targetAxisInfoMap.get(axisDim);
|
2024-02-29 14:06:57 +02:00
|
|
|
for (var j = 0; j < axisInfo.indexList.length; j++) {
|
|
|
|
|
var proxy = this.getAxisProxy(axisDim, axisInfo.indexList[j]);
|
|
|
|
|
- if (proxy.hostedBy(this)) {
|
|
|
|
|
+ if (proxy && proxy.hostedBy(this)) {
|
|
|
|
|
return proxy;
|
|
|
|
|
}
|
|
|
|
|
- if (!firstProxy) {
|
|
|
|
|
+ if (proxy && !firstProxy) {
|
|
|
|
|
firstProxy = proxy;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
diff --git a/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js b/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
|
2024-03-12 14:32:27 +02:00
|
|
|
index 06469b2..ccfbfa6 100644
|
2024-02-29 14:06:57 +02:00
|
|
|
--- a/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
|
|
|
|
|
+++ b/node_modules/echarts/lib/component/dataZoom/InsideZoomView.js
|
2024-03-12 14:32:27 +02:00
|
|
|
@@ -96,11 +96,14 @@ var getRangeHandlers = {
|
2024-02-29 14:06:57 +02:00
|
|
|
range[0] = (range[0] - percentPoint) * scale + percentPoint;
|
2024-03-12 14:32:27 +02:00
|
|
|
range[1] = (range[1] - percentPoint) * scale + percentPoint;
|
|
|
|
|
// Restrict range.
|
2024-02-29 14:06:57 +02:00
|
|
|
- var minMaxSpan = this.dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();
|
|
|
|
|
- sliderMove(0, range, [0, 100], 0, minMaxSpan.minSpan, minMaxSpan.maxSpan);
|
|
|
|
|
- this.range = range;
|
|
|
|
|
- if (lastRange[0] !== range[0] || lastRange[1] !== range[1]) {
|
|
|
|
|
- return range;
|
|
|
|
|
+ var proxy = this.dataZoomModel.findRepresentativeAxisProxy();
|
|
|
|
|
+ if (proxy) {
|
|
|
|
|
+ var minMaxSpan = proxy.getMinMaxSpan();
|
|
|
|
|
+ sliderMove(0, range, [0, 100], 0, minMaxSpan.minSpan, minMaxSpan.maxSpan);
|
|
|
|
|
+ this.range = range;
|
|
|
|
|
+ if (lastRange[0] !== range[0] || lastRange[1] !== range[1]) {
|
|
|
|
|
+ return range;
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
pan: makeMover(function (range, axisModel, coordSysInfo, coordSysMainType, controller, e) {
|
|
|
|
|
diff --git a/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js b/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js
|
2024-03-12 14:32:27 +02:00
|
|
|
index 98912e0..2e809af 100644
|
2024-02-29 14:06:57 +02:00
|
|
|
--- a/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js
|
|
|
|
|
+++ b/node_modules/echarts/lib/component/dataZoom/SliderZoomView.js
|
|
|
|
|
@@ -64,7 +64,7 @@ var DEFAULT_MOVE_HANDLE_SIZE = 7;
|
|
|
|
|
var HORIZONTAL = 'horizontal';
|
|
|
|
|
var VERTICAL = 'vertical';
|
|
|
|
|
var LABEL_GAP = 5;
|
|
|
|
|
-var SHOW_DATA_SHADOW_SERIES_TYPE = ['line', 'bar', 'candlestick', 'scatter'];
|
|
|
|
|
+var SHOW_DATA_SHADOW_SERIES_TYPE = ['line', 'bar', 'candlestick', 'scatter', 'custom'];
|
|
|
|
|
var REALTIME_ANIMATION_CONFIG = {
|
|
|
|
|
easing: 'cubicOut',
|
|
|
|
|
duration: 100,
|
2024-03-12 14:32:27 +02:00
|
|
|
@@ -359,30 +359,33 @@ var SliderZoomView = /** @class */function (_super) {
|
2024-02-29 14:06:57 +02:00
|
|
|
var result;
|
|
|
|
|
var ecModel = this.ecModel;
|
|
|
|
|
dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) {
|
|
|
|
|
- var seriesModels = dataZoomModel.getAxisProxy(axisDim, axisIndex).getTargetSeriesModels();
|
|
|
|
|
- each(seriesModels, function (seriesModel) {
|
|
|
|
|
- if (result) {
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
- if (showDataShadow !== true && indexOf(SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')) < 0) {
|
|
|
|
|
- return;
|
|
|
|
|
- }
|
|
|
|
|
- var thisAxis = ecModel.getComponent(getAxisMainType(axisDim), axisIndex).axis;
|
|
|
|
|
- var otherDim = getOtherDim(axisDim);
|
|
|
|
|
- var otherAxisInverse;
|
|
|
|
|
- var coordSys = seriesModel.coordinateSystem;
|
|
|
|
|
- if (otherDim != null && coordSys.getOtherAxis) {
|
|
|
|
|
- otherAxisInverse = coordSys.getOtherAxis(thisAxis).inverse;
|
|
|
|
|
- }
|
|
|
|
|
- otherDim = seriesModel.getData().mapDimension(otherDim);
|
|
|
|
|
- result = {
|
|
|
|
|
- thisAxis: thisAxis,
|
|
|
|
|
- series: seriesModel,
|
|
|
|
|
- thisDim: axisDim,
|
|
|
|
|
- otherDim: otherDim,
|
|
|
|
|
- otherAxisInverse: otherAxisInverse
|
|
|
|
|
- };
|
|
|
|
|
- }, this);
|
|
|
|
|
+ var axisProxy = dataZoomModel.getAxisProxy(axisDim, axisIndex);
|
|
|
|
|
+ if (axisProxy) {
|
|
|
|
|
+ var seriesModels = axisProxy.getTargetSeriesModels();
|
|
|
|
|
+ each(seriesModels, function (seriesModel) {
|
|
|
|
|
+ if (result) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (showDataShadow !== true && indexOf(SHOW_DATA_SHADOW_SERIES_TYPE, seriesModel.get('type')) < 0) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ var thisAxis = ecModel.getComponent(getAxisMainType(axisDim), axisIndex).axis;
|
|
|
|
|
+ var otherDim = getOtherDim(axisDim);
|
|
|
|
|
+ var otherAxisInverse;
|
|
|
|
|
+ var coordSys = seriesModel.coordinateSystem;
|
|
|
|
|
+ if (otherDim != null && coordSys.getOtherAxis) {
|
|
|
|
|
+ otherAxisInverse = coordSys.getOtherAxis(thisAxis).inverse;
|
|
|
|
|
+ }
|
|
|
|
|
+ otherDim = seriesModel.getData().mapDimension(otherDim);
|
|
|
|
|
+ result = {
|
|
|
|
|
+ thisAxis: thisAxis,
|
|
|
|
|
+ series: seriesModel,
|
|
|
|
|
+ thisDim: axisDim,
|
|
|
|
|
+ otherDim: otherDim,
|
|
|
|
|
+ otherAxisInverse: otherAxisInverse
|
|
|
|
|
+ };
|
|
|
|
|
+ }, this);
|
|
|
|
|
+ }
|
|
|
|
|
}, this);
|
|
|
|
|
return result;
|
|
|
|
|
};
|
2024-03-12 14:32:27 +02:00
|
|
|
@@ -530,12 +533,17 @@ var SliderZoomView = /** @class */function (_super) {
|
|
|
|
|
var dataZoomModel = this.dataZoomModel;
|
|
|
|
|
var handleEnds = this._handleEnds;
|
2024-02-29 14:06:57 +02:00
|
|
|
var viewExtend = this._getViewExtent();
|
|
|
|
|
- var minMaxSpan = dataZoomModel.findRepresentativeAxisProxy().getMinMaxSpan();
|
|
|
|
|
- var percentExtent = [0, 100];
|
|
|
|
|
- sliderMove(delta, handleEnds, viewExtend, dataZoomModel.get('zoomLock') ? 'all' : handleIndex, minMaxSpan.minSpan != null ? linearMap(minMaxSpan.minSpan, percentExtent, viewExtend, true) : null, minMaxSpan.maxSpan != null ? linearMap(minMaxSpan.maxSpan, percentExtent, viewExtend, true) : null);
|
|
|
|
|
- var lastRange = this._range;
|
|
|
|
|
- var range = this._range = asc([linearMap(handleEnds[0], viewExtend, percentExtent, true), linearMap(handleEnds[1], viewExtend, percentExtent, true)]);
|
|
|
|
|
- return !lastRange || lastRange[0] !== range[0] || lastRange[1] !== range[1];
|
|
|
|
|
+ var proxy = dataZoomModel.findRepresentativeAxisProxy();
|
|
|
|
|
+ if (proxy) {
|
|
|
|
|
+ var minMaxSpan = proxy.getMinMaxSpan();
|
|
|
|
|
+ var percentExtent = [0, 100];
|
|
|
|
|
+ sliderMove(delta, handleEnds, viewExtend, dataZoomModel.get('zoomLock') ? 'all' : handleIndex, minMaxSpan.minSpan != null ? linearMap(minMaxSpan.minSpan, percentExtent, viewExtend, true) : null, minMaxSpan.maxSpan != null ? linearMap(minMaxSpan.maxSpan, percentExtent, viewExtend, true) : null);
|
|
|
|
|
+ var lastRange = this._range;
|
|
|
|
|
+ var range = this._range = asc([linearMap(handleEnds[0], viewExtend, percentExtent, true), linearMap(handleEnds[1], viewExtend, percentExtent, true)]);
|
|
|
|
|
+ return !lastRange || lastRange[0] !== range[0] || lastRange[1] !== range[1];
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
};
|
|
|
|
|
SliderZoomView.prototype._updateView = function (nonRealtime) {
|
2024-03-12 14:32:27 +02:00
|
|
|
var displaybles = this._displayables;
|
2024-02-29 14:06:57 +02:00
|
|
|
diff --git a/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js b/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
|
2024-03-12 14:32:27 +02:00
|
|
|
index ce98fed..361b138 100644
|
2024-02-29 14:06:57 +02:00
|
|
|
--- a/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
|
|
|
|
|
+++ b/node_modules/echarts/lib/component/dataZoom/dataZoomProcessor.js
|
2024-03-12 14:32:27 +02:00
|
|
|
@@ -90,7 +90,10 @@ var dataZoomProcessor = {
|
2024-02-29 14:06:57 +02:00
|
|
|
// init stage and not after action dispatch handler, because
|
|
|
|
|
// reset should be called after seriesData.restoreData.
|
|
|
|
|
dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) {
|
|
|
|
|
- dataZoomModel.getAxisProxy(axisDim, axisIndex).reset(dataZoomModel);
|
|
|
|
|
+ var axisProxy = dataZoomModel.getAxisProxy(axisDim, axisIndex);
|
|
|
|
|
+ if (axisProxy) {
|
|
|
|
|
+ axisProxy.reset(dataZoomModel);
|
|
|
|
|
+ }
|
2024-03-12 14:32:27 +02:00
|
|
|
});
|
|
|
|
|
// Caution: data zoom filtering is order sensitive when using
|
2024-02-29 14:06:57 +02:00
|
|
|
// percent range and no min/max/scale set on axis.
|
2024-03-12 14:32:27 +02:00
|
|
|
@@ -107,7 +110,10 @@ var dataZoomProcessor = {
|
|
|
|
|
// So we should filter x-axis after reset x-axis immediately,
|
2024-02-29 14:06:57 +02:00
|
|
|
// and then reset y-axis and filter y-axis.
|
|
|
|
|
dataZoomModel.eachTargetAxis(function (axisDim, axisIndex) {
|
|
|
|
|
- dataZoomModel.getAxisProxy(axisDim, axisIndex).filterData(dataZoomModel, api);
|
|
|
|
|
+ var axisProxy = dataZoomModel.getAxisProxy(axisDim, axisIndex);
|
|
|
|
|
+ if (axisProxy) {
|
|
|
|
|
+ axisProxy.filterData(dataZoomModel, api);
|
|
|
|
|
+ }
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
ecModel.eachComponent('dataZoom', function (dataZoomModel) {
|
|
|
|
|
diff --git a/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js b/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js
|
2024-03-12 14:32:27 +02:00
|
|
|
index cf8d6bc..9b30ec1 100644
|
2024-02-29 14:06:57 +02:00
|
|
|
--- a/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js
|
|
|
|
|
+++ b/node_modules/echarts/lib/component/toolbox/feature/DataZoom.js
|
2024-03-12 14:32:27 +02:00
|
|
|
@@ -109,9 +109,12 @@ var DataZoomFeature = /** @class */function (_super) {
|
2024-02-29 14:06:57 +02:00
|
|
|
var axisModel = axis.model;
|
2024-03-12 14:32:27 +02:00
|
|
|
var dataZoomModel = findDataZoom(dimName, axisModel, ecModel);
|
|
|
|
|
// Restrict range.
|
2024-02-29 14:06:57 +02:00
|
|
|
- var minMaxSpan = dataZoomModel.findRepresentativeAxisProxy(axisModel).getMinMaxSpan();
|
2024-03-12 14:32:27 +02:00
|
|
|
- if (minMaxSpan.minValueSpan != null || minMaxSpan.maxValueSpan != null) {
|
|
|
|
|
- minMax = sliderMove(0, minMax.slice(), axis.scale.getExtent(), 0, minMaxSpan.minValueSpan, minMaxSpan.maxValueSpan);
|
2024-02-29 14:06:57 +02:00
|
|
|
+ var proxy = dataZoomModel.findRepresentativeAxisProxy(axisModel);
|
|
|
|
|
+ if (proxy) {
|
|
|
|
|
+ var minMaxSpan = proxy.getMinMaxSpan();
|
|
|
|
|
+ if (minMaxSpan.minValueSpan != null || minMaxSpan.maxValueSpan != null) {
|
|
|
|
|
+ minMax = sliderMove(0, minMax.slice(), axis.scale.getExtent(), 0, minMaxSpan.minValueSpan, minMaxSpan.maxValueSpan);
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
dataZoomModel && (snapshot[dataZoomModel.id] = {
|
2024-03-12 14:32:27 +02:00
|
|
|
dataZoomId: dataZoomModel.id,
|
2024-03-12 17:31:02 +02:00
|
|
|
diff --git a/node_modules/echarts/lib/component/tooltip/TooltipView.js b/node_modules/echarts/lib/component/tooltip/TooltipView.js
|
|
|
|
|
index b8a9b95..8e4cb2f 100644
|
|
|
|
|
--- a/node_modules/echarts/lib/component/tooltip/TooltipView.js
|
|
|
|
|
+++ b/node_modules/echarts/lib/component/tooltip/TooltipView.js
|
|
|
|
|
@@ -360,7 +360,7 @@ var TooltipView = /** @class */function (_super) {
|
|
|
|
|
each(itemCoordSys.dataByAxis, function (axisItem) {
|
|
|
|
|
var axisModel = ecModel.getComponent(axisItem.axisDim + 'Axis', axisItem.axisIndex);
|
|
|
|
|
var axisValue = axisItem.value;
|
|
|
|
|
- if (!axisModel || axisValue == null) {
|
|
|
|
|
+ if (!axisModel || !axisModel.axis || axisValue == null) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
var axisValueLabel = axisPointerViewHelper.getValueLabel(axisValue, axisModel.axis, ecModel, axisItem.seriesDataIndices, axisItem.valueLabelOpt);
|
2024-03-14 12:32:51 +02:00
|
|
|
diff --git a/node_modules/echarts/lib/coord/axisHelper.js b/node_modules/echarts/lib/coord/axisHelper.js
|
|
|
|
|
index a76c66b..be22cb0 100644
|
|
|
|
|
--- a/node_modules/echarts/lib/coord/axisHelper.js
|
|
|
|
|
+++ b/node_modules/echarts/lib/coord/axisHelper.js
|
|
|
|
|
@@ -187,7 +187,9 @@ export function createScaleByModel(model, axisType) {
|
|
|
|
|
});
|
|
|
|
|
default:
|
|
|
|
|
// case 'value'/'interval', 'log', or others.
|
|
|
|
|
- return new (Scale.getClass(axisType) || IntervalScale)();
|
|
|
|
|
+ return new (Scale.getClass(axisType) || IntervalScale)({
|
|
|
|
|
+ ticksGenerator: model.get('ticksGenerator')
|
|
|
|
|
+ });
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
diff --git a/node_modules/echarts/lib/coord/cartesian/Grid.js b/node_modules/echarts/lib/coord/cartesian/Grid.js
|
|
|
|
|
index 5b18f02..4960e67 100644
|
|
|
|
|
--- a/node_modules/echarts/lib/coord/cartesian/Grid.js
|
|
|
|
|
+++ b/node_modules/echarts/lib/coord/cartesian/Grid.js
|
|
|
|
|
@@ -91,11 +91,11 @@ var Grid = /** @class */function () {
|
|
|
|
|
var scale = axis.scale;
|
|
|
|
|
if (
|
|
|
|
|
// Only value and log axis without interval support alignTicks.
|
|
|
|
|
- isIntervalOrLogScale(scale) && model.get('alignTicks') && model.get('interval') == null) {
|
|
|
|
|
+ isIntervalOrLogScale(scale) && model.get('alignTicks') && model.get('interval') == null && model.get('ticksGenerator') == null) {
|
|
|
|
|
axisNeedsAlign.push(axis);
|
|
|
|
|
} else {
|
|
|
|
|
niceScaleExtent(scale, model);
|
|
|
|
|
- if (isIntervalOrLogScale(scale)) {
|
|
|
|
|
+ if (isIntervalOrLogScale(scale) && !scale.isBlank()) {
|
|
|
|
|
// Can only align to interval or log axis.
|
|
|
|
|
alignTo = axis;
|
|
|
|
|
}
|
|
|
|
|
@@ -105,10 +105,15 @@ var Grid = /** @class */function () {
|
|
|
|
|
// All axes has set alignTicks. Pick the first one.
|
|
|
|
|
// PENDING. Should we find the axis that both set interval, min, max and align to this one?
|
|
|
|
|
if (axisNeedsAlign.length) {
|
|
|
|
|
- if (!alignTo) {
|
|
|
|
|
- alignTo = axisNeedsAlign.pop();
|
|
|
|
|
- niceScaleExtent(alignTo.scale, alignTo.model);
|
|
|
|
|
+ while (!alignTo && axisNeedsAlign.length) {
|
|
|
|
|
+ var axis = axisNeedsAlign.pop();
|
|
|
|
|
+ niceScaleExtent(axis.scale, axis.model);
|
|
|
|
|
+ if (!axis.scale.isBlank()) {
|
|
|
|
|
+ alignTo = axis;
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
+ }
|
|
|
|
|
+ if (axisNeedsAlign.length && alignTo) {
|
|
|
|
|
each(axisNeedsAlign, function (axis) {
|
|
|
|
|
alignScaleTicks(axis.scale, axis.model, alignTo.scale);
|
|
|
|
|
});
|
|
|
|
|
diff --git a/node_modules/echarts/lib/scale/Interval.js b/node_modules/echarts/lib/scale/Interval.js
|
|
|
|
|
index 1094662..8f4e07a 100644
|
|
|
|
|
--- a/node_modules/echarts/lib/scale/Interval.js
|
|
|
|
|
+++ b/node_modules/echarts/lib/scale/Interval.js
|
|
|
|
|
@@ -46,12 +46,17 @@ import * as numberUtil from '../util/number.js';
|
|
|
|
|
import * as formatUtil from '../util/format.js';
|
|
|
|
|
import Scale from './Scale.js';
|
|
|
|
|
import * as helper from './helper.js';
|
|
|
|
|
+import { isFunction } from 'zrender/lib/core/util.js';
|
|
|
|
|
var roundNumber = numberUtil.round;
|
|
|
|
|
var IntervalScale = /** @class */function (_super) {
|
|
|
|
|
__extends(IntervalScale, _super);
|
|
|
|
|
- function IntervalScale() {
|
|
|
|
|
- var _this = _super !== null && _super.apply(this, arguments) || this;
|
|
|
|
|
+ function IntervalScale(setting) {
|
|
|
|
|
+ var _this = _super.call(this, setting) || this;
|
|
|
|
|
_this.type = 'interval';
|
|
|
|
|
+ var ticksGenerator = _this.getSetting('ticksGenerator');
|
|
|
|
|
+ if (isFunction(ticksGenerator)) {
|
|
|
|
|
+ _this._ticksGenerator = ticksGenerator;
|
|
|
|
|
+ }
|
|
|
|
|
// Step is calculated in adjustExtent.
|
|
|
|
|
_this._interval = 0;
|
|
|
|
|
_this._intervalPrecision = 2;
|
|
|
|
|
@@ -104,7 +109,17 @@ var IntervalScale = /** @class */function (_super) {
|
|
|
|
|
var extent = this._extent;
|
|
|
|
|
var niceTickExtent = this._niceExtent;
|
|
|
|
|
var intervalPrecision = this._intervalPrecision;
|
|
|
|
|
- var ticks = [];
|
|
|
|
|
+ var ticksGenerator = this._ticksGenerator;
|
|
|
|
|
+ var ticks;
|
|
|
|
|
+ if (ticksGenerator) {
|
|
|
|
|
+ try {
|
|
|
|
|
+ ticks = ticksGenerator(extent, interval, niceTickExtent, intervalPrecision);
|
|
|
|
|
+ if (ticks) {
|
|
|
|
|
+ return ticks;
|
|
|
|
|
+ }
|
|
|
|
|
+ } catch (_e) {}
|
|
|
|
|
+ }
|
|
|
|
|
+ ticks = [];
|
|
|
|
|
// If interval is 0, return [];
|
|
|
|
|
if (!interval) {
|
|
|
|
|
return ticks;
|
|
|
|
|
diff --git a/node_modules/echarts/types/dist/shared.d.ts b/node_modules/echarts/types/dist/shared.d.ts
|
|
|
|
|
index ca74097..98f8b18 100644
|
|
|
|
|
--- a/node_modules/echarts/types/dist/shared.d.ts
|
|
|
|
|
+++ b/node_modules/echarts/types/dist/shared.d.ts
|
|
|
|
|
@@ -2422,6 +2422,9 @@ interface AxisBaseOptionCommon extends ComponentOption, AnimationOptionMixin {
|
|
|
|
|
max: number;
|
|
|
|
|
}) => ScaleDataValue);
|
|
|
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+declare type NumericAxisTicksGenerator = (extent?: number[], interval?: number, niceTickExtent?: number[], intervalPrecision?: number) => {value: number}[];
|
|
|
|
|
+
|
|
|
|
|
interface NumericAxisBaseOptionCommon extends AxisBaseOptionCommon {
|
|
|
|
|
boundaryGap?: [number | string, number | string];
|
|
|
|
|
/**
|
|
|
|
|
@@ -2447,6 +2450,8 @@ interface NumericAxisBaseOptionCommon extends AxisBaseOptionCommon {
|
|
|
|
|
* Will be ignored if interval is set.
|
|
|
|
|
*/
|
|
|
|
|
alignTicks?: boolean;
|
|
|
|
|
+
|
|
|
|
|
+ ticksGenerator?: NumericAxisTicksGenerator;
|
|
|
|
|
}
|
|
|
|
|
interface CategoryAxisBaseOption extends AxisBaseOptionCommon {
|
|
|
|
|
type?: 'category';
|
|
|
|
|
diff --git a/node_modules/echarts/types/src/coord/axisCommonTypes.d.ts b/node_modules/echarts/types/src/coord/axisCommonTypes.d.ts
|
|
|
|
|
index c5c2792..d524b70 100644
|
|
|
|
|
--- a/node_modules/echarts/types/src/coord/axisCommonTypes.d.ts
|
|
|
|
|
+++ b/node_modules/echarts/types/src/coord/axisCommonTypes.d.ts
|
|
|
|
|
@@ -56,6 +56,9 @@ export interface AxisBaseOptionCommon extends ComponentOption, AnimationOptionMi
|
|
|
|
|
max: number;
|
|
|
|
|
}) => ScaleDataValue);
|
|
|
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+export declare type NumericAxisTicksGenerator = (extent?: number[], interval?: number, niceTickExtent?: number[], intervalPrecision?: number) => {value: number}[];
|
|
|
|
|
+
|
|
|
|
|
export interface NumericAxisBaseOptionCommon extends AxisBaseOptionCommon {
|
|
|
|
|
boundaryGap?: [number | string, number | string];
|
|
|
|
|
/**
|
|
|
|
|
@@ -81,6 +84,8 @@ export interface NumericAxisBaseOptionCommon extends AxisBaseOptionCommon {
|
|
|
|
|
* Will be ignored if interval is set.
|
|
|
|
|
*/
|
|
|
|
|
alignTicks?: boolean;
|
|
|
|
|
+
|
|
|
|
|
+ ticksGenerator?: NumericAxisTicksGenerator;
|
|
|
|
|
}
|
|
|
|
|
export interface CategoryAxisBaseOption extends AxisBaseOptionCommon {
|
|
|
|
|
type?: 'category';
|