Skip to content

Commit c9a9a43

Browse files
committed
Merge branch 'hotfix/hotfix-v29.2.4' of https://github.com/syncfusion-content/ej2-asp-core-mvc-docs into EJ2-958641-Doc3
# Conflicts: # ej2-asp-core-mvc/pivot-table/images/Custom sorting.png # ej2-asp-core-mvc/pivot-table/images/Custom sorting_event.png # ej2-asp-core-mvc/pivot-table/images/Search desired field in static field list.png # ej2-asp-core-mvc/pivot-table/images/fieldlist-custom.png # ej2-asp-core-mvc/pivot-table/images/fieldlist_aggregation_grid.png # ej2-asp-core-mvc/pivot-table/images/fieldlist_filteringgrid.png # ej2-asp-core-mvc/pivot-table/images/fieldlist_sortgrid.png # ej2-asp-core-mvc/pivot-table/images/fieldlist_toolbar.png # ej2-asp-core-mvc/pivot-table/images/gs_calc_grid.png # ej2-asp-core-mvc/pivot-table/images/gs_fieldlist_icon.png # ej2-asp-core-mvc/pivot-table/images/popup-fieldlist-specifictarget.png # ej2-asp-core-mvc/pivot-table/images/staticfieldlist.png # ej2-asp-core-mvc/pivot-table/images/toolbar.png
2 parents ec9c6c2 + c6712dc commit c9a9a43

File tree

91 files changed

+154
-248
lines changed

Some content is hidden

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

91 files changed

+154
-248
lines changed

ej2-asp-core-mvc/code-snippet/pivot-table/action-event/actionBegin-fieldList/tagHelper

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<ejs-pivotview id="PivotGrid" height="300" showFieldList="true" actionBegin="actionBegin">
2-
<e-datasource data="@ViewBag.DataSource" expandAll="false" enableSorting="true" allowLabelFilter="true" allowValueFilter="true">
1+
<ejs-pivotview id="PivotView" height="300" showFieldList="true" actionBegin="actionBegin">
2+
<e-datasourcesettings dataSource="@ViewBag.DataSource" expandAll="false" enableSorting="true" allowLabelFilter="true" allowValueFilter="true">
33
<e-formatsettings>
44
<e-field name="Amount" format="C0" useGrouping="true"></e-field>
55
</e-formatsettings>
@@ -15,7 +15,7 @@
1515
<e-field name="Sold" caption="Units Sold"></e-field>
1616
<e-field name="Amount" caption="Sold Amount"></e-field>
1717
</e-values>
18-
</e-datasource>
18+
</e-datasourcesettings>
1919
</ejs-pivotview>
2020

2121
<script>

ej2-asp-core-mvc/code-snippet/pivot-table/action-event/actionBegin-toolbar/tagHelper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ejs-pivotview id="pivotview" allowExcelExport="true" allowNumberFormatting="true" allowConditionalFormatting="true" allowPdfExport="true" showToolbar="true" allowCalculatedField="true" showFieldList="true" width="100%" height="300" toolbar="@(new List<string>() {"New", "Save", "SaveAs", "Rename", "Remove", "Load",
1+
<ejs-pivotview id="PivotView" allowExcelExport="true" allowNumberFormatting="true" allowConditionalFormatting="true" allowPdfExport="true" showToolbar="true" allowCalculatedField="true" showFieldList="true" width="100%" height="300" toolbar="@(new List<string>() {"New", "Save", "SaveAs", "Rename", "Remove", "Load",
22
"Grid", "Chart", "Export", "SubTotal", "GrandTotal", "ConditionalFormatting", "NumberFormatting", "FieldList" })" actionBegin="actionBegin">
33
<e-datasourcesettings dataSource="@ViewBag.DataSource" expandAll="false" enableSorting="true">
44
<e-formatsettings>

ej2-asp-core-mvc/code-snippet/pivot-table/action-event/actionComplete-fieldList/tagHelper

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<ejs-pivotview id="PivotGrid" height="300" showFieldList="true" actionComplete="actionComplete">
2-
<e-datasource data="@ViewBag.DataSource" expandAll="false" enableSorting="true" allowLabelFilter="true" allowValueFilter="true">
1+
<ejs-pivotview id="PivotView" height="300" showFieldList="true" actionComplete="actionComplete">
2+
<e-datasourcesettings dataSource="@ViewBag.DataSource" expandAll="false" enableSorting="true" allowLabelFilter="true" allowValueFilter="true">
33
<e-formatsettings>
44
<e-field name="Amount" format="C0" useGrouping="true"></e-field>
55
</e-formatsettings>
@@ -15,7 +15,7 @@
1515
<e-field name="Sold" caption="Units Sold"></e-field>
1616
<e-field name="Amount" caption="Sold Amount"></e-field>
1717
</e-values>
18-
</e-datasource>
18+
</e-datasourcesettings>
1919
</ejs-pivotview>
2020

2121
<script>

ej2-asp-core-mvc/code-snippet/pivot-table/action-event/actionComplete-toolbar/tagHelper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ejs-pivotview id="pivotview" allowExcelExport="true" allowNumberFormatting="true" allowConditionalFormatting="true" allowPdfExport="true" showToolbar="true" allowCalculatedField="true" showFieldList="true" width="100%" height="300" toolbar="@(new List<string>() {"New", "Save", "SaveAs", "Rename", "Remove", "Load",
1+
<ejs-pivotview id="PivotView" allowExcelExport="true" allowNumberFormatting="true" allowConditionalFormatting="true" allowPdfExport="true" showToolbar="true" allowCalculatedField="true" showFieldList="true" width="100%" height="300" toolbar="@(new List<string>() {"New", "Save", "SaveAs", "Rename", "Remove", "Load",
22
"Grid", "Chart", "Export", "SubTotal", "GrandTotal", "ConditionalFormatting", "NumberFormatting", "FieldList" })" actionComplete="actionComplete">
33
<e-datasourcesettings dataSource="@ViewBag.DataSource" expandAll="false" enableSorting="true">
44
<e-formatsettings>

ej2-asp-core-mvc/code-snippet/pivot-table/action-event/actionFailure-fieldList/tagHelper

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<ejs-pivotview id="PivotGrid" height="300" showFieldList="true" actionFailure="actionFailure">
2-
<e-datasource data="@ViewBag.DataSource" expandAll="false" enableSorting="true" allowLabelFilter="true" allowValueFilter="true">
1+
<ejs-pivotview id="PivotView" height="300" showFieldList="true" actionFailure="actionFailure">
2+
<e-datasourcesettings dataSource="@ViewBag.DataSource" expandAll="false" enableSorting="true" allowLabelFilter="true" allowValueFilter="true">
33
<e-formatsettings>
44
<e-field name="Amount" format="C0" useGrouping="true"></e-field>
55
</e-formatsettings>
@@ -15,7 +15,7 @@
1515
<e-field name="Sold" caption="Units Sold"></e-field>
1616
<e-field name="Amount" caption="Sold Amount"></e-field>
1717
</e-values>
18-
</e-datasource>
18+
</e-datasourcesettings>
1919
</ejs-pivotview>
2020

2121
<script>

ej2-asp-core-mvc/code-snippet/pivot-table/action-event/actionFailure-toolbar/tagHelper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ejs-pivotview id="pivotview" allowExcelExport="true" allowNumberFormatting="true" allowConditionalFormatting="true" allowPdfExport="true" showToolbar="true" allowCalculatedField="true" showFieldList="true" width="100%" height="300" toolbar="@(new List<string>() {"New", "Save", "SaveAs", "Rename", "Remove", "Load",
1+
<ejs-pivotview id="PivotView" allowExcelExport="true" allowNumberFormatting="true" allowConditionalFormatting="true" allowPdfExport="true" showToolbar="true" allowCalculatedField="true" showFieldList="true" width="100%" height="300" toolbar="@(new List<string>() {"New", "Save", "SaveAs", "Rename", "Remove", "Load",
22
"Grid", "Chart", "Export", "SubTotal", "GrandTotal", "ConditionalFormatting", "NumberFormatting", "FieldList" })" actionFailure="actionFailure">
33
<e-datasourcesettings dataSource="@ViewBag.DataSource" expandAll="false" enableSorting="true">
44
<e-formatsettings>

ej2-asp-core-mvc/code-snippet/pivot-table/add-custom-aggregation/tagHelper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ejs-pivotview id="pivotview" height="300" dataBound="onDataBound" aggregateCellInfo="aggregateCell" showFieldList="true">
1+
<ejs-pivotview id="PivotView" height="300" dataBound="onDataBound" aggregateCellInfo="aggregateCell" showFieldList="true">
22
<e-datasourcesettings dataSource="@ViewBag.DataSource" expandAll="false">
33
<e-formatsettings>
44
<e-field name="Amount" format="C0"></e-field>

ej2-asp-core-mvc/code-snippet/pivot-table/classic-layout/tagHelper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ejs-pivotview id="pivotview" load="onLoad" showFieldList="true" width="100%" height="450">
1+
<ejs-pivotview id="PivotView" load="onLoad" showFieldList="true" width="100%" height="450">
22
<e-datasourcesettings dataSource="@data" expandAll="false" enableSorting="true">
33
<e-formatsettings>
44
<e-field name="Amount" format="C0" maximumSignificantDigits="10" minimumSignificantDigits="1"

ej2-asp-core-mvc/code-snippet/pivot-table/data-binding/engine-populated/tagHelper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
function enginePopulated(args){
2020
args.dataSourceSettings.columns[0].caption = 'Full Year';
2121
}
22-
<script>
22+
</script>

ej2-asp-core-mvc/code-snippet/pivot-table/data-binding/engine-populating/tagHelper

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
function enginePopulating(args){
2020
args.dataSourceSettings.columns[0].caption = 'Full Year';
2121
}
22-
<script>
22+
</script>

0 commit comments

Comments
 (0)