Skip to content

Generate missing configuration components in DataGrid #32195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
alexslavr wants to merge 6 commits into
base: 25_2
Choose a base branch
from
+7,388 −199
Draft

Generate missing configuration components in DataGrid #32195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec5afb4
Resolve collisions in external config
alexslavr Jan 14, 2026
3608c92
Regenerate
alexslavr Jan 14, 2026
1daa462
Regenerate TreeList nesteds
alexslavr Jan 16, 2026
2538dd6
Do not rename Summary GroupItem
alexslavr Jan 20, 2026
2a6b20c
Regenerate all
alexslavr Jan 20, 2026
b709b7a
Migrate PopupEditing demo to new syntax
alexslavr Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 33 additions & 33 deletions apps/demos/Demos/DataGrid/PopupEditing/Angular/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,60 +5,60 @@
keyExpr="ID"
[showBorders]="true"
>
<dxo-paging [enabled]="false"></dxo-paging>
<dxo-editing
<dxo-data-grid-paging [enabled]="false"></dxo-data-grid-paging>
<dxo-data-grid-editing
mode="popup"
[allowUpdating]="true"
[allowAdding]="true"
[allowDeleting]="true"
>
<dxo-popup
<dxo-data-grid-popup
title="Employee Info"
[showTitle]="true"
[width]="700"
[height]="525"
>
</dxo-popup>
<dxo-form>
<dxi-item itemType="group" [colCount]="2" [colSpan]="2">
<dxi-item dataField="FirstName"></dxi-item>
<dxi-item dataField="LastName"></dxi-item>
<dxi-item dataField="Prefix"></dxi-item>
<dxi-item dataField="BirthDate"></dxi-item>
<dxi-item dataField="Position"></dxi-item>
<dxi-item dataField="HireDate"></dxi-item>
<dxi-item
</dxo-data-grid-popup>
<dxo-data-grid-form>
<dxi-data-grid-item itemType="group" [colCount]="2" [colSpan]="2">
<dxi-data-grid-item dataField="FirstName"></dxi-data-grid-item>
<dxi-data-grid-item dataField="LastName"></dxi-data-grid-item>
<dxi-data-grid-item dataField="Prefix"></dxi-data-grid-item>
<dxi-data-grid-item dataField="BirthDate"></dxi-data-grid-item>
<dxi-data-grid-item dataField="Position"></dxi-data-grid-item>
<dxi-data-grid-item dataField="HireDate"></dxi-data-grid-item>
<dxi-data-grid-item
dataField="Notes"
editorType="dxTextArea"
[colSpan]="2"
[editorOptions]="{ height: 100 }"
>
</dxi-item>
</dxi-item>
</dxi-data-grid-item>
</dxi-data-grid-item>

<dxi-item
<dxi-data-grid-item
itemType="group"
caption="Home Address"
[colCount]="2"
[colSpan]="2"
>
<dxi-item dataField="StateID"></dxi-item>
<dxi-item dataField="Address"></dxi-item>
</dxi-item>
</dxo-form>
</dxo-editing>
<dxi-data-grid-item dataField="StateID"></dxi-data-grid-item>
<dxi-data-grid-item dataField="Address"></dxi-data-grid-item>
</dxi-data-grid-item>
</dxo-data-grid-form>
</dxo-data-grid-editing>

<dxi-column dataField="Prefix" caption="Title" [width]="70"></dxi-column>
<dxi-column dataField="FirstName"></dxi-column>
<dxi-column dataField="LastName"></dxi-column>
<dxi-column dataField="BirthDate" dataType="date"> </dxi-column>
<dxi-column dataField="Position" [width]="170"> </dxi-column>
<dxi-column dataField="HireDate" dataType="date"> </dxi-column>
<dxi-column dataField="StateID" caption="State" [width]="125">
<dxo-lookup [dataSource]="states" displayExpr="Name" valueExpr="ID">
</dxo-lookup>
</dxi-column>
<dxi-column dataField="Address" [visible]="false"> </dxi-column>
<dxi-column dataField="Notes" [visible]="false"> </dxi-column>
<dxi-data-grid-column dataField="Prefix" caption="Title" [width]="70"></dxi-data-grid-column>
<dxi-data-grid-column dataField="FirstName"></dxi-data-grid-column>
<dxi-data-grid-column dataField="LastName"></dxi-data-grid-column>
<dxi-data-grid-column dataField="BirthDate" dataType="date"> </dxi-data-grid-column>
<dxi-data-grid-column dataField="Position" [width]="170"> </dxi-data-grid-column>
<dxi-data-grid-column dataField="HireDate" dataType="date"> </dxi-data-grid-column>
<dxi-data-grid-column dataField="StateID" caption="State" [width]="125">
<dxo-data-grid-lookup [dataSource]="states" displayExpr="Name" valueExpr="ID">
</dxo-data-grid-lookup>
</dxi-data-grid-column>
<dxi-data-grid-column dataField="Address" [visible]="false"> </dxi-data-grid-column>
<dxi-data-grid-column dataField="Notes" [visible]="false"> </dxi-data-grid-column>
</dx-data-grid>
</div>
45 changes: 39 additions & 6 deletions packages/devextreme-angular/src/ui/data-grid/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ import { DxiDataGridAsyncRuleModule } from 'devextreme-angular/ui/data-grid/nest
import { DxoDataGridAtModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridBoundaryOffsetModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridButtonModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridButtonItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridButtonOptionsModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridChangeModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridColCountByScreenModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridCollisionModule } from 'devextreme-angular/ui/data-grid/nested';
Expand All @@ -147,11 +149,13 @@ import { DxoDataGridDataGridHeaderFilterModule } from 'devextreme-angular/ui/dat
import { DxoDataGridDataGridHeaderFilterSearchModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridDataGridHeaderFilterTextsModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridDataGridSelectionModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridDataGridToolbarItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridEditingModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridEditingTextsModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridEditorOptionsModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridEditorOptionsButtonModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridEmailRuleModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridEmptyItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridExportModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridExportTextsModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridFieldModule } from 'devextreme-angular/ui/data-grid/nested';
Expand Down Expand Up @@ -200,12 +204,17 @@ import { DxoDataGridSearchModule } from 'devextreme-angular/ui/data-grid/nested'
import { DxoDataGridSearchPanelModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridSelectionModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridShowModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridSimpleItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridSortByGroupSummaryInfoModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridSortingModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridStateStoringModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridStringLengthRuleModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridSummaryModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridSummaryTextsModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridTabModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridTabbedItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridTabPanelOptionsModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridTabPanelOptionsItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridTextsModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridToModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridToolbarModule } from 'devextreme-angular/ui/data-grid/nested';
Expand All @@ -216,13 +225,14 @@ import { DxoDataGridValueFormatModule } from 'devextreme-angular/ui/data-grid/ne
import {
PROPERTY_TOKEN_validationRules,
PROPERTY_TOKEN_buttons,
PROPERTY_TOKEN_items,
PROPERTY_TOKEN_changes,
PROPERTY_TOKEN_columns,
PROPERTY_TOKEN_customOperations,
PROPERTY_TOKEN_fields,
PROPERTY_TOKEN_groupItems,
PROPERTY_TOKEN_items,
PROPERTY_TOKEN_sortByGroupSummaryInfo,
PROPERTY_TOKEN_tabs,
PROPERTY_TOKEN_toolbarItems,
PROPERTY_TOKEN_totalItems,
} from 'devextreme-angular/core/tokens';
Expand Down Expand Up @@ -257,6 +267,11 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
this.setChildren('buttons', value);
}

@ContentChildren(PROPERTY_TOKEN_items)
set _itemsContentChildren(value: QueryList<CollectionNestedOption>) {
this.setChildren('items', value);
}

@ContentChildren(PROPERTY_TOKEN_changes)
set _changesContentChildren(value: QueryList<CollectionNestedOption>) {
this.setChildren('changes', value);
Expand All @@ -282,16 +297,16 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
this.setChildren('groupItems', value);
}

@ContentChildren(PROPERTY_TOKEN_items)
set _itemsContentChildren(value: QueryList<CollectionNestedOption>) {
this.setChildren('items', value);
}

@ContentChildren(PROPERTY_TOKEN_sortByGroupSummaryInfo)
set _sortByGroupSummaryInfoContentChildren(value: QueryList<CollectionNestedOption>) {
this.setChildren('sortByGroupSummaryInfo', value);
}

@ContentChildren(PROPERTY_TOKEN_tabs)
set _tabsContentChildren(value: QueryList<CollectionNestedOption>) {
this.setChildren('tabs', value);
}

@ContentChildren(PROPERTY_TOKEN_toolbarItems)
set _toolbarItemsContentChildren(value: QueryList<CollectionNestedOption>) {
this.setChildren('toolbarItems', value);
Expand Down Expand Up @@ -2422,6 +2437,8 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridAtModule,
DxoDataGridBoundaryOffsetModule,
DxiDataGridButtonModule,
DxiDataGridButtonItemModule,
DxoDataGridButtonOptionsModule,
DxiDataGridChangeModule,
DxoDataGridColCountByScreenModule,
DxoDataGridCollisionModule,
Expand All @@ -2443,11 +2460,13 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridDataGridHeaderFilterSearchModule,
DxoDataGridDataGridHeaderFilterTextsModule,
DxoDataGridDataGridSelectionModule,
DxiDataGridDataGridToolbarItemModule,
DxoDataGridEditingModule,
DxoDataGridEditingTextsModule,
DxoDataGridEditorOptionsModule,
DxiDataGridEditorOptionsButtonModule,
DxiDataGridEmailRuleModule,
DxiDataGridEmptyItemModule,
DxoDataGridExportModule,
DxoDataGridExportTextsModule,
DxiDataGridFieldModule,
Expand Down Expand Up @@ -2496,12 +2515,17 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridSearchPanelModule,
DxoDataGridSelectionModule,
DxoDataGridShowModule,
DxiDataGridSimpleItemModule,
DxiDataGridSortByGroupSummaryInfoModule,
DxoDataGridSortingModule,
DxoDataGridStateStoringModule,
DxiDataGridStringLengthRuleModule,
DxoDataGridSummaryModule,
DxoDataGridSummaryTextsModule,
DxiDataGridTabModule,
DxiDataGridTabbedItemModule,
DxoDataGridTabPanelOptionsModule,
DxiDataGridTabPanelOptionsItemModule,
DxoDataGridTextsModule,
DxoDataGridToModule,
DxoDataGridToolbarModule,
Expand Down Expand Up @@ -2585,6 +2609,8 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridAtModule,
DxoDataGridBoundaryOffsetModule,
DxiDataGridButtonModule,
DxiDataGridButtonItemModule,
DxoDataGridButtonOptionsModule,
DxiDataGridChangeModule,
DxoDataGridColCountByScreenModule,
DxoDataGridCollisionModule,
Expand All @@ -2606,11 +2632,13 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridDataGridHeaderFilterSearchModule,
DxoDataGridDataGridHeaderFilterTextsModule,
DxoDataGridDataGridSelectionModule,
DxiDataGridDataGridToolbarItemModule,
DxoDataGridEditingModule,
DxoDataGridEditingTextsModule,
DxoDataGridEditorOptionsModule,
DxiDataGridEditorOptionsButtonModule,
DxiDataGridEmailRuleModule,
DxiDataGridEmptyItemModule,
DxoDataGridExportModule,
DxoDataGridExportTextsModule,
DxiDataGridFieldModule,
Expand Down Expand Up @@ -2659,12 +2687,17 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridSearchPanelModule,
DxoDataGridSelectionModule,
DxoDataGridShowModule,
DxiDataGridSimpleItemModule,
DxiDataGridSortByGroupSummaryInfoModule,
DxoDataGridSortingModule,
DxoDataGridStateStoringModule,
DxiDataGridStringLengthRuleModule,
DxoDataGridSummaryModule,
DxoDataGridSummaryTextsModule,
DxiDataGridTabModule,
DxiDataGridTabbedItemModule,
DxoDataGridTabPanelOptionsModule,
DxiDataGridTabPanelOptionsItemModule,
DxoDataGridTextsModule,
DxoDataGridToModule,
DxoDataGridToolbarModule,
Expand Down
Loading
Loading