Skip to content

Commit 68b9dbf

Browse files
alexslavralexslavr
authored
Generate missing configuration components in DataGrid (#32195)
1 parent 87e3920 commit 68b9dbf

34 files changed

+7563
-199
lines changed

‎apps/demos/Demos/DataGrid/PopupEditing/Angular/app/app.component.html‎

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -5,60 +5,69 @@
55
keyExpr="ID"
66
[showBorders]="true"
77
>
8-
<dxo-paging [enabled]="false"></dxo-paging>
9-
<dxo-editing
8+
<dxo-data-grid-paging [enabled]="false"></dxo-data-grid-paging>
9+
<dxo-data-grid-editing
1010
mode="popup"
1111
[allowUpdating]="true"
1212
[allowAdding]="true"
1313
[allowDeleting]="true"
1414
>
15-
<dxo-popup
15+
<dxo-data-grid-popup
1616
title="Employee Info"
1717
[showTitle]="true"
1818
[width]="700"
1919
[height]="525"
2020
>
21-
</dxo-popup>
22-
<dxo-form>
23-
<dxi-item itemType="group" [colCount]="2" [colSpan]="2">
24-
<dxi-item dataField="FirstName"></dxi-item>
25-
<dxi-item dataField="LastName"></dxi-item>
26-
<dxi-item dataField="Prefix"></dxi-item>
27-
<dxi-item dataField="BirthDate"></dxi-item>
28-
<dxi-item dataField="Position"></dxi-item>
29-
<dxi-item dataField="HireDate"></dxi-item>
30-
<dxi-item
21+
</dxo-data-grid-popup>
22+
<dxo-data-grid-form>
23+
<dxi-data-grid-item itemType="group" [colCount]="2" [colSpan]="2">
24+
<dxi-data-grid-item dataField="FirstName"></dxi-data-grid-item>
25+
<dxi-data-grid-item dataField="LastName"></dxi-data-grid-item>
26+
<dxi-data-grid-item dataField="Prefix"></dxi-data-grid-item>
27+
<dxi-data-grid-item dataField="BirthDate"></dxi-data-grid-item>
28+
<dxi-data-grid-item dataField="Position"></dxi-data-grid-item>
29+
<dxi-data-grid-item dataField="HireDate"></dxi-data-grid-item>
30+
<dxi-data-grid-item
3131
dataField="Notes"
3232
editorType="dxTextArea"
3333
[colSpan]="2"
3434
[editorOptions]="{ height: 100 }"
3535
>
36-
</dxi-item>
37-
</dxi-item>
36+
</dxi-data-grid-item>
37+
</dxi-data-grid-item>
3838

39-
<dxi-item
39+
<dxi-data-grid-item
4040
itemType="group"
4141
caption="Home Address"
4242
[colCount]="2"
4343
[colSpan]="2"
4444
>
45-
<dxi-item dataField="StateID"></dxi-item>
46-
<dxi-item dataField="Address"></dxi-item>
47-
</dxi-item>
48-
</dxo-form>
49-
</dxo-editing>
45+
<dxi-data-grid-item dataField="StateID"></dxi-data-grid-item>
46+
<dxi-data-grid-item dataField="Address"></dxi-data-grid-item>
47+
</dxi-data-grid-item>
48+
</dxo-data-grid-form>
49+
</dxo-data-grid-editing>
5050

51-
<dxi-column dataField="Prefix" caption="Title" [width]="70"></dxi-column>
52-
<dxi-column dataField="FirstName"></dxi-column>
53-
<dxi-column dataField="LastName"></dxi-column>
54-
<dxi-column dataField="BirthDate" dataType="date"> </dxi-column>
55-
<dxi-column dataField="Position" [width]="170"> </dxi-column>
56-
<dxi-column dataField="HireDate" dataType="date"> </dxi-column>
57-
<dxi-column dataField="StateID" caption="State" [width]="125">
58-
<dxo-lookup [dataSource]="states" displayExpr="Name" valueExpr="ID">
59-
</dxo-lookup>
60-
</dxi-column>
61-
<dxi-column dataField="Address" [visible]="false"> </dxi-column>
62-
<dxi-column dataField="Notes" [visible]="false"> </dxi-column>
51+
<dxi-data-grid-column dataField="Prefix" caption="Title" [width]="70">
52+
</dxi-data-grid-column>
53+
<dxi-data-grid-column dataField="FirstName"></dxi-data-grid-column>
54+
<dxi-data-grid-column dataField="LastName"></dxi-data-grid-column>
55+
<dxi-data-grid-column dataField="BirthDate" dataType="date">
56+
</dxi-data-grid-column>
57+
<dxi-data-grid-column dataField="Position" [width]="170">
58+
</dxi-data-grid-column>
59+
<dxi-data-grid-column dataField="HireDate" dataType="date">
60+
</dxi-data-grid-column>
61+
<dxi-data-grid-column dataField="StateID" caption="State" [width]="125">
62+
<dxo-data-grid-lookup
63+
[dataSource]="states"
64+
displayExpr="Name"
65+
valueExpr="ID"
66+
></dxo-data-grid-lookup>
67+
</dxi-data-grid-column>
68+
<dxi-data-grid-column dataField="Address" [visible]="false">
69+
</dxi-data-grid-column>
70+
<dxi-data-grid-column dataField="Notes" [visible]="false">
71+
</dxi-data-grid-column>
6372
</dx-data-grid>
6473
</div>

‎packages/devextreme-angular/src/ui/data-grid/index.ts‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ import { DxiDataGridAsyncRuleModule } from 'devextreme-angular/ui/data-grid/nest
126126
import { DxoDataGridAtModule } from 'devextreme-angular/ui/data-grid/nested';
127127
import { DxoDataGridBoundaryOffsetModule } from 'devextreme-angular/ui/data-grid/nested';
128128
import { DxiDataGridButtonModule } from 'devextreme-angular/ui/data-grid/nested';
129+
import { DxiDataGridButtonItemModule } from 'devextreme-angular/ui/data-grid/nested';
130+
import { DxoDataGridButtonOptionsModule } from 'devextreme-angular/ui/data-grid/nested';
129131
import { DxiDataGridChangeModule } from 'devextreme-angular/ui/data-grid/nested';
130132
import { DxoDataGridColCountByScreenModule } from 'devextreme-angular/ui/data-grid/nested';
131133
import { DxoDataGridCollisionModule } from 'devextreme-angular/ui/data-grid/nested';
@@ -147,11 +149,13 @@ import { DxoDataGridDataGridHeaderFilterModule } from 'devextreme-angular/ui/dat
147149
import { DxoDataGridDataGridHeaderFilterSearchModule } from 'devextreme-angular/ui/data-grid/nested';
148150
import { DxoDataGridDataGridHeaderFilterTextsModule } from 'devextreme-angular/ui/data-grid/nested';
149151
import { DxoDataGridDataGridSelectionModule } from 'devextreme-angular/ui/data-grid/nested';
152+
import { DxiDataGridDataGridToolbarItemModule } from 'devextreme-angular/ui/data-grid/nested';
150153
import { DxoDataGridEditingModule } from 'devextreme-angular/ui/data-grid/nested';
151154
import { DxoDataGridEditingTextsModule } from 'devextreme-angular/ui/data-grid/nested';
152155
import { DxoDataGridEditorOptionsModule } from 'devextreme-angular/ui/data-grid/nested';
153156
import { DxiDataGridEditorOptionsButtonModule } from 'devextreme-angular/ui/data-grid/nested';
154157
import { DxiDataGridEmailRuleModule } from 'devextreme-angular/ui/data-grid/nested';
158+
import { DxiDataGridEmptyItemModule } from 'devextreme-angular/ui/data-grid/nested';
155159
import { DxoDataGridExportModule } from 'devextreme-angular/ui/data-grid/nested';
156160
import { DxoDataGridExportTextsModule } from 'devextreme-angular/ui/data-grid/nested';
157161
import { DxiDataGridFieldModule } from 'devextreme-angular/ui/data-grid/nested';
@@ -164,6 +168,7 @@ import { DxoDataGridFilterPanelTextsModule } from 'devextreme-angular/ui/data-gr
164168
import { DxoDataGridFilterRowModule } from 'devextreme-angular/ui/data-grid/nested';
165169
import { DxoDataGridFormModule } from 'devextreme-angular/ui/data-grid/nested';
166170
import { DxoDataGridFormatModule } from 'devextreme-angular/ui/data-grid/nested';
171+
import { DxiDataGridFormGroupItemModule } from 'devextreme-angular/ui/data-grid/nested';
167172
import { DxoDataGridFormItemModule } from 'devextreme-angular/ui/data-grid/nested';
168173
import { DxoDataGridFromModule } from 'devextreme-angular/ui/data-grid/nested';
169174
import { DxoDataGridGroupingModule } from 'devextreme-angular/ui/data-grid/nested';
@@ -200,12 +205,17 @@ import { DxoDataGridSearchModule } from 'devextreme-angular/ui/data-grid/nested'
200205
import { DxoDataGridSearchPanelModule } from 'devextreme-angular/ui/data-grid/nested';
201206
import { DxoDataGridSelectionModule } from 'devextreme-angular/ui/data-grid/nested';
202207
import { DxoDataGridShowModule } from 'devextreme-angular/ui/data-grid/nested';
208+
import { DxiDataGridSimpleItemModule } from 'devextreme-angular/ui/data-grid/nested';
203209
import { DxiDataGridSortByGroupSummaryInfoModule } from 'devextreme-angular/ui/data-grid/nested';
204210
import { DxoDataGridSortingModule } from 'devextreme-angular/ui/data-grid/nested';
205211
import { DxoDataGridStateStoringModule } from 'devextreme-angular/ui/data-grid/nested';
206212
import { DxiDataGridStringLengthRuleModule } from 'devextreme-angular/ui/data-grid/nested';
207213
import { DxoDataGridSummaryModule } from 'devextreme-angular/ui/data-grid/nested';
208214
import { DxoDataGridSummaryTextsModule } from 'devextreme-angular/ui/data-grid/nested';
215+
import { DxiDataGridTabModule } from 'devextreme-angular/ui/data-grid/nested';
216+
import { DxiDataGridTabbedItemModule } from 'devextreme-angular/ui/data-grid/nested';
217+
import { DxoDataGridTabPanelOptionsModule } from 'devextreme-angular/ui/data-grid/nested';
218+
import { DxiDataGridTabPanelOptionsItemModule } from 'devextreme-angular/ui/data-grid/nested';
209219
import { DxoDataGridTextsModule } from 'devextreme-angular/ui/data-grid/nested';
210220
import { DxoDataGridToModule } from 'devextreme-angular/ui/data-grid/nested';
211221
import { DxoDataGridToolbarModule } from 'devextreme-angular/ui/data-grid/nested';
@@ -216,13 +226,14 @@ import { DxoDataGridValueFormatModule } from 'devextreme-angular/ui/data-grid/ne
216226
import {
217227
PROPERTY_TOKEN_validationRules,
218228
PROPERTY_TOKEN_buttons,
229+
PROPERTY_TOKEN_items,
219230
PROPERTY_TOKEN_changes,
220231
PROPERTY_TOKEN_columns,
221232
PROPERTY_TOKEN_customOperations,
222233
PROPERTY_TOKEN_fields,
223234
PROPERTY_TOKEN_groupItems,
224-
PROPERTY_TOKEN_items,
225235
PROPERTY_TOKEN_sortByGroupSummaryInfo,
236+
PROPERTY_TOKEN_tabs,
226237
PROPERTY_TOKEN_toolbarItems,
227238
PROPERTY_TOKEN_totalItems,
228239
} from 'devextreme-angular/core/tokens';
@@ -257,6 +268,11 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
257268
this.setChildren('buttons', value);
258269
}
259270

271+
@ContentChildren(PROPERTY_TOKEN_items)
272+
set _itemsContentChildren(value: QueryList<CollectionNestedOption>) {
273+
this.setChildren('items', value);
274+
}
275+
260276
@ContentChildren(PROPERTY_TOKEN_changes)
261277
set _changesContentChildren(value: QueryList<CollectionNestedOption>) {
262278
this.setChildren('changes', value);
@@ -282,16 +298,16 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
282298
this.setChildren('groupItems', value);
283299
}
284300

285-
@ContentChildren(PROPERTY_TOKEN_items)
286-
set _itemsContentChildren(value: QueryList<CollectionNestedOption>) {
287-
this.setChildren('items', value);
288-
}
289-
290301
@ContentChildren(PROPERTY_TOKEN_sortByGroupSummaryInfo)
291302
set _sortByGroupSummaryInfoContentChildren(value: QueryList<CollectionNestedOption>) {
292303
this.setChildren('sortByGroupSummaryInfo', value);
293304
}
294305

306+
@ContentChildren(PROPERTY_TOKEN_tabs)
307+
set _tabsContentChildren(value: QueryList<CollectionNestedOption>) {
308+
this.setChildren('tabs', value);
309+
}
310+
295311
@ContentChildren(PROPERTY_TOKEN_toolbarItems)
296312
set _toolbarItemsContentChildren(value: QueryList<CollectionNestedOption>) {
297313
this.setChildren('toolbarItems', value);
@@ -2422,6 +2438,8 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
24222438
DxoDataGridAtModule,
24232439
DxoDataGridBoundaryOffsetModule,
24242440
DxiDataGridButtonModule,
2441+
DxiDataGridButtonItemModule,
2442+
DxoDataGridButtonOptionsModule,
24252443
DxiDataGridChangeModule,
24262444
DxoDataGridColCountByScreenModule,
24272445
DxoDataGridCollisionModule,
@@ -2443,11 +2461,13 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
24432461
DxoDataGridDataGridHeaderFilterSearchModule,
24442462
DxoDataGridDataGridHeaderFilterTextsModule,
24452463
DxoDataGridDataGridSelectionModule,
2464+
DxiDataGridDataGridToolbarItemModule,
24462465
DxoDataGridEditingModule,
24472466
DxoDataGridEditingTextsModule,
24482467
DxoDataGridEditorOptionsModule,
24492468
DxiDataGridEditorOptionsButtonModule,
24502469
DxiDataGridEmailRuleModule,
2470+
DxiDataGridEmptyItemModule,
24512471
DxoDataGridExportModule,
24522472
DxoDataGridExportTextsModule,
24532473
DxiDataGridFieldModule,
@@ -2460,6 +2480,7 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
24602480
DxoDataGridFilterRowModule,
24612481
DxoDataGridFormModule,
24622482
DxoDataGridFormatModule,
2483+
DxiDataGridFormGroupItemModule,
24632484
DxoDataGridFormItemModule,
24642485
DxoDataGridFromModule,
24652486
DxoDataGridGroupingModule,
@@ -2496,12 +2517,17 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
24962517
DxoDataGridSearchPanelModule,
24972518
DxoDataGridSelectionModule,
24982519
DxoDataGridShowModule,
2520+
DxiDataGridSimpleItemModule,
24992521
DxiDataGridSortByGroupSummaryInfoModule,
25002522
DxoDataGridSortingModule,
25012523
DxoDataGridStateStoringModule,
25022524
DxiDataGridStringLengthRuleModule,
25032525
DxoDataGridSummaryModule,
25042526
DxoDataGridSummaryTextsModule,
2527+
DxiDataGridTabModule,
2528+
DxiDataGridTabbedItemModule,
2529+
DxoDataGridTabPanelOptionsModule,
2530+
DxiDataGridTabPanelOptionsItemModule,
25052531
DxoDataGridTextsModule,
25062532
DxoDataGridToModule,
25072533
DxoDataGridToolbarModule,
@@ -2585,6 +2611,8 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
25852611
DxoDataGridAtModule,
25862612
DxoDataGridBoundaryOffsetModule,
25872613
DxiDataGridButtonModule,
2614+
DxiDataGridButtonItemModule,
2615+
DxoDataGridButtonOptionsModule,
25882616
DxiDataGridChangeModule,
25892617
DxoDataGridColCountByScreenModule,
25902618
DxoDataGridCollisionModule,
@@ -2606,11 +2634,13 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
26062634
DxoDataGridDataGridHeaderFilterSearchModule,
26072635
DxoDataGridDataGridHeaderFilterTextsModule,
26082636
DxoDataGridDataGridSelectionModule,
2637+
DxiDataGridDataGridToolbarItemModule,
26092638
DxoDataGridEditingModule,
26102639
DxoDataGridEditingTextsModule,
26112640
DxoDataGridEditorOptionsModule,
26122641
DxiDataGridEditorOptionsButtonModule,
26132642
DxiDataGridEmailRuleModule,
2643+
DxiDataGridEmptyItemModule,
26142644
DxoDataGridExportModule,
26152645
DxoDataGridExportTextsModule,
26162646
DxiDataGridFieldModule,
@@ -2623,6 +2653,7 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
26232653
DxoDataGridFilterRowModule,
26242654
DxoDataGridFormModule,
26252655
DxoDataGridFormatModule,
2656+
DxiDataGridFormGroupItemModule,
26262657
DxoDataGridFormItemModule,
26272658
DxoDataGridFromModule,
26282659
DxoDataGridGroupingModule,
@@ -2659,12 +2690,17 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
26592690
DxoDataGridSearchPanelModule,
26602691
DxoDataGridSelectionModule,
26612692
DxoDataGridShowModule,
2693+
DxiDataGridSimpleItemModule,
26622694
DxiDataGridSortByGroupSummaryInfoModule,
26632695
DxoDataGridSortingModule,
26642696
DxoDataGridStateStoringModule,
26652697
DxiDataGridStringLengthRuleModule,
26662698
DxoDataGridSummaryModule,
26672699
DxoDataGridSummaryTextsModule,
2700+
DxiDataGridTabModule,
2701+
DxiDataGridTabbedItemModule,
2702+
DxoDataGridTabPanelOptionsModule,
2703+
DxiDataGridTabPanelOptionsItemModule,
26682704
DxoDataGridTextsModule,
26692705
DxoDataGridToModule,
26702706
DxoDataGridToolbarModule,

0 commit comments

Comments
 (0)