Skip to content

Generate missing nesteds in DataGrid (vs 25_2_3) #32230

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 1 commit into
base: 25_2_3
Choose a base branch
from
+5,338 −357
Draft

Generate missing nesteds in DataGrid (vs 25_2_3) #32230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/devextreme-angular/src/core/tokens/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const PROPERTY_TOKEN_attachments = new InjectionToken<string>('property-t
export const PROPERTY_TOKEN_typingUsers = new InjectionToken<string>('property-token-typingUsers');
export const PROPERTY_TOKEN_ranges = new InjectionToken<string>('property-token-ranges');
export const PROPERTY_TOKEN_sortByGroupSummaryInfo = new InjectionToken<string>('property-token-sortByGroupSummaryInfo');
export const PROPERTY_TOKEN_groupItems = new InjectionToken<string>('property-token-groupItems');
export const PROPERTY_TOKEN_totalItems = new InjectionToken<string>('property-token-totalItems');
export const PROPERTY_TOKEN_commands = new InjectionToken<string>('property-token-commands');
export const PROPERTY_TOKEN_connectionPoints = new InjectionToken<string>('property-token-connectionPoints');
Expand All @@ -41,4 +42,3 @@ export const PROPERTY_TOKEN_views = new InjectionToken<string>('property-token-v
export const PROPERTY_TOKEN_layers = new InjectionToken<string>('property-token-layers');
export const PROPERTY_TOKEN_legends = new InjectionToken<string>('property-token-legends');
export const PROPERTY_TOKEN_center = new InjectionToken<string>('property-token-center');
export const PROPERTY_TOKEN_groupItems = new InjectionToken<string>('property-token-groupItems');
77 changes: 46 additions & 31 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,37 +204,38 @@ 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 { DxiDataGridSummaryGroupItemModule } 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';
import { DxiDataGridToolbarItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridTotalItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridValidationRuleModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxoDataGridValueFormatModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridButtonItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridEmptyItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridSimpleItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridTabbedItemModule } from 'devextreme-angular/ui/data-grid/nested';
import { DxiDataGridTabModule } from 'devextreme-angular/ui/data-grid/nested';
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_groupItems,
PROPERTY_TOKEN_tabs,
PROPERTY_TOKEN_toolbarItems,
PROPERTY_TOKEN_totalItems,
PROPERTY_TOKEN_tabs,
} from 'devextreme-angular/core/tokens';


Expand Down Expand Up @@ -263,6 +268,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 @@ -283,19 +293,19 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
this.setChildren('fields', value);
}

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

@ContentChildren(PROPERTY_TOKEN_groupItems)
set _groupItemsContentChildren(value: QueryList<CollectionNestedOption>) {
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)
Expand All @@ -308,11 +318,6 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
this.setChildren('totalItems', value);
}

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

instance: DxDataGrid<TRowData, TKey> = null;

/**
Expand Down Expand Up @@ -2433,6 +2438,8 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridAtModule,
DxoDataGridBoundaryOffsetModule,
DxiDataGridButtonModule,
DxiDataGridButtonItemModule,
DxoDataGridButtonOptionsModule,
DxiDataGridChangeModule,
DxoDataGridColCountByScreenModule,
DxoDataGridCollisionModule,
Expand All @@ -2454,11 +2461,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 @@ -2507,24 +2516,25 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridSearchPanelModule,
DxoDataGridSelectionModule,
DxoDataGridShowModule,
DxiDataGridSimpleItemModule,
DxiDataGridSortByGroupSummaryInfoModule,
DxoDataGridSortingModule,
DxoDataGridStateStoringModule,
DxiDataGridStringLengthRuleModule,
DxoDataGridSummaryModule,
DxiDataGridSummaryGroupItemModule,
DxoDataGridSummaryTextsModule,
DxiDataGridTabModule,
DxiDataGridTabbedItemModule,
DxoDataGridTabPanelOptionsModule,
DxiDataGridTabPanelOptionsItemModule,
DxoDataGridTextsModule,
DxoDataGridToModule,
DxoDataGridToolbarModule,
DxiDataGridToolbarItemModule,
DxiDataGridTotalItemModule,
DxiDataGridValidationRuleModule,
DxoDataGridValueFormatModule,
DxiDataGridButtonItemModule,
DxiDataGridEmptyItemModule,
DxiDataGridSimpleItemModule,
DxiDataGridTabbedItemModule,
DxiDataGridTabModule,
DxIntegrationModule,
DxTemplateModule
],
Expand Down Expand Up @@ -2601,6 +2611,8 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridAtModule,
DxoDataGridBoundaryOffsetModule,
DxiDataGridButtonModule,
DxiDataGridButtonItemModule,
DxoDataGridButtonOptionsModule,
DxiDataGridChangeModule,
DxoDataGridColCountByScreenModule,
DxoDataGridCollisionModule,
Expand All @@ -2622,11 +2634,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 @@ -2675,24 +2689,25 @@ export class DxDataGridComponent<TRowData = any, TKey = any> extends DxComponent
DxoDataGridSearchPanelModule,
DxoDataGridSelectionModule,
DxoDataGridShowModule,
DxiDataGridSimpleItemModule,
DxiDataGridSortByGroupSummaryInfoModule,
DxoDataGridSortingModule,
DxoDataGridStateStoringModule,
DxiDataGridStringLengthRuleModule,
DxoDataGridSummaryModule,
DxiDataGridSummaryGroupItemModule,
DxoDataGridSummaryTextsModule,
DxiDataGridTabModule,
DxiDataGridTabbedItemModule,
DxoDataGridTabPanelOptionsModule,
DxiDataGridTabPanelOptionsItemModule,
DxoDataGridTextsModule,
DxoDataGridToModule,
DxoDataGridToolbarModule,
DxiDataGridToolbarItemModule,
DxiDataGridTotalItemModule,
DxiDataGridValidationRuleModule,
DxoDataGridValueFormatModule,
DxiDataGridButtonItemModule,
DxiDataGridEmptyItemModule,
DxiDataGridSimpleItemModule,
DxiDataGridTabbedItemModule,
DxiDataGridTabModule,
DxTemplateModule
]
})
Expand Down
Loading
Loading