Skip to content

fix(gauge): 仪表盘 percent 0 时，数据被过滤重新添加回来 #3265

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
merged 5 commits into from
Jul 12, 2022
Merged

fix(gauge): 仪表盘 percent 0 时，数据被过滤重新添加回来 #3265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8f51d2
fix(gauge): 仪表盘 percent 0 时，数据被过滤重新添加回来
ai-qing-hai Jun 27, 2022
6fec70c
fix(gauge): 仪表盘 getRangeData 方法重新修改
ai-qing-hai Jun 27, 2022
d4b0c6c
fix(gauge): 重写 getRangeData 方法
ai-qing-hai Jun 27, 2022
d87f4b3
fix(gauge): 重写 getRangeData 方法 - 2
ai-qing-hai Jun 28, 2022
d715457
fix(gauge): 重写 getRangeData 方法 -3
ai-qing-hai Jun 30, 2022
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
14 changes: 14 additions & 0 deletions __tests__/bugs/issue-3262-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { Gauge } from '../../src';
import { createDiv } from '../utils/dom';

describe('#3262', () => {
it('gauge percent 0', () => {
const gauge = new Gauge(createDiv(), {
percent: 0,
});

gauge.render();

expect(gauge.chart.views[1].getOptions().data.length).toBe(2);
});
});
22 changes: 15 additions & 7 deletions __tests__/unit/plots/gauge/utils-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,27 @@ describe('gauge utils to getData', () => {

it('get rangeData', () => {
expect(getRangeData(0.5, { ticks: [0, 0.3, 1] })).toEqual([
{ [RANGE_VALUE]: 0.3, [RANGE_TYPE]: '1', [PERCENT]: 0.5 },
{ [RANGE_VALUE]: 0.7, [RANGE_TYPE]: '2', [PERCENT]: 0.5 },
{ [RANGE_VALUE]: 0.3, [RANGE_TYPE]: '0', [PERCENT]: 0.5 },
{ [RANGE_VALUE]: 0.7, [RANGE_TYPE]: '1', [PERCENT]: 0.5 },
]);

expect(getRangeData(0.5)).toEqual([
{ [RANGE_VALUE]: 0.5, [RANGE_TYPE]: '0', [PERCENT]: 0.5 },
{ [RANGE_VALUE]: 0.5, [RANGE_TYPE]: '1', [PERCENT]: 0.5 },
{ [RANGE_VALUE]: 0.5, [RANGE_TYPE]: '2', [PERCENT]: 0.5 },
]);

expect(getRangeData(-0.5)).toEqual([{ [RANGE_VALUE]: 1, [RANGE_TYPE]: '2', [PERCENT]: -0.5 }]);
expect(getRangeData(1.5)).toEqual([{ [RANGE_VALUE]: 1, [RANGE_TYPE]: '1', [PERCENT]: 1.5 }]);
expect(getRangeData(1.5)).toEqual([
{ [RANGE_VALUE]: 1, [RANGE_TYPE]: '0', [PERCENT]: 1.5 },
{ [RANGE_VALUE]: 0, [RANGE_TYPE]: '1', [PERCENT]: 1.5 },
]);

expect(getRangeData(0)).toEqual([{ [RANGE_VALUE]: 1, [RANGE_TYPE]: '2', [PERCENT]: 0 }]);
expect(getRangeData(1)).toEqual([{ [RANGE_VALUE]: 1, [RANGE_TYPE]: '1', [PERCENT]: 1 }]);
expect(getRangeData(0)).toEqual([
{ [RANGE_VALUE]: 0, [RANGE_TYPE]: '0', [PERCENT]: 0 },
{ [RANGE_VALUE]: 1, [RANGE_TYPE]: '1', [PERCENT]: 0 },
]);
expect(getRangeData(1)).toEqual([
{ [RANGE_VALUE]: 1, [RANGE_TYPE]: '0', [PERCENT]: 1 },
{ [RANGE_VALUE]: 0, [RANGE_TYPE]: '1', [PERCENT]: 1 },
]);
});
});
9 changes: 5 additions & 4 deletions src/plots/gauge/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { clamp, get, size } from '@antv/util';
import { clamp, get, size, uniq } from '@antv/util';
import { Data, Datum } from '../../types';
import { RANGE_VALUE, RANGE_TYPE, PERCENT } from './constants';
import { GaugeOptions, GaugeRangeData } from './types';
Expand All @@ -16,8 +16,6 @@ export function processRangeData(range: number[], percent: GaugeOptions['percent
.map((r: number, idx: number) => {
return { [RANGE_VALUE]: r - (range[idx - 1] || 0), [RANGE_TYPE]: `${idx}`, [PERCENT]: percent };
})
// 去掉 0 的数据
.filter((d: Datum) => !!d[RANGE_VALUE])
);
}

Expand All @@ -37,6 +35,9 @@ export function getIndicatorData(percent: GaugeOptions['percent']): Data {
export function getRangeData(percent: GaugeOptions['percent'], range?: GaugeOptions['range']): GaugeRangeData {
const ticks = get(range, ['ticks'], []);

const clampTicks = size(ticks) ? ticks : [0, clamp(percent, 0, 1), 1];
const clampTicks = size(ticks) ? uniq(ticks) : [0, clamp(percent, 0, 1), 1];
if (!clampTicks[0]) {
clampTicks.shift();
}
return processRangeData(clampTicks as number[], percent);
}