Skip to content

Fix/fix issue of datazoom #1980

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

Merged
xuefei1313 merged 3 commits into from
Nov 18, 2025
Merged

Fix/fix issue of datazoom #1980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb7df8d
fix: fix issue of datazoom
xuefei1313 Nov 17, 2025
401067d
fix: fix issue of datazoom
xuefei1313 Nov 17, 2025
5562c28
Revert "fix: fix issue of datazoom"
xuefei1313 Nov 18, 2025
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
4 changes: 2 additions & 2 deletions packages/vrender-components/src/data-zoom/data-zoom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ export class DataZoom extends AbstractComponent<Required<DataZoomAttributes>> {

setAttributes(params: Partial<Required<DataZoomAttributes>>, forceUpdateTag?: boolean): void {
const { start, end } = this.attribute as DataZoomAttributes;
start && (this._state.start = start);
end && (this._state.end = end);
start && (this._state.start = params.start ?? start);
end && (this._state.end = params.end ?? end);

this._renderer.setAttributes(this._getRendererAttrs());
this._interaction.setAttributes(this._getInteractionAttrs());
Expand Down
41 changes: 27 additions & 14 deletions packages/vrender-components/src/data-zoom/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export class DataZoomRenderer {
height,
cursor: brushSelect ? 'crosshair' : 'auto',
...backgroundStyle,
pickable: zoomLock ? false : (backgroundStyle.pickable ?? true)
pickable: zoomLock ? false : backgroundStyle.pickable ?? true
},
'rect'
) as IRect;
Expand Down Expand Up @@ -264,7 +264,7 @@ export class DataZoomRenderer {
width: (end - start) * width,
height: middleHandlerBackgroundSize,
...middleHandlerStyle.background?.style,
pickable: zoomLock ? false : (middleHandlerStyle.background?.style?.pickable ?? true)
pickable: zoomLock ? false : middleHandlerStyle.background?.style?.pickable ?? true
},
'rect'
) as IRect;
Expand All @@ -277,7 +277,7 @@ export class DataZoomRenderer {
angle: 0,
symbolType: middleHandlerStyle.icon?.symbolType ?? 'square',
...middleHandlerStyle.icon,
pickable: zoomLock ? false : (middleHandlerStyle.icon.pickable ?? true)
pickable: zoomLock ? false : middleHandlerStyle.icon.pickable ?? true
},
'symbol'
) as ISymbol;
Expand All @@ -291,7 +291,7 @@ export class DataZoomRenderer {
symbolType: startHandlerStyle.symbolType ?? 'square',
...(DEFAULT_HANDLER_ATTR_MAP.horizontal as any),
...startHandlerStyle,
pickable: zoomLock ? false : (startHandlerStyle.pickable ?? true)
pickable: zoomLock ? false : startHandlerStyle.pickable ?? true
},
'symbol'
) as ISymbol;
Expand All @@ -304,7 +304,7 @@ export class DataZoomRenderer {
symbolType: endHandlerStyle.symbolType ?? 'square',
...(DEFAULT_HANDLER_ATTR_MAP.horizontal as any),
...endHandlerStyle,
pickable: zoomLock ? false : (endHandlerStyle.pickable ?? true)
pickable: zoomLock ? false : endHandlerStyle.pickable ?? true
},
'symbol'
) as ISymbol;
Expand Down Expand Up @@ -357,7 +357,7 @@ export class DataZoomRenderer {
width: middleHandlerBackgroundSize,
height: (end - start) * height,
...middleHandlerStyle.background?.style,
pickable: zoomLock ? false : (middleHandlerStyle.background?.style?.pickable ?? true)
pickable: zoomLock ? false : middleHandlerStyle.background?.style?.pickable ?? true
},
'rect'
) as IRect;
Expand All @@ -374,7 +374,7 @@ export class DataZoomRenderer {
symbolType: middleHandlerStyle.icon?.symbolType ?? 'square',
strokeBoundsBuffer: 0,
...middleHandlerStyle.icon,
pickable: zoomLock ? false : (middleHandlerStyle.icon?.pickable ?? true)
pickable: zoomLock ? false : middleHandlerStyle.icon?.pickable ?? true
},
'symbol'
) as ISymbol;
Expand All @@ -388,7 +388,7 @@ export class DataZoomRenderer {
symbolType: startHandlerStyle.symbolType ?? 'square',
...(DEFAULT_HANDLER_ATTR_MAP.vertical as any),
...startHandlerStyle,
pickable: zoomLock ? false : (startHandlerStyle.pickable ?? true)
pickable: zoomLock ? false : startHandlerStyle.pickable ?? true
},
'symbol'
) as ISymbol;
Expand All @@ -402,7 +402,7 @@ export class DataZoomRenderer {
symbolType: endHandlerStyle.symbolType ?? 'square',
...(DEFAULT_HANDLER_ATTR_MAP.vertical as any),
...endHandlerStyle,
pickable: zoomLock ? false : (endHandlerStyle.pickable ?? true)
pickable: zoomLock ? false : endHandlerStyle.pickable ?? true
},
'symbol'
) as ISymbol;
Expand Down Expand Up @@ -472,7 +472,7 @@ export class DataZoomRenderer {
height: height,
cursor: brushSelect ? 'crosshair' : 'move',
...selectedBackgroundStyle,
pickable: zoomLock ? false : ((selectedBackgroundChartStyle as any).pickable ?? true)
pickable: zoomLock ? false : (selectedBackgroundChartStyle as any).pickable ?? true
},
'rect'
) as IRect;
Expand All @@ -487,7 +487,7 @@ export class DataZoomRenderer {
height: (end - start) * height,
cursor: brushSelect ? 'crosshair' : 'move',
...selectedBackgroundStyle,
pickable: zoomLock ? false : (selectedBackgroundStyle.pickable ?? true)
pickable: zoomLock ? false : selectedBackgroundStyle.pickable ?? true
},
'rect'
) as IRect;
Expand Down Expand Up @@ -592,8 +592,13 @@ export class DataZoomRenderer {
});
}

private _computeBasePoints() {
private _computeBasePoints(points: IPointLike[]) {
const { orient } = this.attribute as DataZoomAttributes;
const key = orient === 'bottom' || orient === 'top' ? 'x' : 'y';
let lastPointSide = Math.sign(points[points.length - 1][key] - points[0][key]);
if (lastPointSide === 0) {
lastPointSide = 1;
}
const { position, width, height } = this._getLayoutAttrFromConfig();
let basePointStart: any;
let basePointEnd: any;
Expand Down Expand Up @@ -637,6 +642,14 @@ export class DataZoomRenderer {
}
];
}

if (Math.sign(basePointEnd[0][key] - basePointStart[0][key]) !== lastPointSide) {
return {
basePointStart: basePointEnd,
basePointEnd: basePointStart
};
}

return {
basePointStart,
basePointEnd
Expand Down Expand Up @@ -668,7 +681,7 @@ export class DataZoomRenderer {
// 采样
previewPoints = this._simplifyPoints(previewPoints);

const { basePointStart, basePointEnd } = this._computeBasePoints();
const { basePointStart, basePointEnd } = this._computeBasePoints(previewPoints);
return basePointStart.concat(previewPoints).concat(basePointEnd);
}

Expand All @@ -689,7 +702,7 @@ export class DataZoomRenderer {
// 采样
previewPoints = this._simplifyPoints(previewPoints);

const { basePointStart, basePointEnd } = this._computeBasePoints();
const { basePointStart, basePointEnd } = this._computeBasePoints(previewPoints);
return basePointStart.concat(previewPoints).concat(basePointEnd);
}

Expand Down
Loading
Loading