Skip to content

Commit fff6401

Browse files
authored
fix: 修复pieLabel自定义records匹配逻辑问题 (#2121)
* fix: 修复pieLabel自定义records匹配逻辑问题 * chore: 单测 * chore: 更新单测结果
1 parent d60aa3f commit fff6401

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

packages/f2/src/components/pieLabel/withPieLabel.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,10 +333,11 @@ export default (View) => {
333333

334334
if (customRecords) {
335335
const { xField, yField } = adjust.adjust;
336+
const colorField = geometry.attrs?.color?.field;
336337
records = customRecords
337338
.map((record) => {
338339
return allRecords.find(
339-
(d) => d.origin[xField] === record[xField] && d.origin[yField] === record[yField]
340+
(d) => d.origin[colorField] === record[colorField] && d.origin[xField] === record[xField] && d.origin[yField] === record[yField]
340341
);
341342
})
342343
.filter(Boolean);
1.41 KB
Loading

packages/f2/test/components/pieLabel/spider.test.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,11 @@ describe('Spider PieLabel', () => {
496496
memo: 'Language',
497497
const: 'const',
498498
},
499+
{
500+
amount: 10,
501+
memo: 'Math',
502+
const: 'const',
503+
},
499504
]}
500505
label1={(data) => {
501506
return {

0 commit comments

Comments
 (0)