Skip to content

Commit 7e94ce8

Browse files
authored
Merge pull request #20 from Saranya13/master
config(EJ2-000): V18.4.39 released
2 parents cbb90c5 + 20ecf95 commit 7e94ce8

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

src/pivot-table/aggregation.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<select id="freightdrpdwn" name="ddl-view-mode">
1515
<option value='Sum' selected>Sum</option>
1616
<option value='Avg'>Average</option>
17+
<option value='Median'>Median</option>
1718
<option value='Min'>Min</option>
1819
<option value='Max'>Max</option>
1920
<option value='Count'>Count</option>
@@ -43,6 +44,7 @@
4344
<select id="pricedrpdwn" name="ddl-view-mode">
4445
<option value='Sum' selected>Sum</option>
4546
<option value='Avg'>Average</option>
47+
<option value='Median'>Median</option>
4648
<option value='Min'>Min</option>
4749
<option value='Max'>Max</option>
4850
<option value='Product'>Product</option>
@@ -68,7 +70,7 @@
6870
</table>
6971
</div>
7072
<div id="action-description">
71-
<p>This sample demonstrates the aggregate types like sum, average, min, max, count, distinct count, and more in the
73+
<p>This sample demonstrates the aggregate types like sum, average, median, min, max, count, distinct count, and more in the
7274
pivot table for quick business analysis. End users can also change the aggregation type of each field bound to
7375
the value axis in the field list at runtime.</p>
7476
</div>
@@ -78,7 +80,7 @@
7880
aggregate type can be set using the <code>type</code> property of the value field. The built-in aggregates are:
7981
</p>
8082
<p>
81-
<code>Sum</code>, <code>Average</code>, <code>Min</code>, <code>Max</code>, <code>Count</code>,
83+
<code>Sum</code>, <code>Average</code>, <code>Median</code>, <code>Min</code>, <code>Max</code>, <code>Count</code>,
8284
<code>Distinct Count</code>, <code>Product</code>,
8385
<code>Index</code>, <code>Population StDev</code>, <code>Sample StDev</code>, <code>Population Var</code>,
8486
<code>Sample Var</code>, <code>Running Totals</code>,

src/pivot-table/sample.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "Pivot Table",
33
"directory": "pivot-table",
44
"category": "Grids",
5+
"type": "update",
56
"samples": [
67
{
78
"url": "default",
@@ -97,6 +98,7 @@
9798
"url": "aggregation",
9899
"name": "Aggregation",
99100
"category": "Formula",
101+
"type": "update",
100102
"description": "This demo for Essential JS2 Pivot Table control shows different types of aggregation for value fields"
101103
},
102104
{

src/skipChunk.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
window.sampleSkip = []
1+
window.sampleSkip = ["grid","images"]

src/tree-grid/keyboard.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ TreeGrid.Inject(Page, Edit);
1313
dataSource: sampleData,
1414
childMapping: 'subtasks',
1515
treeColumnIndex: 1,
16+
selectionSettings: { type: 'Multiple'},
1617
height: 900,
1718
editSettings: { allowEditing: true, allowAdding: true, allowDeleting: true, mode: 'Row' },
1819
columns: [

styles/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2574,6 +2574,7 @@ body.highcontrast,
25742574
}
25752575

25762576
.sb-npm-btn {
2577+
display: none;
25772578
background: #fff;
25782579
border: 1px solid #3c78ef;
25792580
border-radius: 3px;

0 commit comments

Comments
 (0)