Skip to content

Commit c3925bb

Browse files
GusevAlexander-DevExpressGusevAlexander-DevExpress
authored
Merge pull request #11 from DevExpress-Examples/revert-10-25.2.5+
Revert 10 25.2.5+
2 parents 64bab85 + 6d13e48 commit c3925bb

9 files changed

Lines changed: 168 additions & 251 deletions

File tree

‎CS/GridWithContextMenu/Data/GridContextMenuHelper.cs‎

Lines changed: 146 additions & 168 deletions
Large diffs are not rendered by default.

‎CS/GridWithContextMenu/Data/WeatherForecastService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public enum Summaries {
88
public Task<List<WeatherForecast>> GetForecastAsync() {
99
if (Forecasts == null) {
1010
var rnd = new Random();
11-
Forecasts = Enumerable.Range(1, 25).Select(index => new WeatherForecast {
11+
Forecasts = Enumerable.Range(1, 5).Select(index => new WeatherForecast {
1212
ID = index,
1313
Date = DateTime.Today.AddDays(index),
1414
TemperatureC = rnd.Next(-20, 55),

‎CS/GridWithContextMenu/GridWithContextMenu.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<Folder Include="wwwroot\images\" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="DevExpress.Blazor" Version="25.2.5" />
11+
<PackageReference Include="DevExpress.Blazor" Version="25.1.3" />
1212
</ItemGroup>
1313
</Project>

‎CS/GridWithContextMenu/Pages/GridContextMenuContainer.razor‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
@using GridWithContextMenu.Data
22
@using System.Collections
33

4-
<DxContextMenu @ref="CustomContextMenu"
5-
Data="CustomContextMenuData"
6-
ItemClick="CustomContextMenu_ItemClick">
4+
<DxContextMenu @ref="ColumnContextMenu"
5+
Data="ColumnContextMenuData"
6+
ItemClick="ColumnContextMenu_ItemClick">
77
<DataMappings>
88
<DxContextMenuDataMapping Text="@nameof(ContextMenuItem.Text)"
99
Visible="@nameof(ContextMenuItem.Visible)"
@@ -28,26 +28,28 @@
2828
</DxContextMenu>
2929

3030
@code {
31-
DxContextMenu CustomContextMenu { get; set; }
31+
DxContextMenu ColumnContextMenu { get; set; }
3232
DxContextMenu RowContextMenu { get; set; }
3333

34-
IEnumerable CustomContextMenuData { get; set; }
34+
IEnumerable ColumnContextMenuData { get; set; }
3535
IEnumerable RowContextMenuData { get; set; }
3636

37+
IGridColumn ContextMenuColumn { get; set; }
3738
int ContextMenuRowIndex { get; set; }
3839

3940
[Parameter] public IGrid Grid { get; set; }
4041

41-
async Task CustomContextMenu_ItemClick(ContextMenuItemClickEventArgs e)
42-
=> await GridContextMenuHelper.ProcessCustomMenuItemClick((ContextMenuItem)e.ItemInfo.DataItem, Grid);
42+
void ColumnContextMenu_ItemClick(ContextMenuItemClickEventArgs e)
43+
=> GridContextMenuHelper.ProcessColumnMenuItemClick((ContextMenuItem)e.ItemInfo.DataItem, ContextMenuColumn, Grid);
4344

4445
async Task RowContextMenu_ItemClick(ContextMenuItemClickEventArgs e)
4546
=> await GridContextMenuHelper.ProcessRowMenuItemClickAsync((ContextMenuItem)e.ItemInfo.DataItem, ContextMenuRowIndex, Grid);
4647

4748
public async Task Grid_ContextMenu(GridCustomizeElementEventArgs e, MouseEventArgs mouseArgs) {
48-
if(GridContextMenuHelper.IsCustomContextMenuElement(e.ElementType)) {
49-
CustomContextMenuData = GridContextMenuHelper.GetCustomItems(e);
50-
await CustomContextMenu.ShowAsync(mouseArgs);
49+
if(GridContextMenuHelper.IsColumnContextMenuElement(e.ElementType)) {
50+
ContextMenuColumn = e.Column;
51+
ColumnContextMenuData = GridContextMenuHelper.GetColumnItems(e);
52+
await ColumnContextMenu.ShowAsync(mouseArgs);
5153
}
5254
if(GridContextMenuHelper.IsRowContextMenuElement(e.ElementType)) {
5355
ContextMenuRowIndex = e.VisibleIndex;

‎CS/GridWithContextMenu/Pages/Index.razor‎

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,41 +6,16 @@
66
<DxGrid @ref="Grid"
77
Data="GridData"
88
EditMode="GridEditMode.EditRow"
9-
@bind-SearchText="GridSearchText"
109
CssClass="mw-1100"
1110
CustomizeElement="Grid_CustomizeElement"
11+
@oncontextmenu:preventDefault
1212
EditModelSaving="Grid_EditModelSaving"
13-
DataItemDeleting="Grid_DataItemDeleting"
14-
ContextMenus="GridContextMenus.All"
15-
CustomizeContextMenu="Grid_CustomizeContextMenu"
16-
@oncontextmenu:preventDefault>
17-
<ToolbarTemplate>
18-
<DxToolbar ItemRenderStyleMode="ToolbarRenderStyleMode.Plain">
19-
<DxToolbarItem Text="New" Click="NewItem_Click" />
20-
<DxToolbarItem Text="Column Chooser" BeginGroup="true" Click="ColumnChooserItem_Click" />
21-
<DxToolbarItem Text="Export">
22-
<Items>
23-
<DxToolbarItem Text="To CSV" Click="ExportCsvItem_Click" />
24-
<DxToolbarItem Text="To XLSX" Click="ExportXlsxItem_Click" />
25-
<DxToolbarItem Text="To XLS" Click="ExportXlsItem_Click" />
26-
<DxToolbarItem Text="To PDF" Click="ExportPdfItem_Click" />
27-
</Items>
28-
</DxToolbarItem>
29-
<DxToolbarItem BeginGroup="true">
30-
<Template Context="toolbar_item_context">
31-
<DxSearchBox @bind-Text="GridSearchText"
32-
BindValueMode="BindValueMode.OnInput"
33-
ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto"
34-
aria-label="Search" />
35-
</Template>
36-
</DxToolbarItem>
37-
</DxToolbar>
38-
</ToolbarTemplate>
13+
DataItemDeleting="Grid_DataItemDeleting">
3914
<Columns>
40-
<DxGridDataColumn FieldName="Date" />
15+
<DxGridDataColumn FieldName="Date" SortIndex="0" />
4116
<DxGridDataColumn FieldName="TemperatureC" />
4217
<DxGridDataColumn FieldName="TemperatureF" />
43-
<DxGridDataColumn FieldName="Summary" GroupIndex="0" />
18+
<DxGridDataColumn FieldName="Summary" />
4419
</Columns>
4520
<TotalSummary>
4621
<DxGridSummaryItem SummaryType="GridSummaryItemType.Avg" FieldName="TemperatureC" />
@@ -53,15 +28,11 @@
5328
IGrid Grid { get; set; }
5429
GridContextMenuContainer ContextMenuContainer { get; set; }
5530
object GridData { get; set; }
56-
string GridSearchText = "";
57-
const string ExportFileName = "ExportResult";
5831

5932
protected override async Task OnInitializedAsync() {
6033
GridData = await ForecastService.GetForecastAsync();
6134
}
6235

63-
void Grid_CustomizeContextMenu(GridCustomizeContextMenuEventArgs args) => GridContextMenuHelper.CustomizeContextMenu(args);
64-
6536
void Grid_CustomizeElement(GridCustomizeElementEventArgs e) {
6637
if(GridContextMenuHelper.IsContextMenuElement(e.ElementType)) {
6738
e.Attributes["oncontextmenu"] = EventCallback.Factory.Create<MouseEventArgs>(
@@ -80,11 +51,4 @@
8051
await ForecastService.Remove(item);
8152
}
8253
}
83-
84-
async Task NewItem_Click() => await Grid.StartEditNewRowAsync();
85-
void ColumnChooserItem_Click(ToolbarItemClickEventArgs e) => Grid.ShowColumnChooser();
86-
async Task ExportXlsxItem_Click() => await Grid.ExportToXlsxAsync(ExportFileName);
87-
async Task ExportXlsItem_Click() => await Grid.ExportToXlsAsync(ExportFileName);
88-
async Task ExportCsvItem_Click() => await Grid.ExportToCsvAsync(ExportFileName);
89-
async Task ExportPdfItem_Click() => await Grid.ExportToPdfAsync(ExportFileName);
9054
}

‎CS/GridWithContextMenu/Properties/launchSettings.json‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎CS/GridWithContextMenu/wwwroot/css/icons.css‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
.grid-context-menu-item-collapse-detail-row,
3232
.grid-context-menu-item-new-row,
3333
.grid-context-menu-item-edit-row,
34-
.grid-context-menu-item-delete-row,
35-
.grid-context-menu-item-export {
34+
.grid-context-menu-item-delete-row {
3635
width: 16px;
3736
height: 16px;
3837
background-repeat: no-repeat;
@@ -59,8 +58,7 @@
5958
.dropdown-item:active .grid-context-menu-item-collapse-detail-row,
6059
.dropdown-item:active .grid-context-menu-item-new-row,
6160
.dropdown-item:active .grid-context-menu-item-edit-row,
62-
.dropdown-item:active .grid-context-menu-item-delete-row,
63-
.dropdown-item:active .grid-context-menu-item-export {
61+
.dropdown-item:active .grid-context-menu-item-delete-row {
6462
background-color: white;
6563
}
6664

@@ -80,8 +78,7 @@
8078
.dropdown-item.disabled .grid-context-menu-item-collapse-detail-row,
8179
.dropdown-item.disabled .grid-context-menu-item-new-row,
8280
.dropdown-item.disabled .grid-context-menu-item-edit-row,
83-
.dropdown-item.disabled .grid-context-menu-item-delete-row,
84-
.dropdown-item.disabled .grid-context-menu-item-export {
81+
.dropdown-item.disabled .grid-context-menu-item-delete-row {
8582
background-color: #c3c2c2;
8683
}
8784

@@ -169,10 +166,6 @@
169166
mask-image: url(../images/icons/delete-row.svg);
170167
-webkit-mask-image: url(../images/icons/delete-row.svg);
171168
}
172-
.grid-context-menu-item-export {
173-
mask-image: url(../images/icons/export-grid.svg);
174-
-webkit-mask-image: url(../images/icons/export-grid.svg);
175-
}
176169

177170

178171
.grid-context-menu-item-filter-row,

‎CS/GridWithContextMenu/wwwroot/images/icons/export-grid.svg‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- default badges list -->
2-
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/520791644/25.2.5%2B)
2+
![](https://img.shields.io/endpoint?url=https://codecentral.devexpress.com/api/v1/VersionRange/520791644/25.1.3%2B)
33
[![](https://img.shields.io/badge/Open_in_DevExpress_Support_Center-FF7200?style=flat-square&logo=DevExpress&logoColor=white)](https://supportcenter.devexpress.com/ticket/details/T1106945)
44
[![](https://img.shields.io/badge/📖_How_to_use_DevExpress_Examples-e9f6fc?style=flat-square)](https://docs.devexpress.com/GeneralInformation/403183)
55
[![](https://img.shields.io/badge/💬_Leave_Feedback-feecdd?style=flat-square)](#does-this-example-address-your-development-requirementsobjectives)

0 commit comments

Comments
 (0)