Skip to content

Commit 1de36b1

Browse files
ChronosSFChronosSF
committed
fixing live-editing build and changing samples a bit
1 parent 2034d47 commit 1de36b1

9 files changed

Lines changed: 60 additions & 108 deletions

File tree

‎live-editing/configs/HierarchicalGridConfigGenerator.ts‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -935,15 +935,12 @@ 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', '/src/app/hierarchical-grid/models.ts',
939-
'/projects/app-lob/src/_app-layout.scss', '/projects/app-lob/src/_variables.scss', '/src/app/services/remoteValues.service.ts'],
940-
additionalDependencies: ['igniteui-angular-charts', 'igniteui-angular-core'],
938+
additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts',
939+
'/src/app/hierarchical-grid/models.ts'],
941940
appModuleConfig: new AppModuleConfig({
942-
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridColumnAutoSizingSampleComponent', 'IgxSparklineCoreModule', 'IgxSparklineModule',
943-
'RemoteValuesService'],
941+
imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridColumnAutoSizingSampleComponent'],
944942
ngDeclarations: ['HGridColumnAutoSizingSampleComponent'],
945-
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxSparklineCoreModule', 'IgxSparklineModule'],
946-
ngProviders: ['RemoteValuesService']
943+
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule'],
947944
}),
948945
component: 'HGridColumnAutoSizingSampleComponent'
949946
}));

‎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.0",
66+
"igniteui-angular": "^14.1.0-alpha.1",
6767
"igniteui-angular-charts": "^14.0.0",
6868
"igniteui-angular-core": "^14.0.0",
6969
"igniteui-angular-i18n": "^14.0.2",

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<div class="grid__wrapper">
2-
<igx-grid igxPreventDocumentScroll [data]="data" [autoGenerate]="false" height="500px" width="100%" >
3-
<igx-column [field]="'ID'" [header]="'ID'" [resizable]="true" width="auto" ></igx-column>
2+
<igx-grid igxPreventDocumentScroll [data]="data" [autoGenerate]="false" height="500px" width="100%">
3+
<igx-column [field]="'ID'" [header]="'ID'" [resizable]="true" width="auto"></igx-column>
44
<igx-column [field]="'CompanyName'" [header]="'Company Name'" width="auto" [resizable]="true"></igx-column>
5-
<igx-column [field]="'ContactName'" [header]="'Contact Name'" width="auto" [resizable]="true" [minWidth]="'60px'" [maxWidth]="'230px'"></igx-column>
5+
<igx-column [field]="'ContactName'" [header]="'Contact Name'" width="auto" [resizable]="true"
6+
[minWidth]="'60px'" [maxWidth]="'230px'"></igx-column>
67
<igx-column [field]="'ContactTitle'" [header]="'Contact Title'" width="auto" [resizable]="true"></igx-column>
78
<igx-column [field]="'Address'" [header]="'Address'" width="auto" [resizable]="true"></igx-column>
89
<igx-column [field]="'City'" [header]="'City'" width="auto" [resizable]="true"></igx-column>
@@ -11,4 +12,4 @@
1112
<igx-column [field]="'Phone'" [header]="'Phone'" width="auto" [resizable]="true"></igx-column>
1213
<igx-column [field]="'Fax'" [header]="'Fax'" width="auto" [resizable]="true"></igx-column>
1314
</igx-grid>
14-
</div>
15+
</div>

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Component, ElementRef, ViewChild } from '@angular/core';
1+
import { Component } from '@angular/core';
22
import { DATA } from '../../data/customers';
33

44
@Component({
@@ -8,16 +8,10 @@ import { DATA } from '../../data/customers';
88
})
99

1010
export class GridColumnAutosizingComponent {
11-
@ViewChild('widthValue', { static: true }) public widthValue: ElementRef;
12-
1311
public data: any[];
1412

1513
constructor() {
1614
this.data = DATA;
17-
}
18-
19-
20-
public autosizeAllColumns(){
21-
this.widthValue.nativeElement.value = "auto"
2215
}
2316
}
17+

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

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,36 @@
11
<div class="grid__wrapper">
2-
<igx-hierarchical-grid igxPreventDocumentScroll class="hierarchicalGrid" [data]="localdata" (columnResized)="onResize($event)" [autoGenerate]="false"
3-
[height]="'480px'" [rowHeight]="'65px'" #hierarchicalGrid>
4-
<igx-column field="Artist" [resizable]="true"></igx-column>
5-
<igx-column field="Photo" [resizable]="true" [minWidth]="'115px'" [width]="'auto'">
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'">
66
<ng-template igxCell let-cell="cell">
77
<div class="cell__inner_2">
88
<img [src]="cell.value" class="photo" />
99
</div>
1010
</ng-template>
1111
</igx-column>
12-
<igx-column field="Debut" [resizable]="true" [width]="'auto'" [minWidth]="'88px'" [maxWidth]="'230px'" dataType="number" [formatter]="formatter"></igx-column>
13-
<igx-column field="GrammyNominations" [width]="'auto'" header="Grammy Nominations" [resizable]="true"></igx-column>
14-
<igx-column field="GrammyAwards" [width]="'auto'" header="Grammy Awards" [resizable]="true"></igx-column>
15-
<igx-column field="Sales" [width]="'auto'" header="Album Sales in last {{ this.years }} years" [filterable]="false" >
16-
<ng-template igxCell let-val>
17-
<igx-sparkline height="40px"
18-
[dataSource]="val"
19-
valueMemberPath="Copies"
20-
displayType="Line"
21-
lineThickness="2"
22-
brush="rgb(255,102,0)" >
23-
</igx-sparkline>
24-
</ng-template>
25-
</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>
2615

2716
<igx-row-island [height]="null" [key]="'Albums'" [autoGenerate]="false">
28-
<igx-column field="Album" [resizable]="true"></igx-column>
29-
<igx-column field="LaunchDate" header="Launch Date" [resizable]="true" [dataType]="'date'"></igx-column>
30-
<igx-column field="BillboardReview" header="Billboard Review" [resizable]="true"></igx-column>
31-
<igx-column field="USBillboard200" header="US Billboard 200" [resizable]="true"></igx-column>
32-
<igx-row-island [height]="null" [key]="'Songs'" [autoGenerate]="false">
33-
<igx-column field="Number" header="No." [resizable]="true"></igx-column>
34-
<igx-column field="Title" [resizable]="true"></igx-column>
35-
<igx-column field="Released" dataType="date" [resizable]="true"></igx-column>
36-
<igx-column field="Genre" [resizable]="true"></igx-column>
37-
</igx-row-island>
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>
26+
</igx-row-island>
3827
</igx-row-island>
3928

4029
<igx-row-island [height]="null" [key]="'Tours'" [autoGenerate]="false">
41-
<igx-column field="Tour" [resizable]="true"></igx-column>
42-
<igx-column field="StartedOn" header="Started on" [resizable]="true"></igx-column>
43-
<igx-column field="Location" [resizable]="true"></igx-column>
44-
<igx-column field="Headliner" [resizable]="true"></igx-column>
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>
4534
</igx-row-island>
4635
</igx-hierarchical-grid>
47-
</div>
36+
</div>

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

Lines changed: 4 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,16 @@
11
import { Component } from '@angular/core';
2-
import { IgxColumnComponent } from 'igniteui-angular';
3-
import { RemoteValuesService } from '../../services/remoteValues.service';
2+
import { SINGERS } from '../../data/singersData';
43

54
@Component({
65
selector: 'hierarchical-grid-column-autosizing',
76
styleUrls: ['./hgrid-column-autosizing.component.scss'],
87
templateUrl: './hgrid-column-autosizing.component.html',
9-
providers: [RemoteValuesService]
108
})
119

1210
export class HGridColumnAutoSizingSampleComponent {
13-
public years = 10;
14-
public localdata: any[];
15-
public col: IgxColumnComponent;
16-
public pWidth: string;
17-
public nWidth: string;
18-
public singers: any[];
19-
20-
constructor(private remoteValuesService: RemoteValuesService) {
21-
this.singers = this.remoteValuesService.getSingersData();;
22-
for (const singer of this.singers) {
23-
this.getSales(singer);
24-
}
25-
this.localdata = this.singers;
26-
}
27-
28-
public onResize(event) {
29-
this.col = event.column;
30-
this.pWidth = event.prevWidth;
31-
this.nWidth = event.newWidth;
32-
}
33-
34-
public getSales(singer: any): any {
35-
singer['Sales'] = this.getSalesData(10);
36-
}
37-
38-
public getSalesData(years?: number): any[] {
39-
if (years === undefined) {
40-
years = 20;
41-
}
42-
const sales: any[] = [];
43-
for (let y = 0; y < years; y++) {
44-
const value = this.getRandomNumber(0, 1000);
45-
// eslint-disable-next-line @typescript-eslint/naming-convention
46-
sales.push({Copies: value, Year: y});
47-
}
48-
return sales;
49-
}
50-
51-
public getRandomNumber(min: number, max: number): number {
52-
return Math.round(min + Math.random() * (max - min));
11+
public localData;
12+
constructor() {
13+
this.localData = SINGERS;
5314
}
5415

5516
public formatter = (a) => a;

‎src/app/hierarchical-grid/hierarchical-grid-routing.module.ts‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,11 +538,16 @@ export const hierarchicalGridRoutes: Routes = [
538538
data: hierarchicalGridRoutesData['hGrid-row-classes'],
539539
path: 'hGrid-row-classes'
540540
},
541-
{
542-
component: HGridColumnAutoSizingSampleComponent,
543-
data: hierarchicalGridRoutesData['hGrid-columnAutosizing-sample'],
544-
path: 'hGrid-columnAutosizing-sample'
545-
}
541+
{
542+
component: HGridActionStripSampleComponent,
543+
data: hierarchicalGridRoutesData['hGrid-action-strip'],
544+
path: 'hGrid-action-strip'
545+
},
546+
{
547+
component: HGridColumnAutoSizingSampleComponent,
548+
data: hierarchicalGridRoutesData['hGrid-columnAutosizing-sample'],
549+
path: 'hGrid-columnAutosizing-sample'
550+
}
546551
];
547552

548553
@NgModule({

‎src/app/tree-grid/tree-grid-routing.module.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,11 @@ export const treeGridRoutes: Routes = [
552552
data: treeGridRoutesData['tree-grid-styles-sample'],
553553
path: 'tree-grid-styles-sample'
554554
},
555+
{
556+
component: TreeGridActionStripSampleComponent,
557+
data: treeGridRoutesData['tree-grid-action-strip'],
558+
path: 'tree-grid-action-strip'
559+
},
555560
{
556561
component: TreeGridColumnAutoSizingSampleComponent,
557562
data: treeGridRoutesData['tree-grid-columnAutoSizing-sample'],

0 commit comments

Comments
 (0)