Skip to content

Commit 2c0213f

Browse files
authored
Merge branch 'master' into kdragieva/finjs-chart-issue
2 parents 1818e9b + 3436835 commit 2c0213f

3 files changed

Lines changed: 19 additions & 33 deletions

File tree

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1+
<div class="pivotgrid-sample">
2+
<div class="button-container">
3+
<button igxButton="raised" (click)="exportButtonHandler()">Export To Excel</button>
4+
Press the button to export the Pivot Grid as .xlsx file.
5+
</div>
16

2-
<div class="button-container">
3-
<button igxButton="raised" (click)="exportButtonHandler()">Export To Excel</button>
4-
Press the button to export the Pivot Grid as .xlsx file.
5-
</div>
6-
7-
<div class="pivot-container">
8-
<igx-pivot-grid #grid [data]="data" [height]="'800px'" [pivotConfiguration]="pivotConfig" [rowSelection]="'single'"
7+
<igx-pivot-grid #grid [data]="data" [pivotConfiguration]="pivotConfig" [rowSelection]="'single'"
98
[superCompactMode]="true" [defaultExpandState]='true'>
109
</igx-pivot-grid>
1110
</div>
Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
1-
:host {
2-
padding: 8px;
3-
display: flex;
4-
flex-direction: column;
5-
6-
::ng-deep {
7-
igx-pivot-data-selector {
8-
border: 1px solid hsla(var(--igx-grays-200));
9-
margin: 0 8px;
10-
}
1+
.pivotgrid-sample {
2+
justify-content: center;
3+
margin: 0 auto;
4+
width: 90%;
5+
height: 80%;
6+
7+
.button-container {
8+
align-items: flex-start;
9+
margin: 25px auto;
1110
}
1211

12+
igx-pivot-grid {
13+
align-items: center;
14+
}
1315
}
14-
15-
igx-pivot-grid {
16-
flex: 1;
17-
}
18-
19-
.button-container {
20-
margin: 0 0 25px 0;
21-
}
22-
23-
.pivot-container {
24-
display: flex;
25-
align-items: flex-start;
26-
flex: 1 1 auto;
27-
order: 0;
28-
}

src/app/pivot-grid/pivot-export/pivot-export.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,6 @@ export class PivotExportComponent {
123123
}
124124

125125
public exportButtonHandler() {
126-
this.excelExportService.export(this.grid, new IgxExcelExporterOptions('ExportedPivotGrid'));
126+
this.excelExportService.export(this.grid, new IgxExcelExporterOptions('ExportedDataFile'));
127127
}
128128
}

0 commit comments

Comments
 (0)