Skip to content

Commit fe1d026

Browse files
Update Angular
1 parent 8ab1e9b commit fe1d026

File tree

4 files changed

+30
-22
lines changed

4 files changed

+30
-22
lines changed

Angular/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Angular/src/app/app.component.html

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,40 @@
11
<div class="data-grid-demo">
22
<dx-data-grid [dataSource]="data" [showBorders]="true">
3-
<dxo-editing mode="row" [allowUpdating]="true" [allowAdding]="true">
4-
</dxo-editing>
3+
<dxo-data-grid-editing
4+
mode="row"
5+
[allowUpdating]="true"
6+
[allowAdding]="true"
7+
>
8+
</dxo-data-grid-editing>
59

6-
<dxi-column
10+
<dxi-data-grid-column
711
dataField="StateID"
812
caption="State"
913
[setCellValue]="setStateValue"
1014
[cellTemplate]="arrayCellTemplate"
1115
editCellTemplate="stateDropDownBoxTemplate"
1216
>
13-
<dxo-lookup [dataSource]="states" displayExpr="Name" valueExpr="ID">
14-
</dxo-lookup>
15-
</dxi-column>
17+
<dxo-data-grid-lookup
18+
[dataSource]="states"
19+
displayExpr="Name"
20+
valueExpr="ID"
21+
>
22+
</dxo-data-grid-lookup>
23+
</dxi-data-grid-column>
1624

17-
<dxi-column
25+
<dxi-data-grid-column
1826
dataField="CityID"
1927
caption="City"
2028
[cellTemplate]="arrayCellTemplate"
2129
editCellTemplate="cityDropDownBoxTemplate"
2230
>
23-
<dxo-lookup
31+
<dxo-data-grid-lookup
2432
[dataSource]="getFilteredCities"
2533
displayExpr="Name"
2634
valueExpr="ID"
2735
>
28-
</dxo-lookup>
29-
</dxi-column>
36+
</dxo-data-grid-lookup>
37+
</dxi-data-grid-column>
3038

3139
<div *dxTemplate="let cellInfo of 'stateDropDownBoxTemplate'">
3240
<dx-drop-down-box
@@ -45,9 +53,9 @@
4553
[height]="250"
4654
(onInitialized)="stateDataGrid = $event.component"
4755
>
48-
<dxi-column dataField="ID"></dxi-column>
49-
<dxi-column dataField="Name"></dxi-column>
50-
<dxo-selection mode="multiple"></dxo-selection>
56+
<dxi-data-grid-column dataField="ID"></dxi-data-grid-column>
57+
<dxi-data-grid-column dataField="Name"></dxi-data-grid-column>
58+
<dxo-data-grid-selection mode="multiple"></dxo-data-grid-selection>
5159
</dx-data-grid>
5260
<dx-button
5361
text="Apply"
@@ -74,9 +82,9 @@
7482
[height]="250"
7583
(onInitialized)="cityDataGrid = $event.component"
7684
>
77-
<dxi-column dataField="ID"></dxi-column>
78-
<dxi-column dataField="Name"></dxi-column>
79-
<dxo-selection mode="multiple"></dxo-selection>
85+
<dxi-data-grid-column dataField="ID"></dxi-data-grid-column>
86+
<dxi-data-grid-column dataField="Name"></dxi-data-grid-column>
87+
<dxo-data-grid-selection mode="multiple"></dxo-data-grid-selection>
8088
</dx-data-grid>
8189
<dx-button
8290
text="Apply"

Angular/src/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export class AppComponent {
3636
this.cities = service.getCities();
3737
}
3838

39-
getFilteredCities = (options: EditCellInfo<Employee, number>): { store: City[]; filter: [string, string, number[]] | null } => ({
39+
getFilteredCities = (options: EditCellInfo<number>): { store: City[]; filter: [string, string, number[]] | null } => ({
4040
store: this.cities,
41-
filter: options.data ? ['StateID', '=', options.data.StateID] : null,
41+
filter: options.data ? ['StateID', '=', options.data['StateID']] : null,
4242
});
4343

4444
getCityDropDownDs(cellInfo: DxDataGridTypes.ColumnEditCellTemplateData<Employee, number>): DataSource {

Angular/src/app/app.types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { DataSource } from 'devextreme-angular/common/data';
22

3-
export interface EditCellInfo<TItem=any, TKey=any> {
4-
data?: TItem;
5-
key?: TKey;
3+
export interface EditCellInfo<TKey> {
4+
data: Record<string, any>;
5+
key: TKey;
66
}
77

88
export interface CityDropDownInfo {

0 commit comments

Comments
 (0)