Skip to content

feat: add dimension data filter #4030

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
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: add dimension data filter #4030

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
6 changes: 6 additions & 0 deletions packages/vchart/src/component/axis/interface/spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,12 @@ export interface ILinearAxisSpec {
* @since 1.12.4
*/
breaks?: ILinearAxisBreakSpec[];
/**
* 筛选 dimension 数据， 返回值为筛选后的 dimension 数据
* 本选项会影响到 Tooltip， 以及数据选中状态等， 且比 tooltipFilterRange 优先
* @since 2..0
*/
dimensionDataFilter?: (datums: Datum[], dimensionFields: string[], value: unknown) => Datum[];
}

export interface IBandAxisSpec {
Expand Down
17 changes: 11 additions & 6 deletions packages/vchart/src/event/events/dimension/util/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,18 @@ export const getDimensionData = (
for (const series of seriesList) {
if (series.coordinate === coordinate) {
const dimensionField = array(getDimensionField(series));
const viewData = series.getViewData()?.latestData;
const viewData = series.getViewData()?.latestData as Datum[];

if (dimensionField && viewData) {
const spec = axis.getSpec() as ICartesianLinearAxisSpec;
const filteredViewData = spec.dimensionDataFilter
? spec.dimensionDataFilter(viewData, dimensionField, value)
: viewData;

if (isDiscreteAxis) {
const datums: Datum[] = [];
const datumIdList: number[] = [];
viewData.forEach((datum: any, i: number) => {
filteredViewData.forEach((datum: any, i: number) => {
if (datum[dimensionField[0]]?.toString() === value?.toString()) {
datums.push(datum); // 获取该维度项所对应的数据
datumIdList.push(i);
Expand All @@ -87,7 +93,7 @@ export const getDimensionData = (
// 直方图情况，根据范围取 datum
const datums: Datum[] = [];
const datumIdList: number[] = [];
viewData.forEach((datum: any, i: number) => {
filteredViewData.forEach((datum: any, i: number) => {
if (
datum[dimensionField[0]]?.toString() === value?.toString() ||
(isValid(datum[dimensionField[0]]) &&
Expand All @@ -106,13 +112,12 @@ export const getDimensionData = (
});
} else {
// 散点图情况，依据轴上的配置判断
const spec = axis.getSpec() as ICartesianLinearAxisSpec;
const rangeArr = resolveTooltipFilterRange(spec, scale);
let datums: Datum[] = [];
let datumIdList: number[] = [];
if (rangeArr) {
// 根据范围取 datum
viewData.forEach((datum: Datum, i: number) => {
filteredViewData.forEach((datum: Datum, i: number) => {
if (isValid(datum[dimensionField[0]])) {
const delta = datum[dimensionField[0]] - value;
if (delta >= rangeArr[0] && delta <= rangeArr[1]) {
Expand All @@ -125,7 +130,7 @@ export const getDimensionData = (
// 根据最近距离取 datum
let minDelta = Infinity;
let deltaSign = 0;
viewData.forEach((datum: any, i: number) => {
filteredViewData.forEach((datum: any, i: number) => {
if (isValid(datum[dimensionField[0]])) {
const delta = Math.abs(datum[dimensionField[0]] - value);
const sign = Math.sign(datum[dimensionField[0]] - value);
Expand Down
Loading