Skip to content

Commit b3e5819

Browse files
authored
Merge branch 'hotfix/hotfix-v26.1.35' into ej2-890682-img
2 parents 9495506 + 4e4a87f commit b3e5819

File tree

12 files changed

+105
-21
lines changed

12 files changed

+105
-21
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
title: Essential Studio for ##Platform_Name## Weekly Release Release Notes
3+
description: Essential Studio for ##Platform_Name## Weekly Release Release Notes
4+
platform: ej2-asp-core-mvc
5+
documentation: ug
6+
---
7+
8+
# Essential Studio for ##Platform_Name## Release Notes
9+
10+
{% include release-info.html date="June 19, 2024" version="v26.1.38" %}
11+
12+
{% directory path: _includes/release-notes/v26.1.38 %}
13+
14+
{% include {{file.url}} %}
15+
16+
{% enddirectory %}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
public IActionResult Open(IFormCollection openRequest)
2+
{
3+
OpenRequest open = new OpenRequest();
4+
open.File = openRequest.Files[0];
5+
return Content(Workbook.Open(open));
6+
}
7+
8+
public void Save(SaveSettings saveSettings)
9+
{
10+
Workbook.Save(saveSettings);
11+
}
12+
13+
public IActionResult Index()
14+
{
15+
List<object> defaultData = new List<object>()
16+
{
17+
new { CustomerName= "Romona Heaslip", Model= "Taurus", Color= "Aquamarine", PaymentMode= "Debit Card", DeliveryDate= "07/11/2015", Amount= "8529.22" },
18+
new { CustomerName= "Clare Batterton", Model= "Sparrow", Color= "Pink", PaymentMode= "Cash On Delivery", DeliveryDate= "7/13/2016", Amount= "17866.19" },
19+
new { CustomerName= "Eamon Traise", Model= "Grand Cherokee", Color= "Blue", PaymentMode= "Net Banking", DeliveryDate= "09/04/2015", Amount= "13853.09" },
20+
new { CustomerName= "Julius Gorner", Model= "GTO", Color= "Aquamarine", PaymentMode= "Credit Card", DeliveryDate= "12/15/2017", Amount= "2338.74" },
21+
new { CustomerName= "Jenna Schoolfield", Model= "LX", Color= "Yellow", PaymentMode= "Credit Card", DeliveryDate= "10/08/2014", Amount= "9578.45" },
22+
new { CustomerName= "Marylynne Harring", Model= "Catera", Color= "Green", PaymentMode= "Cash On Delivery", DeliveryDate= "7/01/2017", Amount= "19141.62" },
23+
new { CustomerName= "Vilhelmina Leipelt", Model= "7 Series", Color= "Goldenrod", PaymentMode= "Credit Card", DeliveryDate= "12/20/2015", Amount= "6543.30" },
24+
new { CustomerName= "Barby Heisler", Model= "Corvette", Color= "Red", PaymentMode= "Credit Card", DeliveryDate= "11/24/2014", Amount= "13035.06" },
25+
new { CustomerName= "Karyn Boik", Model= "Regal", Color= "Indigo", PaymentMode= "Debit Card", DeliveryDate= "05/12/2014", Amount= "18488.80" },
26+
new { CustomerName= "Jeanette Pamplin", Model= "S4", Color= "Fuscia", PaymentMode= "Net Banking", DeliveryDate= "12/30/2014", Amount= "12317.04" },
27+
new { CustomerName= "Cristi Espinos", Model= "TL", Color= "Aquamarine", PaymentMode= "Credit Card", DeliveryDate= "12/18/2013", Amount= "6230.13" },
28+
new { CustomerName= "Issy Humm", Model= "Club Wagon", Color= "Pink", PaymentMode= "Cash On Delivery", DeliveryDate= "02/02/2015", Amount= "9709.49" },
29+
new { CustomerName= "Tuesday Fautly", Model= "V8 Vantage", Color= "Crimson", PaymentMode= "Debit Card", DeliveryDate= "11/19/2014", Amount= "9766.10" },
30+
new { CustomerName= "Rosemaria Thomann", Model= "Caravan", Color= "Violet", PaymentMode= "Net Banking", DeliveryDate= "02/08/2014", Amount= "7685.49" },
31+
};
32+
ViewBag.DefaultData = defaultData;
33+
string[] fieldOrder = new string[] { "CustomerName", "PaymentMode", "Model", "Color", "Amount", "DeliveryDate" };
34+
ViewBag.Order = fieldOrder;
35+
return View();
36+
37+
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@Html.EJS().Spreadsheet("spreadsheet").Sheets(sheet => {
2+
sheet.Name("Price Details").Ranges(ranges => {
3+
ranges.DataSource((IEnumerable<object>)ViewBag.DefaultData).FieldsOrder(ViewBag.Order).Add();
4+
}).Add();
5+
}).Render()
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<ejs-spreadsheet id="spreadsheet" openUrl="Home/Open" saveUrl="Home/Save">
2+
<e-spreadsheet-sheets>
3+
<e-spreadsheet-sheet name="Price Details">
4+
<e-spreadsheet-ranges>
5+
<e-spreadsheet-range dataSource="ViewBag.DefaultData" fieldsOrder="ViewBag.Order"></e-spreadsheet-range>
6+
</e-spreadsheet-ranges>
7+
</e-spreadsheet-sheet>
8+
</e-spreadsheet-sheets>
9+
</ejs-spreadsheet>

ej2-asp-core-mvc/diagram/connectors.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ diagram.remove(connectors)
102102

103103
## Add collection of connectors at runtime
104104

105-
* The collection of connectors can be dynamically added using 'addElements' method.Each time an element is added to the diagram canvas, the 'collectionChange' event will be triggered.
105+
* The collection of connectors can be dynamically added using `addElements` method.Each time an element is added to the diagram canvas, the `collectionChange` event will be triggered.
106+
107+
{% if page.publishingplatform == "aspnet-core" %}
106108

107109
{% tabs %}
108110
{% highlight cshtml tabtitle="CSHTML" %}

ej2-asp-core-mvc/diagram/group.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ diagram.add(group);
126126

127127
## Add collection of group nodes at runtime
128128

129-
* The collection of group nodes can be dynamically added using 'addElements' method.Each time an element is added to the diagram canvas, the 'collectionChange' event will be triggered.
129+
* The collection of group nodes can be dynamically added using `addElements` method.Each time an element is added to the diagram canvas, the `collectionChange` event will be triggered.
130130

131131
{% if page.publishingplatform == "aspnet-core" %}
132132

ej2-asp-core-mvc/diagram/nodes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ diagram.add(node);
8282

8383
## Add collection of nodes at runtime
8484

85-
* The collection of nodes can be dynamically added using 'addElements' method.Each time an element is added to the diagram canvas, the 'collectionChange' event will be triggered.
85+
* The collection of nodes can be dynamically added using `addElements` method.Each time an element is added to the diagram canvas, the `collectionChange` event will be triggered.
8686

8787
{% if page.publishingplatform == "aspnet-core" %}
8888

ej2-asp-core-mvc/multicolumn-combobox/EJ2_ASP.MVC/virtualization.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The MultiColumn Combobox can generate its list items through an object arrays of
2222
{% highlight razor tabtitle="CSHTML" %}
2323
{% include code-snippet/multicolumn-combobox/virtualization/localdata/razor %}
2424
{% endhighlight %}
25-
{% highlight c# tabtitle="Sorting.cs" %}
25+
{% highlight c# tabtitle="LocalData.cs" %}
2626
{% include code-snippet/multicolumn-combobox/virtualization/localdata/localdata.cs %}
2727
{% endhighlight %}
2828
{% endtabs %}
@@ -35,10 +35,10 @@ The MultiColumn Combobox supports retrieval of data from remote data services wi
3535

3636
{% tabs %}
3737
{% highlight razor tabtitle="CSHTML" %}
38-
{% include code-snippet/multicolumn-combobox/virtualization/sort-order/razor %}
38+
{% include code-snippet/multicolumn-combobox/virtualization/remotedata/razor %}
3939
{% endhighlight %}
40-
{% highlight c# tabtitle="Sorting.cs" %}
41-
{% include code-snippet/multicolumn-combobox/virtualization/sort-order/sort-order.cs %}
40+
{% highlight c# tabtitle="RemoteData.cs" %}
41+
{% include code-snippet/multicolumn-combobox/virtualization/remotedata/remotedata.cs %}
4242
{% endhighlight %}
4343
{% endtabs %}
4444

ej2-asp-core-mvc/multicolumn-combobox/EJ2_ASP.NETCORE/virtualization.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ The MultiColumn Combobox supports retrieval of data from remote data services wi
3333

3434
{% tabs %}
3535
{% highlight cshtml tabtitle="CSHTML" %}
36-
{% include code-snippet/multicolumn-combobox/sorting/remotedata/tagHelper %}
36+
{% include code-snippet/multicolumn-combobox/virtualization/remotedata/tagHelper %}
3737
{% endhighlight %}
3838
{% highlight c# tabtitle="RemoteData.cs" %}
39-
{% include code-snippet/multicolumn-combobox/sorting/remotedata/remotedata.cs %}
39+
{% include code-snippet/multicolumn-combobox/virtualization/remotedata/remotedata.cs %}
4040
{% endhighlight %}
4141
{% endtabs %}

ej2-asp-core-mvc/spreadsheet/data-binding.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,31 @@ By default, when a data source is bound to a sheet, columns are auto-assigned fr
5555

5656
> You can customize the mapping of column data only in the local data binding support.
5757
58+
The following code example demonstrates how to customize the mapping of column data:
59+
60+
{% if page.publishingplatform == "aspnet-core" %}
61+
62+
{% tabs %}
63+
{% highlight cshtml tabtitle="CSHTML" %}
64+
{% include code-snippet/spreadsheet/field-mapping/tagHelper %}
65+
{% endhighlight %}
66+
{% highlight c# tabtitle="FieldMappingController.cs" %}
67+
{% include code-snippet/spreadsheet/field-mapping/fieldMappingController.cs %}
68+
{% endhighlight %}
69+
{% endtabs %}
70+
71+
{% elsif page.publishingplatform == "aspnet-mvc" %}
72+
73+
{% tabs %}
74+
{% highlight razor tabtitle="CSHTML" %}
75+
{% include code-snippet/spreadsheet/field-mapping/razor %}
76+
{% endhighlight %}
77+
{% highlight c# tabtitle="FieldMappingController.cs" %}
78+
{% include code-snippet/spreadsheet/field-mapping/fieldMappingController.cs %}
79+
{% endhighlight %}
80+
{% endtabs %}
81+
{% endif %}
82+
5883
## Remote data
5984

6085
To bind remote data to the Spreadsheet control, assign service data as an instance of `DataManager` to the `dataSource` property. To interact with remote data source, provide the service endpoint `url`.

0 commit comments

Comments
 (0)