Skip to content

Commit c947515

Browse files
ChronosSFChronosSF
authored
Merge pull request #3080 from IgniteUI/sstoychev/update-to-alpha2
fix(grid): changing sample, updating to alpha 2
2 parents a39bf3f + 6dfaf46 commit c947515

5 files changed

Lines changed: 43 additions & 47 deletions

File tree

‎live-editing/configs/HierarchicalGridConfigGenerator.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -935,8 +935,7 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
935935
}));
936936

937937
configs.push(new Config({
938-
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts',
939-
'/src/app/hierarchical-grid/models.ts'],
938+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/hierarchical-data.ts'],
940939
appModuleConfig: new AppModuleConfig({
941940
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridColumnAutoSizingSampleComponent'],
942941
ngDeclarations: ['HGridColumnAutoSizingSampleComponent'],

‎package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"domino": "^2.1.4",
6464
"file-saver": "^2.0.2",
6565
"hammerjs": "^2.0.8",
66-
"igniteui-angular": "^14.1.0-alpha.1",
66+
"igniteui-angular": "^14.1.0-alpha.2",
6767
"igniteui-angular-charts": "^14.0.0",
6868
"igniteui-angular-core": "^14.0.0",
6969
"igniteui-angular-i18n": "^14.0.2",

‎src/app/hierarchical-grid/hgrid-column-autosizing/hgrid-column-autosizing.component.html‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,35 @@
11
<div class="grid__wrapper">
2-
<igx-hierarchical-grid igxPreventDocumentScroll class="hierarchicalGrid" [data]="localData" [autoGenerate]="false" [height]="'520px'"
3-
[width]="'100%'" [rowHeight]="'65px'" #hierarchicalGrid>
4-
<igx-column field="Artist" width="auto" [resizable]="true"></igx-column>
5-
<igx-column field="Photo" width="auto" [resizable]="true" [minWidth]="'115px'">
6-
<ng-template igxCell let-cell="cell">
7-
<div class="cell__inner_2">
8-
<img [src]="cell.value" class="photo" />
9-
</div>
10-
</ng-template>
11-
</igx-column>
12-
<igx-column field="Debut" width="auto" [resizable]="true" [minWidth]="'88px'" [maxWidth]="'230px'" dataType="number" [formatter]="formatter"></igx-column>
13-
<igx-column field="GrammyNominations" header="Grammy Nominations" width="auto" [resizable]="true"></igx-column>
14-
<igx-column field="GrammyAwards" header="Grammy Awards" width="auto" [resizable]="true"></igx-column>
15-
16-
<igx-row-island [height]="null" [key]="'Albums'" [autoGenerate]="false">
17-
<igx-column field="Album" width="auto" [resizable]="true"></igx-column>
18-
<igx-column field="LaunchDate" header="Launch Date" width="auto" [resizable]="true" [dataType]="'date'"></igx-column>
19-
<igx-column field="BillboardReview" header="Billboard Review" width="auto" [resizable]="true"></igx-column>
20-
<igx-column field="USBillboard200" header="US Billboard 200" width="auto" [resizable]="true"></igx-column>
21-
<igx-row-island [height]="null" [key]="'Songs'" [autoGenerate]="false">
22-
<igx-column field="Number" header="No." width="auto" [resizable]="true"></igx-column>
23-
<igx-column field="Title" width="auto" [resizable]="true"></igx-column>
24-
<igx-column field="Released" dataType="date" width="auto" [resizable]="true"></igx-column>
25-
<igx-column field="Genre" width="auto" [resizable]="true"></igx-column>
2+
<igx-hierarchical-grid igxPreventDocumentScroll #hierarchicalGrid [data]="localdata"
3+
[height]="'490px'" [width]="'100%'">
4+
<igx-column field="CustomerID" width="auto" [resizable]="true"></igx-column>
5+
<igx-column field="CompanyName" width="auto" [resizable]="true"></igx-column>
6+
<igx-column field="ContactName" width="auto" [resizable]="true"></igx-column>
7+
<igx-column field="ContactTitle" width="auto" [resizable]="true"></igx-column>
8+
<igx-column field="Address" width="auto" [resizable]="true"></igx-column>
9+
<igx-column field="City" width="auto" [resizable]="true"></igx-column>
10+
<igx-column field="PostalCode" width="auto" [resizable]="true"></igx-column>
11+
<igx-column field="Country" width="auto" [resizable]="true"></igx-column>
12+
<igx-column field="Phone" width="auto" [resizable]="true"></igx-column>
13+
<igx-column field="Fax" width="auto" [resizable]="true"></igx-column>
14+
<igx-row-island [height]="null" [key]="'Orders'" [autoGenerate]="false">
15+
<igx-column field="OrderID" width="auto" [resizable]="true"></igx-column>
16+
<igx-column field="EmployeeID" width="auto" [resizable]="true"></igx-column>
17+
<igx-column field="OrderDate" width="auto" [dataType]="'date'" [resizable]="true"></igx-column>
18+
<igx-column field="RequiredDate" width="auto" [dataType]="'date'" [resizable]="true"></igx-column>
19+
<igx-column field="ShippedDate" width="auto" [dataType]="'date'" [resizable]="true"></igx-column>
20+
<igx-column field="ShipVia" width="auto" [resizable]="true"></igx-column>
21+
<igx-column field="Freight" width="auto" [resizable]="true"></igx-column>
22+
<igx-column field="ShipName" width="auto" [resizable]="true"></igx-column>
23+
<igx-column field="ShipAddress" width="auto" [resizable]="true"></igx-column>
24+
<igx-column field="ShipCity" width="auto" [resizable]="true"></igx-column>
25+
<igx-column field="ShipPostalCode" width="auto" [resizable]="true"></igx-column>
26+
<igx-column field="ShipCountry" width="auto" [resizable]="true"></igx-column>
27+
<igx-row-island [height]="null" [key]="'OrderDetails'" [autoGenerate]="false" [moving]="true">
28+
<igx-column field="ProductID" width="auto" [resizable]="true"></igx-column>
29+
<igx-column field="UnitPrice" width="auto" [resizable]="true"></igx-column>
30+
<igx-column field="Quantity" width="auto" [resizable]="true"></igx-column>
31+
<igx-column field="Discount" width="auto" [resizable]="true"></igx-column>
2632
</igx-row-island>
2733
</igx-row-island>
28-
29-
<igx-row-island [height]="null" [key]="'Tours'" [autoGenerate]="false">
30-
<igx-column field="Tour" width="auto" [resizable]="true"></igx-column>
31-
<igx-column field="StartedOn" header="Started on" width="auto" [resizable]="true"></igx-column>
32-
<igx-column field="Location" width="auto" [resizable]="true"></igx-column>
33-
<igx-column field="Headliner" width="auto" [resizable]="true"></igx-column>
34-
</igx-row-island>
3534
</igx-hierarchical-grid>
3635
</div>

‎src/app/hierarchical-grid/hgrid-column-autosizing/hgrid-column-autosizing.component.ts‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
import { Component } from '@angular/core';
2-
import { SINGERS } from '../../data/singersData';
3-
2+
import { CUSTOMERS } from '../../data/hierarchical-data';
43
@Component({
54
selector: 'hierarchical-grid-column-autosizing',
65
styleUrls: ['./hgrid-column-autosizing.component.scss'],
76
templateUrl: './hgrid-column-autosizing.component.html'
87
})
98

109
export class HGridColumnAutoSizingSampleComponent {
11-
public localData;
10+
public localdata;
11+
1212
constructor() {
13-
this.localData = SINGERS;
13+
this.localdata = CUSTOMERS;
1414
}
15-
16-
public formatter = (a) => a;
1715
}

0 commit comments

Comments
 (0)