Skip to content

fix(Axis): xAxis axisTick custom interval funciton work error with boundaryGap false #20436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sz-p wants to merge 1 commit into
base: master
Choose a base branch
from
+106 −7
Open

fix(Axis): xAxis axisTick custom interval funciton work error with boundaryGap false #20436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions src/coord/Axis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
* under the License.
*/

import {each, map} from 'zrender/src/core/util';
import {linearMap, getPixelPrecision, round} from '../util/number';
import { each, map, isFunction } from 'zrender/src/core/util';
import { linearMap, getPixelPrecision, round } from '../util/number';
import {
createAxisTicks,
createAxisLabels,
Expand All @@ -28,6 +28,7 @@ import {
createAxisLabelsComputingContext,
} from './axisTickLabelBuilder';
import Scale, { ScaleGetTicksOpt } from '../scale/Scale';
import { getOptionCategoryInterval } from './axisHelper';
import { DimensionName, ScaleDataValue, ScaleTick } from '../util/types';
import OrdinalScale from '../scale/Ordinal';
import Model from '../model/Model';
Expand Down Expand Up @@ -207,9 +208,10 @@ class Axis {
}, this);

const alignWithLabel = tickModel.get('alignWithLabel');
const isCustomIntervalTick = isFunction(getOptionCategoryInterval(tickModel as AxisBaseModel));

fixOnBandTicksCoords(
this, ticksCoords, alignWithLabel, opt.clamp
this, ticksCoords, alignWithLabel, isCustomIntervalTick, opt.clamp
);

return ticksCoords;
Expand Down Expand Up @@ -315,6 +317,7 @@ function fixOnBandTicksCoords(
axis: Axis,
ticksCoords: AxisTickCoord[],
alignWithLabel: boolean,
isCustomIntervalTick: boolean,
clamp: boolean
) {
const ticksLen = ticksCoords.length;
Expand All @@ -326,7 +329,22 @@ function fixOnBandTicksCoords(
const axisExtent = axis.getExtent();
let last;
let diffSize;
if (ticksLen === 1) {
if (isCustomIntervalTick) {
const dataExtent = axis.scale.getExtent();
const shift = (axisExtent[1] - axisExtent[0]) / (dataExtent[1] - dataExtent[0] + 1);
each(ticksCoords, function (ticksItem: AxisTickCoord) {
ticksItem.coord -= shift / 2;
});
last = {
coord: axisExtent[1],
tickValue: dataExtent[1] + 1
};
// if have tick add last tick
if (ticksCoords.length) {
ticksCoords.push(last);
}
}
else if (ticksLen === 1) {
ticksCoords[0].coord = axisExtent[0];
ticksCoords[0].onBand = true;
last = ticksCoords[1] = {coord: axisExtent[1], tickValue: ticksCoords[0].tickValue, onBand: true};
Expand All @@ -335,7 +353,7 @@ function fixOnBandTicksCoords(
const crossLen = ticksCoords[ticksLen - 1].tickValue - ticksCoords[0].tickValue;
const shift = (ticksCoords[ticksLen - 1].coord - ticksCoords[0].coord) / crossLen;

each(ticksCoords, function (ticksItem) {
each(ticksCoords, function (ticksItem: AxisTickCoord) {
ticksItem.coord -= shift / 2;
ticksItem.onBand = true;
});
Expand Down
85 changes: 83 additions & 2 deletions test/axis-interval.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.