Skip to content

Conflicts cleared #3180

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.

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

Merged
merged 27 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4cff66d
887665: updated the virtualization documentation
mohanrajsf3477 Jun 26, 2024
a4f5c43
Merge pull request #3146 from syncfusion-content/EJ2-892508-UGmvc-core
Jun 28, 2024
06d50c1
894222: overview
DhineshSF Jul 1, 2024
abdc716
894222: sel
DhineshSF Jul 1, 2024
9058a8d
Merge branch 'hotfix/hotfix-v26.1.35' into EJ2-894222-mvcore-HT
DhineshSF Jul 1, 2024
bfa38fe
894022: Updated reference links.
DinakarSF4212 Jul 2, 2024
fddf303
894758: updated the samples images
KirupaSF4438 Jul 3, 2024
a3b4806
894758: updated the images
KirupaSF4438 Jul 3, 2024
e3b534a
Merge pull request #3155 from syncfusion-content/EJ2-894222-mvcore-HT
Jul 3, 2024
7cc763f
Merge branch 'hotfix/hotfix-v26.1.35' into EJ2-894022-hotfix
DinakarManickam4212 Jul 3, 2024
db0ffcf
894022: Resolved the Front Matter Errors.
DinakarSF4212 Jul 3, 2024
d6386a4
895415: Update Json Hotfix
sathiyaseelanksf3503 Jul 4, 2024
19cae76
Merge branch 'hotfix/hotfix-v26.1.35' into EJ2-894758-MCCB-OTP-Hotfix
KirupaSF4438 Jul 4, 2024
981c1d4
895415: UpdateJsonHotfix
sathiyaseelanksf3503 Jul 4, 2024
892faa5
894758: updated the images
KirupaSF4438 Jul 4, 2024
0073741
895415: UpdateJsonHotfix
sathiyaseelanksf3503 Jul 4, 2024
aad3f33
895415: UpdateJsonHotfix
sathiyaseelanksf3503 Jul 4, 2024
2497f66
895415: UpdateJsonHotfix
sathiyaseelanksf3503 Jul 4, 2024
a48c060
Merge pull request #3167 from syncfusion-content/EJ2-895415-UpdateJso…
rparthi-pdf Jul 4, 2024
8947082
Merge pull request #3162 from syncfusion-content/EJ2-894758-MCCB-OTP-…
IndrajithSrinivasan Jul 5, 2024
1292254
Added the save toolbar button to custom toolbar and auto save document.
mohammedaffan-sf4238 Jul 5, 2024
f66cece
Added the save toolbar button to custom toolbar and auto save document.
mohammedaffan-sf4238 Jul 5, 2024
82b67f8
Merge pull request #3171 from syncfusion-content/savedocs
kesavan-duraisamy Jul 8, 2024
506235e
Merge pull request #3160 from syncfusion-content/EJ2-894022-hotfix
gobalakrishnans Jul 8, 2024
2af66c4
Merge pull request #3140 from syncfusion-content/EJ2-887665-aspnew
PrinceOliver Jul 8, 2024
c591324
IN-185331 Added the release notes MD file for v26.1.41 and correspond…
DeepakRajSundar Jul 8, 2024
f17b6c8
Conflicts cleared
Backiaraj Jul 9, 2024
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
16 changes: 16 additions & 0 deletions ej2-asp-core-mvc/Release-notes/26.1.41.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
title: Essential Studio for ##Platform_Name## Weekly Release Release Notes
description: Essential Studio for ##Platform_Name## Weekly Release Release Notes
platform: ej2-asp-core-mvc
documentation: ug
---

# Essential Studio for ##Platform_Name## Release Notes

{% include release-info.html date="July 09, 2024" version="v26.1.41" %}

{% directory path: _includes/release-notes/v26.1.41 %}

{% include {{file.url}} %}

{% enddirectory %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
public ActionResult Default()
{
return View();
}

Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<div id="documenteditor" style="width:100%;height:100%">
@Html.EJS().DocumentEditorContainer("container").Created("onDocCreate").EnableToolbar(true).Render()
</div>

<script>
function onDocCreate() {
var container = document.getElementById("container").ej2_instances[0];
var toolItem = {
prefixIcon: "e-save icon",
tooltipText: "Save the Document",
text: "Save",
id: "save"
};
container.toolbarItems = ['New','Open',toolItem, 'Separator' ,'Undo', 'Redo', 'Separator', 'Image', 'Table', 'Hyperlink', 'Bookmark', 'TableOfContents', 'Separator', 'Header', 'Footer', 'PageSetup', 'PageNumber', 'Break', 'InsertFootnote', 'InsertEndnote', 'Separator', 'Find', 'Separator', 'Comments', 'TrackChanges', 'Separator', 'LocalClipboard', 'RestrictEditing', 'Separator', 'FormFields', 'UpdateFields','ContentControl'];
container.toolbarClick = function (args) {
switch (args.item.id) {
case 'save':
container.documentEditor.save('sample','Docx');
break;
}
};
}
</script>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<ejs-documenteditorcontainer id="container" created="onDocCreate"></ejs-documenteditorcontainer>
<script>
function onDocCreate() {
var container = document.getElementById("container").ej2_instances[0];
var toolItem = {
prefixIcon: "e-de-ctnr-lock",
tooltipText: "Disable Image",
text: "Disable Image",
id: "Custom"
};
container.toolbarItems = ['New','Open',toolItem, 'Separator' ,'Undo', 'Redo', 'Separator', 'Image', 'Table', 'Hyperlink', 'Bookmark', 'Comments', 'TableOfContents', 'Separator', 'Header', 'Footer', 'PageSetup', 'PageNumber', 'Break', 'Separator', 'Find', 'Separator', 'LocalClipboard', 'RestrictEditing'];
container.toolbarClick = function (args) {
switch (args.item.id) {
case 'Custom':
container.documentEditor.save('Sample', 'Docx');
break;
}
};
}
</script>
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@

@Html.EJS().DocumentEditorContainer("container").Created("onCreate").EnableToolbar(true).Render()


<script>
var container;
var containerPanel;
var contentChanged =false;
document.addEventListener('DOMContentLoaded', function () {
var documenteditorElement = document.getElementById("container");
container = documenteditorElement.ej2_instances[0];
container.contentChange=function(){
contentChanged = true;
}
});
function onCreate() {
var documenteditorElement = document.getElementById("container");
container = documenteditorElement.ej2_instances[0];
setInterval(() => {
if (contentChanged) {
//You can save the document as below
container.documentEditor.saveAsBlob('Docx').then((blob) => {
console.log('Saved sucessfully');
let exportedDocument = blob;
//Now, save the document where ever you want.
let formData = new FormData();
formData.append('fileName', 'sample.docx');
formData.append('data', exportedDocument);
/* tslint:disable */
var req = new XMLHttpRequest();
// Replace your running Url here
req.open(
'POST',
'http://localhost:62869/api/documenteditor/AutoSave',
true
);
req.onreadystatechange = () => {
if (req.readyState === 4) {
if (req.status === 200 || req.status === 304) {
console.log('Saved sucessfully');
}
}
};
req.send(formData);
});
contentChanged = false;
}
}, 1000);
}

</script>
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<ejs-documenteditorcontainer id="container" enableToolbar=true height="590px"></ejs-documenteditorcontainer>

<script>
var container;
var containerPanel;
var contentChanged =false;
document.addEventListener('DOMContentLoaded', function () {
var documenteditorElement = document.getElementById("container");
container = documenteditorElement.ej2_instances[0];
container.contentChange=function(){
contentChanged = true;
}
});
function onCreate() {
var documenteditorElement = document.getElementById("container");
container = documenteditorElement.ej2_instances[0];
setInterval(() => {
if (contentChanged) {
//You can save the document as below
container.documentEditor.saveAsBlob('Docx').then((blob) => {
console.log('Saved sucessfully');
let exportedDocument = blob;
//Now, save the document where ever you want.
let formData = new FormData();
formData.append('fileName', 'sample.docx');
formData.append('data', exportedDocument);
/* tslint:disable */
var req = new XMLHttpRequest();
// Replace your running Url here
req.open(
'POST',
'http://localhost:62869/api/documenteditor/AutoSave',
true
);
req.onreadystatechange = () => {
if (req.readyState === 4) {
if (req.status === 200 || req.status === 304) {
console.log('Saved sucessfully');
}
}
};
req.send(formData);
});
contentChanged = false;
}
}, 1000);
}

</script>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
text: "Disable Image",
id: "Custom"
};
container.toolbarItems = [toolItem, 'Undo', 'Redo', 'Separator', 'Image', 'Table', 'Hyperlink', 'Bookmark', 'Comments', 'TableOfContents', 'Separator', 'Header', 'Footer', 'PageSetup', 'PageNumber', 'Break', 'Separator', 'Find', 'Separator', 'LocalClipboard', 'RestrictEditing'];
container.toolbarItems = [toolItem, 'Undo', 'Redo', 'Separator', 'Image', 'Table', 'Hyperlink', 'Bookmark', 'TableOfContents', 'Separator', 'Header', 'Footer', 'PageSetup', 'PageNumber', 'Break', 'InsertFootnote', 'InsertEndnote', 'Separator', 'Find', 'Separator', 'Comments', 'TrackChanges', 'Separator', 'LocalClipboard', 'RestrictEditing', 'Separator', 'FormFields', 'UpdateFields','ContentControl'];
container.toolbarClick = function (args) {
switch (args.item.id) {
case 'Custom':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
text: "Disable Image",
id: "Custom"
};
container.toolbarItems = [toolItem, 'Undo', 'Redo', 'Separator', 'Image', 'Table', 'Hyperlink', 'Bookmark', 'Comments', 'TableOfContents', 'Separator', 'Header', 'Footer', 'PageSetup', 'PageNumber', 'Break', 'Separator', 'Find', 'Separator', 'LocalClipboard', 'RestrictEditing'];
container.toolbarItems = [toolItem, 'Undo', 'Redo', 'Separator', 'Image', 'Table', 'Hyperlink', 'Bookmark', 'TableOfContents', 'Separator', 'Header', 'Footer', 'PageSetup', 'PageNumber', 'Break', 'InsertFootnote', 'InsertEndnote', 'Separator', 'Find', 'Separator', 'Comments', 'TrackChanges', 'Separator', 'LocalClipboard', 'RestrictEditing', 'Separator', 'FormFields', 'UpdateFields','ContentControl'];
container.toolbarClick = function (args) {
switch (args.item.id) {
case 'Custom':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,4 @@ N> [View Sample in GitHub](https://github.com/SyncfusionExamples/ASP-NET-MVC-Get
* [How to load the document by default](../document-editor/how-to/open-default-document).
* [How to customize tool bar](../document-editor/how-to/customize-tool-bar).
* [How to resize Document editor component](../document-editor/how-to/resize-document-editor).
* [How to add a save button to the DocumentEditorContainer component toolbar](../document-editor/how-to/add-save-button-in-toolbar)
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,4 @@ N> [View Sample in GitHub](https://github.com/SyncfusionExamples/ASP-NET-Core-Ge
* [How to load the document by default](../document-editor/how-to/open-default-document).
* [How to customize tool bar](../document-editor/how-to/customize-tool-bar).
* [How to resize Document editor component](../document-editor/how-to/resize-document-editor).
* [How to add a save button to the DocumentEditorContainer component toolbar](../document-editor/how-to/add-save-button-in-toolbar).
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
layout: post
title: Add save button in ##Platform_Name## Document Editor Component | Syncfusion
description: Learn here to add save button in Syncfusion ##Platform_Name## Document Editor component of Syncfusion Essential JS 2 and more.
platform: ej2-asp-core-mvc
control: Add save button tool bar
publishingplatform: ##Platform_Name##
documentation: ug
---


# Add save button in ##Platform_Name## Document editor toolbar

## To add a save button to the existing toolbar in DocumentEditorContainer

DocumentEditorContainer allows you to add a new button to the existing items in a toolbar using [`CustomToolbarItemModel`] and with existing items in [`toolbarItems`](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.DocumentEditor.DocumentEditorContainer.html#Syncfusion_EJ2_DocumentEditor_DocumentEditorContainer_ToolbarItems) property. Newly added item click action can be defined in [`toolbarclick`](https://help.syncfusion.com/cr/aspnetcore-js2/Syncfusion.EJ2.DocumentEditor.DocumentEditorContainer.html#Syncfusion_EJ2_DocumentEditor_DocumentEditorContainer_ToolbarClick).

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

{% tabs %}
{% highlight cshtml tabtitle="CSHTML" %}
{% include code-snippet/document-editor/add-save-button-in-toolbar/tagHelper %}
{% endhighlight %}
{% highlight c# tabtitle="Add-save-button-in-toolbar.cs" %}
{% endhighlight %}{% endtabs %}

{% elsif page.publishingplatform == "aspnet-mvc" %}

{% tabs %}
{% highlight razor tabtitle="CSHTML" %}
{% include code-snippet/document-editor/add-save-button-in-toolbar/razor %}
{% endhighlight %}
{% highlight c# tabtitle="Add-save-button-in-toolbar.cs" %}
{% endhighlight %}{% endtabs %}
{% endif %}



N> Default value of `ToolbarItems` is `['New', 'Open', 'Separator', 'Undo', 'Redo', 'Separator', 'Image', 'Table', 'Hyperlink', 'Bookmark', 'TableOfContents', 'Separator', 'Header', 'Footer', 'PageSetup', 'PageNumber', 'Break', 'InsertFootnote', 'InsertEndnote', 'Separator', 'Find', 'Separator', 'Comments', 'TrackChanges', 'Separator', 'LocalClipboard', 'RestrictEditing', 'Separator', 'FormFields', 'UpdateFields','ContentControl']`.
60 changes: 60 additions & 0 deletions ej2-asp-core-mvc/document-editor/how-to/auto-save-document.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
---
layout: post
title: Auto Save Document in ##Platform_Name## Document Editor Component | Syncfusion
description: Learn here all about Auto save document in document editor in Syncfusion ##Platform_Name## Document Editor component of syncfusion and more.
platform: ej2-asp-core-mvc
control: Auto Save Document In Document Editor
publishingplatform: ##Platform_Name##
documentation: ug
---


# Auto save document in ##Platform_Name## Document editor control

In this article, we are going to see how to autosave the document to server. You can automatically save the edited content in regular intervals of time. It helps reduce the risk of data loss by saving an open document automatically at customized intervals.

The following example illustrates how to auto save the document in server.

* In the client-side, using content change event, we can automatically save the edited content in regular intervals of time. Based on `contentChanged` boolean, the document send as Docx format to server-side using [`saveAsBlob`] method.

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

{% tabs %}
{% highlight cshtml tabtitle="CSHTML" %}
{% include code-snippet/document-editor/auto-save-server/tagHelper %}
{% endhighlight %}
{% highlight c# tabtitle="Auto-save-server.cs" %}
{% endhighlight %}{% endtabs %}

{% elsif page.publishingplatform == "aspnet-mvc" %}

{% tabs %}
{% highlight razor tabtitle="CSHTML" %}
{% include code-snippet/document-editor/auto-save-server/razor %}
{% endhighlight %}
{% highlight c# tabtitle="Auto-save-server.cs" %}
{% endhighlight %}{% endtabs %}
{% endif %}



* In server-side, Receives the stream content from client-side and process it to save the document in Server or Database from the received stream. Add Web API in controller file like below to save the document.

```c#
[AcceptVerbs("Post")]
[HttpPost]
[EnableCors("AllowAllOrigins")]
[Route("AutoSave")]
public string AutoSave()
{
IFormFile file = HttpContext.Request.Form.Files[0];
Stream stream = new MemoryStream();
file.CopyTo(stream);
//Save the stream to database or server as per the requirement.
stream.Close();
return "Sucess";
}
```

## See Also
* [Autosave document in DocumentEditor](../../document-editor/how-to/auto-save-document-in-document-editor)
4 changes: 2 additions & 2 deletions ej2-asp-core-mvc/document-editor/how-to/customize-tool-bar.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: post
title: Customize Tool Bar in ##Platform_Name## Document Editor Component
title: Customize Tool Bar in ##Platform_Name## Document Editor Component | Syncfusion
description: Learn here all about how to customize Tool Bar in Syncfusion ##Platform_Name## Document Editor component of Syncfusion Essential JS 2 and more.
platform: ej2-asp-core-mvc
control: Customize Tool Bar
Expand Down Expand Up @@ -40,4 +40,4 @@ DocumentEditorContainer allows to customize (add, show, hide, enable, and disabl



N> Default value of `ToolbarItems` is `['New', 'Open', 'Separator', 'Undo', 'Redo', 'Separator', 'Image', 'Table', 'Hyperlink', 'Bookmark', 'Comments', 'TableOfContents', 'Separator', 'Header', 'Footer', 'PageSetup', 'PageNumber', 'Break', 'Separator', 'Find', 'Separator', 'LocalClipboard', 'RestrictEditing']`.
N> Default value of `ToolbarItems` is `['New', 'Open', 'Separator', 'Undo', 'Redo', 'Separator', 'Image', 'Table', 'Hyperlink', 'Bookmark', 'TableOfContents', 'Separator', 'Header', 'Footer', 'PageSetup', 'PageNumber', 'Break', 'InsertFootnote', 'InsertEndnote', 'Separator', 'Find', 'Separator', 'Comments', 'TrackChanges', 'Separator', 'LocalClipboard', 'RestrictEditing', 'Separator', 'FormFields', 'UpdateFields','ContentControl']`.
4 changes: 2 additions & 2 deletions ej2-asp-core-mvc/gantt/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ documentation: ug
---


# Overview
# Overview in ##Platform_Name## Gantt component

The Gantt chart is a project management tool which provides a Microsoft Project-like interface for scheduling and managing projects. Its intuitive user interface lets you visually manage tasks, task relationships, and resources in a project.

Expand All @@ -27,4 +27,4 @@ The Gantt chart is a project management tool which provides a Microsoft Project-
* Resources - Resources are represented by staff, equipment, materials, and more. We can show and allocate the resources for each task.
* Filtering – Support for filtering individual column using menu filtering along with toolbar search box.
* Data markers or indicators – Support for displaying indicators and flags along with taskbars and task labels.
* Event markers and Holidays - Highlight important days or events in a project using event markers and define non-working days in a project using holidays.
* Event markers and Holidays - Highlight important days or events in a project using event markers and define non-working days in a project using holidays.
4 changes: 2 additions & 2 deletions ej2-asp-core-mvc/gantt/selection/selection.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ documentation: ug
---


# Selection
# Selection in ##Platform_Name## Gantt component

Selection provides an option to highlight a row or a cell. It can be done using arrow keys or by scrolling down the mouse. To disable selection in the Gantt control, set the [`AllowSelection`](https://help.syncfusion.com/cr/cref_files/aspnetcore-js2/Syncfusion.EJ2~Syncfusion.EJ2.Gantt.Gantt~AllowSelection.html) to false.

Expand Down Expand Up @@ -179,4 +179,4 @@ The touch interaction feature in the Gantt component allows you to easily intera

[`Multiple Row Selection`](selection/#multiple-row-selection) : To select multiple rows, you can utilize the multi-row selection feature. When you tap on a row, a popup is displayed, indicating the option for multi-row selection. Tap on the popup, and then proceed to tap on the desired rows you want to select. This allows you to select and interact with multiple rows simultaneously, as shown in the following image:

![Multiple selection](../images/multiple-selection.PNG)
![Multiple selection](../images/multiple-selection.PNG)
Binary file modified ej2-asp-core-mvc/multicolumn-combobox/images/cssClass.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ej2-asp-core-mvc/multicolumn-combobox/images/customAttribute.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -389,8 +389,7 @@ namespace GettingStartedMVC.Controllers
public string tileXCount { get; set; }
public string tileYCount { get; set; }
public bool digitalSignaturePresent { get; set; }
}

}
}

{% endhighlight %}
Expand Down
Loading