Skip to content

Commit 4ae007d

Browse files
Revert "Merge example changes from main branch"
This reverts commit 15ba84f, reversing changes made to 9d263c0.
1 parent 9180a14 commit 4ae007d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+147
-39362
lines changed

ASP.NET Core/Views/Home/Index.cshtml

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,29 @@
1-
<div class="demo-header">
2-
<h3>DataGrid - Select multiple items and drag'n'drop</h3>
3-
<div id="toggle-container">
4-
<span>Clear selection after drop</span>
5-
@(Html.DevExtreme().Switch().ID("clearAfterDropSwitch"))
6-
</div>
7-
</div>
8-
@(Html.DevExtreme().TabPanel()
9-
.Items(tabs => {
10-
tabs.Add().Title("Plain Data")
11-
.Template(@<text>
12-
<div>
13-
@(await Html.PartialAsync("../PartialViews/DataGridLocal"))
14-
</div>
15-
</text>);
16-
tabs.Add().Title("Hierarchical Data")
17-
.Template(@<text>
18-
<div>
19-
@(await Html.PartialAsync("../PartialViews/DataGridRemote"))
20-
</div>
21-
</text>);
1+
@using ASP_NET_Core.Models
2+
3+
<h2>Home</h2>
4+
5+
@(Html.DevExtreme().DataGrid<SampleOrder>()
6+
.ShowBorders(true)
7+
.DataSource(d => d.Mvc().Controller("SampleData").LoadAction("Get").Key("OrderID"))
8+
.Columns(columns => {
9+
columns.AddFor(m => m.OrderID);
10+
columns.AddFor(m => m.OrderDate);
11+
columns.AddFor(m => m.CustomerName);
12+
columns.AddFor(m => m.ShipCountry);
13+
columns.AddFor(m => m.ShipCity);
2214
})
15+
.Paging(p => p.PageSize(10))
16+
.FilterRow(f => f.Visible(true))
17+
.HeaderFilter(f => f.Visible(true))
18+
.GroupPanel(p => p.Visible(true))
19+
.Grouping(g => g.AutoExpandAll(false))
20+
.RemoteOperations(true)
21+
.Summary(s => s
22+
.TotalItems(totalItems => {
23+
totalItems.AddFor(m => m.ShipCity).SummaryType(SummaryType.Count);
24+
})
25+
.GroupItems(groupItems => {
26+
groupItems.Add().SummaryType(SummaryType.Count);
27+
})
28+
)
2329
)

ASP.NET Core/Views/PartialViews/DataGridLocal.cshtml

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

ASP.NET Core/Views/PartialViews/DataGridRemote.cshtml

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

ASP.NET Core/Views/Shared/_Layout.cshtml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<link rel="stylesheet" href="~/css/vendor.css" asp-append-version="true" />
1818
<link rel="stylesheet" href="~/css/Site.css" />
1919
<script src="~/js/vendor.js" asp-append-version="true"></script>
20-
<script src="~/js/LocalDataArray.js"></script>
21-
<script src="~/js/GridLocal.js"></script>
22-
<script src="~/js/GridRemote.js"></script>
2320
</head>
2421

2522
<body class="dx-viewport">

ASP.NET Core/wwwroot/css/Site.css

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,7 @@
11
.demo-container {
2-
margin: 50px 50px;
3-
width: 90vh;
2+
margin: 50px;
3+
width: 90vw;
44
}
55
body {
66
margin: 8px;
77
}
8-
.tab-item-content {
9-
margin: auto;
10-
}
11-
12-
.demo-header {
13-
display: flex;
14-
justify-content: space-between;
15-
}
16-
17-
#toggle-container {
18-
padding-top: 20px;
19-
}
20-
21-
#clearAfterDropSwitch {
22-
vertical-align: text-bottom;
23-
}
24-
25-
#toggle-container span {
26-
padding-right: 10px;
27-
}
28-
29-
.drag-container {
30-
padding: 10px;
31-
}
32-
33-
.drag-container td {
34-
padding: 0px 10px 0px 10px;
35-
}
-166 KB
Binary file not shown.
-83.7 KB
Binary file not shown.
-62.8 KB
Binary file not shown.
-168 KB
Binary file not shown.
-83.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)