Skip to content

Commit 199948c

Browse files
SyncfusionBuildSyncfusionBuild
authored
Merge pull request #3111 from Syncfusion-Content/hotfix/hotfix-v26.1.35
DOCINFRA-2341_merged_using_automation
2 parents 922e7e7 + 4af6b6c commit 199948c

Some content is hidden

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

49 files changed

+470
-52
lines changed

‎ej2-asp-core-mvc/auto-complete/disabled-items.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ The disableItem method can be used to handle dynamic changing in disable state o
5656

5757
If you want to disabled the overall component to set the [enabled](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.DropDowns.AutoComplete.html#Syncfusion_EJ2_DropDowns_AutoComplete_Enabled) property to false.
5858

59-
{% [Disabled AutoComplete Component](./images/autocomplete-disable.png)" %}
59+
![Disabled AutoComplete Component](./images/autocomplete-disable.png)

‎ej2-asp-core-mvc/code-snippet/image-editor/z-order/default.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
public ActionResult Default()
2+
{
3+
return View();
4+
}

‎ej2-asp-core-mvc/code-snippet/image-editor/z-order/razor

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<div class="col-lg-12 control-section e-img-editor-sample">
2+
@Html.EJS().ImageEditor("image-editor").Created("created").Render()
3+
</div>
4+
5+
<script>
6+
function created() {
7+
var imageEditorObj = ej.base.getComponent(document.getElementById('image-editor'), 'image-editor');
8+
if (ej.base.Browser.isDevice) {
9+
imageEditorObj.open('https://ej2.syncfusion.com/demos/src/image-editor/images/flower.png');
10+
} else {
11+
imageEditorObj.open('https://ej2.syncfusion.com/demos/src/image-editor/images/bridge.png');
12+
}
13+
}
14+
</script>
15+
16+
<style>
17+
.image-editor {
18+
margin: 0 auto;
19+
}
20+
21+
.e-img-editor-sample {
22+
height: 80vh;
23+
width: 100%;
24+
}
25+
26+
@@media only screen and (max-width: 700px) {
27+
.e-img-editor-sample {
28+
height: 75vh;
29+
width: 100%;
30+
}
31+
}
32+
33+
.control-wrapper {
34+
height: 100%;
35+
}
36+
</style>

‎ej2-asp-core-mvc/code-snippet/image-editor/z-order/tagHelper

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<div class="col-lg-12 control-section e-img-editor-sample">
2+
<ejs-imageeditor id="image-editor" created="created"></ejs-imageeditor>
3+
</div>
4+
5+
<script>
6+
function created() {
7+
var imageEditorObj = ej.base.getComponent(document.getElementById('image-editor'), 'image-editor');
8+
if (ej.base.Browser.isDevice) {
9+
imageEditorObj.open('https://ej2.syncfusion.com/demos/src/image-editor/images/flower.png');
10+
} else {
11+
imageEditorObj.open('https://ej2.syncfusion.com/demos/src/image-editor/images/bridge.png');
12+
}
13+
}
14+
</script>
15+
16+
<style>
17+
.image-editor {
18+
margin: 0 auto;
19+
}
20+
21+
.e-img-editor-sample {
22+
height: 80vh;
23+
width: 100%;
24+
}
25+
26+
@@media only screen and (max-width: 700px) {
27+
.e-img-editor-sample {
28+
height: 75vh;
29+
width: 100%;
30+
}
31+
}
32+
33+
.control-wrapper {
34+
height: 100%;
35+
}
36+
</style>

‎ej2-asp-core-mvc/code-snippet/query-builder/drag-and-drop/default.cs

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
public ActionResult Index()
2+
{
3+
QueryBuilderRule rule = new QueryBuilderRule()
4+
{
5+
Condition = "and",
6+
Rules = new List<QueryBuilderRule>()
7+
{
8+
new QueryBuilderRule { Label="Employee ID", Field="EmployeeID", Type="number", Operator="equal", Value = 1 },
9+
new QueryBuilderRule { Label="Title", Field="Title", Type="string", Operator="equal", Value = "Sales Manager" }
10+
}
11+
};
12+
13+
ViewBag.rule = rule;
14+
ViewBag.dataSource = EmployeeView.GetAllRecords();
15+
return View();
16+
}
17+
18+
public class EmployeeView
19+
{
20+
public EmployeeView()
21+
{
22+
23+
}
24+
public EmployeeView(int EmployeeID, string FirstName, string LastName, string Title, DateTime BirthDate, DateTime HireDate, int ReportsTo, string Address, string PostalCode, string Phone, string City, string Country)
25+
{
26+
this.EmployeeID = EmployeeID;
27+
this.FirstName = FirstName;
28+
this.LastName = LastName;
29+
this.Title = Title;
30+
this.BirthDate = BirthDate;
31+
this.HireDate = HireDate;
32+
this.ReportsTo = ReportsTo;
33+
this.Address = Address;
34+
this.PostalCode = PostalCode;
35+
this.Phone = Phone;
36+
this.City = City;
37+
this.Country = Country;
38+
39+
}
40+
public int EmployeeID { get; set; }
41+
public string FirstName { get; set; }
42+
public string LastName { get; set; }
43+
public string Title { get; set; }
44+
public DateTime BirthDate { get; set; }
45+
public DateTime HireDate { get; set; }
46+
47+
public int ReportsTo { get; set; }
48+
49+
public string Address { get; set; }
50+
public string PostalCode { get; set; }
51+
public string Phone { get; set; }
52+
public string City { get; set; }
53+
public string Country { get; set; }
54+
public static List<EmployeeView> GetAllRecords()
55+
{
56+
List<EmployeeView> Emp = new List<EmployeeView>();
57+
Emp.Add(new EmployeeView(1, "Nancy", "Davolio", "Sales Representative", new DateTime(1948, 12, 08), new DateTime(1992, 05, 01), 2, "507 - 20th Ave. E.Apt. 2A ", " 98122", "(206) 555-9857 ", "Seattle ", "USA"));
58+
Emp.Add(new EmployeeView(2, "Andrew", "Fuller", "Vice President, Sales", new DateTime(1952, 02, 19), new DateTime(1992, 08, 14), 4, "908 W. Capital Way", "98401 ", "(206) 555-9482 ", "Kirkland ", "USA"));
59+
Emp.Add(new EmployeeView(3, "Janet", "Leverling", "Sales Representative", new DateTime(1963, 08, 30), new DateTime(1992, 04, 01), 3, " 4110 Old Redmond Rd.", "98052 ", "(206) 555-8122", "Redmond ", "USA "));
60+
Emp.Add(new EmployeeView(4, "Margaret", "Peacock", "Sales Representative", new DateTime(1937, 09, 19), new DateTime(1993, 05, 03), 6, "14 Garrett Hill ", "SW1 8JR ", "(71) 555-4848 ", "London ", "UK "));
61+
Emp.Add(new EmployeeView(5, "Steven", "Buchanan", "Sales Manager", new DateTime(1955, 03, 04), new DateTime(1993, 10, 17), 8, "Coventry HouseMiner Rd. ", "EC2 7JR ", " (206) 555-8122", "Tacoma ", " USA"));
62+
Emp.Add(new EmployeeView(6, "Michael", "Suyama", "Sales Representative", new DateTime(1963, 07, 02), new DateTime(1993, 10, 17), 2, " 7 Houndstooth Rd.", " WG2 7LT", "(71) 555-4444 ", "London ", "UK "));
63+
Emp.Add(new EmployeeView(7, "Robert", "King", "Sales Representative", new DateTime(1960, 05, 29), new DateTime(1994, 01, 02), 7, "Edgeham HollowWinchester Way ", "RG1 9SP ", "(71) 555-5598 ", "London ", " UK"));
64+
Emp.Add(new EmployeeView(8, "Laura", "Callahan", "Inside Sales Coordinator", new DateTime(1958, 01, 09), new DateTime(1994, 03, 05), 9, "722 Moss Bay Blvd. ", "98033 ", " (206) 555-3412", "Seattle ", "USA "));
65+
Emp.Add(new EmployeeView(9, "Anne", "Dodsworth", "Sales Representative", new DateTime(1966, 01, 27), new DateTime(1994, 11, 15), 5, "4726 - 11th Ave. N.E. ", "98105 ", "(71) 555-5598 ", " London", "UK "));
66+
return Emp;
67+
}
68+
}

‎ej2-asp-core-mvc/code-snippet/query-builder/drag-and-drop/razor

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
@Html.EJS().QueryBuilder("querybuilder").Width("72%").Columns(col =>
2+
{
3+
col.Field("EmployeeID").Label("Employee ID").Type("number").Add();
4+
col.Field("FirstName").Label("First Name").Type("string").Add();
5+
col.Field("TitleOfCourtesy").Label("Title Of Courtesy").Type("boolean").Values(new List<string> { "Mr.", "Mrs." }).Add();
6+
col.Field("Title").Label("Title").Type("string").Add();
7+
col.Field("HireDate").Label("Hire Date").Type("date").Format("dd/MM/yyyy").Add();
8+
col.Field("Country").Label("Country").Type("string").Add();
9+
col.Field("City").Label("City").Type("string").Add();
10+
}).Rule(ViewBag.rule).AllowDragAndDrop(true).Render()
11+
12+
<script>
13+
</script>

‎ej2-asp-core-mvc/code-snippet/query-builder/drag-and-drop/tagHelper

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<ejs-querybuilder id="querybuilder" width="73%" rule="ViewBag.rule" allowDragAndDrop="true">
2+
<e-querybuilder-columns>
3+
<e-querybuilder-column field="EmployeeID" label="Employee ID" type="number"></e-querybuilder-column>
4+
<e-querybuilder-column field="FirstName" label="First Name" type="string"></e-querybuilder-column>
5+
<e-querybuilder-column field="TitleOfCourtesy" label="Title Of Courtesy" type="boolean" values="ViewBag.values"></e-querybuilder-column>
6+
<e-querybuilder-column field="Title" label="Title" type="string"></e-querybuilder-column>
7+
<e-querybuilder-column field="HireDate" label="Hire Date" type="date" format="dd/MM/yyyy"></e-querybuilder-column>
8+
<e-querybuilder-column field="Country" label="Country" type="string"></e-querybuilder-column>
9+
<e-querybuilder-column field="City" label="City" type="string"></e-querybuilder-column>
10+
</e-querybuilder-columns>
11+
</ejs-querybuilder>
12+
13+
<script>
14+
</script>

‎ej2-asp-core-mvc/code-snippet/query-builder/separate-connector/default.cs

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
public ActionResult Index()
2+
{
3+
QueryBuilderRule rule = new QueryBuilderRule()
4+
{
5+
Condition = "",
6+
Rules = new List<QueryBuilderRule>()
7+
{
8+
new QueryBuilderRule { Label="First Name", Field="FirstName", Type="string", Operator="startswith", Value="Andre", Condition = "and" },
9+
new QueryBuilderRule { Label="Last Name", Field="LastName", Type="string", Operator="in", Value = new List<string> { "Davolio", "Buchanan" }, Condition = "or" },
10+
new QueryBuilderRule { Label="Employee ID", Field="EmployeeID", Type="number", Operator="greaterthan", Value=30, Condition = "and" },
11+
new QueryBuilderRule { Condition="or", Rules = new List<QueryBuilderRule>()
12+
{
13+
new QueryBuilderRule { Label="Title", Field="Title", Type="string", Operator="startswith", Value="Sales Manager", Condition = "and" },
14+
new QueryBuilderRule { Label="Country", Field="Country", Type="string", Operator="equal", Value="USA" }
15+
}},
16+
new QueryBuilderRule { Label="Hire Date", Field="HireDate", Type="date", Operator="between", Value=new List<string> { "11/28/2023", "11/30/2023" } }
17+
18+
}
19+
};
20+
21+
ViewBag.rule = rule;
22+
ViewBag.dataSource = EmployeeView.GetAllRecords();
23+
return View();
24+
}
25+
26+
public class EmployeeView
27+
{
28+
public EmployeeView()
29+
{
30+
31+
}
32+
public EmployeeView(int EmployeeID, string FirstName, string LastName, string Title, DateTime BirthDate, DateTime HireDate, int ReportsTo, string Address, string PostalCode, string Phone, string City, string Country)
33+
{
34+
this.EmployeeID = EmployeeID;
35+
this.FirstName = FirstName;
36+
this.LastName = LastName;
37+
this.Title = Title;
38+
this.BirthDate = BirthDate;
39+
this.HireDate = HireDate;
40+
this.ReportsTo = ReportsTo;
41+
this.Address = Address;
42+
this.PostalCode = PostalCode;
43+
this.Phone = Phone;
44+
this.City = City;
45+
this.Country = Country;
46+
47+
}
48+
public int EmployeeID { get; set; }
49+
public string FirstName { get; set; }
50+
public string LastName { get; set; }
51+
public string Title { get; set; }
52+
public DateTime BirthDate { get; set; }
53+
public DateTime HireDate { get; set; }
54+
55+
public int ReportsTo { get; set; }
56+
57+
public string Address { get; set; }
58+
public string PostalCode { get; set; }
59+
public string Phone { get; set; }
60+
public string City { get; set; }
61+
public string Country { get; set; }
62+
public static List<EmployeeView> GetAllRecords()
63+
{
64+
List<EmployeeView> Emp = new List<EmployeeView>();
65+
Emp.Add(new EmployeeView(1, "Nancy", "Davolio", "Sales Representative", new DateTime(1948, 12, 08), new DateTime(1992, 05, 01), 2, "507 - 20th Ave. E.Apt. 2A ", " 98122", "(206) 555-9857 ", "Seattle ", "USA"));
66+
Emp.Add(new EmployeeView(2, "Andrew", "Fuller", "Vice President, Sales", new DateTime(1952, 02, 19), new DateTime(1992, 08, 14), 4, "908 W. Capital Way", "98401 ", "(206) 555-9482 ", "Kirkland ", "USA"));
67+
Emp.Add(new EmployeeView(3, "Janet", "Leverling", "Sales Representative", new DateTime(1963, 08, 30), new DateTime(1992, 04, 01), 3, " 4110 Old Redmond Rd.", "98052 ", "(206) 555-8122", "Redmond ", "USA "));
68+
Emp.Add(new EmployeeView(4, "Margaret", "Peacock", "Sales Representative", new DateTime(1937, 09, 19), new DateTime(1993, 05, 03), 6, "14 Garrett Hill ", "SW1 8JR ", "(71) 555-4848 ", "London ", "UK "));
69+
Emp.Add(new EmployeeView(5, "Steven", "Buchanan", "Sales Manager", new DateTime(1955, 03, 04), new DateTime(1993, 10, 17), 8, "Coventry HouseMiner Rd. ", "EC2 7JR ", " (206) 555-8122", "Tacoma ", " USA"));
70+
Emp.Add(new EmployeeView(6, "Michael", "Suyama", "Sales Representative", new DateTime(1963, 07, 02), new DateTime(1993, 10, 17), 2, " 7 Houndstooth Rd.", " WG2 7LT", "(71) 555-4444 ", "London ", "UK "));
71+
Emp.Add(new EmployeeView(7, "Robert", "King", "Sales Representative", new DateTime(1960, 05, 29), new DateTime(1994, 01, 02), 7, "Edgeham HollowWinchester Way ", "RG1 9SP ", "(71) 555-5598 ", "London ", " UK"));
72+
Emp.Add(new EmployeeView(8, "Laura", "Callahan", "Inside Sales Coordinator", new DateTime(1958, 01, 09), new DateTime(1994, 03, 05), 9, "722 Moss Bay Blvd. ", "98033 ", " (206) 555-3412", "Seattle ", "USA "));
73+
Emp.Add(new EmployeeView(9, "Anne", "Dodsworth", "Sales Representative", new DateTime(1966, 01, 27), new DateTime(1994, 11, 15), 5, "4726 - 11th Ave. N.E. ", "98105 ", "(71) 555-5598 ", " London", "UK "));
74+
return Emp;
75+
}
76+
}

‎ej2-asp-core-mvc/code-snippet/query-builder/separate-connector/razor

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
@Html.EJS().QueryBuilder("querybuilder").Width("72%").Columns(col =>
2+
{
3+
col.Field("EmployeeID").Label("Employee ID").Type("number").Add();
4+
col.Field("FirstName").Label("First Name").Type("string").Add();
5+
col.Field("TitleOfCourtesy").Label("Title Of Courtesy").Type("boolean").Values(new List<string> { "Mr.", "Mrs." }).Add();
6+
col.Field("Title").Label("Title").Type("string").Add();
7+
col.Field("HireDate").Label("Hire Date").Type("date").Format("dd/MM/yyyy").Add();
8+
col.Field("Country").Label("Country").Type("string").Add();
9+
col.Field("City").Label("City").Type("string").Add();
10+
}).Rule(ViewBag.rule).EnableSeparateConnector(true).Render()
11+
12+
13+
<script>
14+
</script>

‎ej2-asp-core-mvc/code-snippet/query-builder/separate-connector/tagHelper

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<ejs-querybuilder id="querybuilder" width="73%" rule="ViewBag.rule" enableSeparateConnector="true">
2+
<e-querybuilder-columns>
3+
<e-querybuilder-column field="EmployeeID" label="Employee ID" type="number"></e-querybuilder-column>
4+
<e-querybuilder-column field="FirstName" label="First Name" type="string"></e-querybuilder-column>
5+
<e-querybuilder-column field="TitleOfCourtesy" label="Title Of Courtesy" type="boolean" values="ViewBag.values"></e-querybuilder-column>
6+
<e-querybuilder-column field="Title" label="Title" type="string"></e-querybuilder-column>
7+
<e-querybuilder-column field="HireDate" label="Hire Date" type="date" format="dd/MM/yyyy"></e-querybuilder-column>
8+
<e-querybuilder-column field="Country" label="Country" type="string"></e-querybuilder-column>
9+
<e-querybuilder-column field="City" label="City" type="string"></e-querybuilder-column>
10+
</e-querybuilder-columns>
11+
</ejs-querybuilder>
12+
13+
<script>
14+
</script>

‎ej2-asp-core-mvc/combo-box/disabled-items.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ The disableItem method can be used to handle dynamic changing in disable state o
5656

5757
If you want to disabled the overall component to set the [enabled](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.DropDowns.ComboBox.html#Syncfusion_EJ2_DropDowns_ComboBox_Enabled) property to false.
5858

59-
{% [Disabled ComboBox Component](./images/combobox-disable.png)" %}
59+
![Disabled ComboBox Component](./images/combobox-disable.png)

‎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/drop-down-list/disabled-items.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ The disableItem method can be used to handle dynamic changing in disable state o
5656

5757
If you want to disabled the overall component to set the [enabled](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.DropDowns.DropDownList.html#Syncfusion_EJ2_DropDowns_DropDownList_Enabled) property to false.
5858

59-
{% [Disabled DropDownList Component](./images/dropdownlist-disable.png)" %}
59+
![Disabled DropDownList Component](./images/dropdownlist-disable.png)

‎ej2-asp-core-mvc/image-editor/annotation.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ documentation: ug
1010

1111
# Annotation in the ##Platform_Name## Image Editor control
1212

13-
The Image Editor allows adding annotations to the image, including text, freehand drawings, and shapes like rectangles, ellipses, arrows, paths, and lines. This gives the flexibility to mark up the image with notes, sketches, and other visual elements as needed. These annotation tools can help to communicate and share ideas more effectively.
13+
The Image Editor allows adding annotations to the image, including text, freehand drawings, and shapes like rectangles, ellipses, arrows, paths, and lines. This gives the flexibility to mark up the image with notes, sketches, and other visual elements as needed. These annotation tools can help to communicate and share ideas more effectively. Users are allowed to draw multiple annotations simultaneously, enhancing creative flexibility. Furthermore, every action, including customizations, will be tracked in the undo/redo collection, ensuring a seamless user experience and making it easier to experiment with different designs.
1414

1515
## Text annotation
1616

@@ -174,7 +174,7 @@ Here is an example of changing the text’s color and its font family using the
174174

175175
Output be like the below.
176176

177-
![ImageEditor Sample](images/image-editor-customize-font-color.jpg)
177+
![ImageEditor Sample](images/image-editor-custom-font-color.png)
178178

179179
### Add Additional font family
180180

@@ -209,7 +209,7 @@ Here is an example of adding additional font family to the text annotation using
209209

210210
Output be like the below.
211211

212-
![ImageEditor Sample](images/image-editor-add-font-family.png)
212+
![ImageEditor Sample](images/image-editor-add-font-family.jpg)
213213

214214
## Freehand drawing
215215

@@ -525,4 +525,4 @@ In the following example, you can use the `drawImage` method in the button click
525525

526526
Output be like the below.
527527

528-
![ImageEditor Sample](images/image-editor-add-image.png)
528+
![ImageEditor Sample](images/image-editor-add-image.jpg)

0 commit comments

Comments
 (0)