Skip to content

Commit 6f3932f

Browse files
MKirovaMKirova
authored andcommitted
Ensure member name is not overriden by original record fields when copying properties.
1 parent fd28565 commit 6f3932f

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

projects/igniteui-angular/src/lib/grids/pivot-grid/pivot-util.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,10 @@ export class PivotUtil {
317317
for (const nested of nestedData) {
318318
if (nested[pivotKeys.records] && nested[pivotKeys.records].length === 1) {
319319
// only 1 child record, apply same props to parent.
320-
PivotUtil.processSiblingProperties(nested[pivotKeys.records][0], [nested], pivotKeys);
320+
const keys = Object.assign({}, pivotKeys) as any;
321+
const memberName = h[pivotKeys.children].entries().next().value[1].dimension.memberName;
322+
keys[memberName] = nested[memberName];
323+
PivotUtil.processSiblingProperties(nested[pivotKeys.records][0], [nested], keys);
321324
}
322325
}
323326
obj[pivotKeys.records] = this.getDirectLeafs(nestedData, pivotKeys);

src/app/pivot-grid-hierarchy/pivot-grid-hierarchy.sample.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<igx-pivot-grid
22
#grid1
3+
[defaultExpandState]='true'
34
[data]="origData"
45
[pivotConfiguration]="pivotConfigHierarchy">
56
</igx-pivot-grid>

src/app/pivot-grid-hierarchy/pivot-grid-hierarchy.sample.ts

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,30 @@ export class PivotGridHierarchySampleComponent {
2626
}
2727
},
2828
],
29-
rows: [{
30-
memberName: 'AllSeller',
31-
memberFunction: () => 'All Seller',
32-
enabled: true,
33-
childLevel:
29+
rows: [
3430
{
3531
memberName: 'Seller',
3632
memberFunction: (data) => data.Seller.Name,
3733
enabled: true,
38-
}
39-
},
40-
{
41-
memberName: 'AllCity',
42-
memberFunction: () => 'All City',
43-
enabled: true,
44-
childLevel:
34+
},
35+
{
36+
memberName: 'All',
37+
memberFunction: () => 'All',
38+
enabled: true,
39+
childLevel:
40+
{
41+
42+
memberName: 'Product',
43+
memberFunction: (data) => data.Product.Name,
44+
enabled: true
45+
46+
}
47+
},
4548
{
4649
memberName: 'City',
4750
memberFunction: (data) => data.Seller.City,
4851
enabled: true,
4952
}
50-
}
5153
],
5254
values: [
5355
{

0 commit comments

Comments
 (0)