Skip to content

Commit f6a6351

Browse files
authored
Merge pull request #10635 from IgniteUI/mkirova/fix-10628
Ensure member name is not overriden by original record fields when co…
2 parents 36293dd + ffcc607 commit f6a6351

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
[data]="dimensions" [displayKey]="'memberName'" [(ngModel)]="selected"
55
placeholder="Dimension(s)" searchPlaceholder="Search...">
66
</igx-combo>
7-
<igx-pivot-grid #grid1 [data]="origData" [pivotConfiguration]="pivotConfigHierarchy" (dimensionsChange)='dimensionChange($event)'>
7+
<igx-pivot-grid #grid1 [data]="origData" [pivotConfiguration]="pivotConfigHierarchy" (dimensionsChange)='dimensionChange($event)' [defaultExpandState]='true'>
88
</igx-pivot-grid>
99
</div>

0 commit comments

Comments
 (0)