@syncfusion/ej2-pivotview 19.3.57 → 19.4.42

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 19.3.57
+*  version : 19.4.42
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-pivotview@*",
-  "_id": "@syncfusion/ej2-pivotview@19.3.55",
+  "_id": "@syncfusion/ej2-pivotview@19.4.41",
   "_inBundle": false,
-  "_integrity": "sha512-CHTu9X+whthcDiW8T9adBf25UpUnLgKk4XZ63ANu2tfw5NWBb/gHkiEY5ps7cDCc2wqKl3q/xdc8L67iHacJOA==",
+  "_integrity": "sha512-Z6SpeNyVSImPCIhvmcMuE5r7XIYQ18AtXKRM07I+8x+ya2ZYOiFTi7uRIXtY2bP7IqlbKJFCuOwffzPxToetTw==",
   "_location": "/@syncfusion/ej2-pivotview",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-pivotview",
     "/@syncfusion/ej2-vue-pivotview"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-pivotview/-/ej2-pivotview-19.3.55.tgz",
-  "_shasum": "057fe1fce43694d103d152dffb39fa013aa094f2",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-pivotview/-/ej2-pivotview-19.4.41.tgz",
+  "_shasum": "87ada26a09554e3d155778f1d9ebedba1b86daa7",
   "_spec": "@syncfusion/ej2-pivotview@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -35,23 +35,23 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~19.3.56",
-    "@syncfusion/ej2-buttons": "~19.3.53",
-    "@syncfusion/ej2-calendars": "~19.3.56",
-    "@syncfusion/ej2-charts": "~19.3.55",
-    "@syncfusion/ej2-compression": "~19.3.53",
-    "@syncfusion/ej2-data": "~19.3.57",
-    "@syncfusion/ej2-dropdowns": "~19.3.56",
-    "@syncfusion/ej2-excel-export": "~19.3.56",
-    "@syncfusion/ej2-file-utils": "~19.3.53",
-    "@syncfusion/ej2-grids": "~19.3.57",
-    "@syncfusion/ej2-inputs": "~19.3.57",
-    "@syncfusion/ej2-lists": "~19.3.53",
-    "@syncfusion/ej2-navigations": "~19.3.57",
-    "@syncfusion/ej2-pdf-export": "~19.3.53",
-    "@syncfusion/ej2-popups": "~19.3.57",
-    "@syncfusion/ej2-splitbuttons": "~19.3.53",
-    "@syncfusion/ej2-svg-base": "~19.3.53"
+    "@syncfusion/ej2-base": "~19.4.42",
+    "@syncfusion/ej2-buttons": "~19.4.42",
+    "@syncfusion/ej2-calendars": "~19.4.42",
+    "@syncfusion/ej2-charts": "~19.4.42",
+    "@syncfusion/ej2-compression": "~19.4.38",
+    "@syncfusion/ej2-data": "~19.4.42",
+    "@syncfusion/ej2-dropdowns": "~19.4.42",
+    "@syncfusion/ej2-excel-export": "~19.4.38",
+    "@syncfusion/ej2-file-utils": "~19.4.38",
+    "@syncfusion/ej2-grids": "~19.4.42",
+    "@syncfusion/ej2-inputs": "~19.4.42",
+    "@syncfusion/ej2-lists": "~19.4.38",
+    "@syncfusion/ej2-navigations": "~19.4.41",
+    "@syncfusion/ej2-pdf-export": "~19.4.42",
+    "@syncfusion/ej2-popups": "~19.4.41",
+    "@syncfusion/ej2-splitbuttons": "~19.4.40",
+    "@syncfusion/ej2-svg-base": "~19.4.42"
   },
   "deprecated": false,
   "description": "The pivot grid, or pivot table, is used to visualize large sets of relational data in a cross-tabular format, similar to an Excel pivot table.",
@@ -78,6 +78,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "19.3.57",
+  "version": "19.4.42",
   "sideEffects": false
 }

package/src/base/engine.d.ts

@@ -3,7 +3,7 @@ import { L10n } from '@syncfusion/ej2-base';
 import { DataManager } from '@syncfusion/ej2-data';
 import { Sorting, SummaryTypes, FilterType, Operators, Condition } from './types';
 import { DateGroup, GroupType, ProviderType, DataSourceType } from './types';
-import { HeaderCollection } from '../common';
+import { HeaderCollection, GrandTotalsPosition } from '../common';
 /**
  * PivotEngine is used to manipulate the relational or Multi-Dimensional data as pivoting values.
  */
@@ -56,6 +56,8 @@ export declare class PivotEngine {
     /** @hidden */
     showGrandTotals: boolean;
     /** @hidden */
+    grandTotalsPosition: GrandTotalsPosition;
+    /** @hidden */
     showRowGrandTotals: boolean;
     /** @hidden */
     showHeaderWhenEmpty: boolean;
@@ -189,6 +191,7 @@ export declare class PivotEngine {
     private formatRegex;
     private clonedReport;
     private measureNames;
+    private currencyCode;
     renderEngine(dataSource?: IDataOptions, customProperties?: ICustomProperties, fn?: Function): void;
     private removeIrrelevantFields;
     private updateDataSourceSettings;
@@ -325,6 +328,7 @@ export declare class PivotEngine {
  * * `showRowSubTotals`: Allows to show or hide sub-totals in row axis of the pivot table.
  * * `showColumnSubTotals`: Allows to show or hide sub-totals in column axis of the pivot table.
  * * `showGrandTotals`: Allows to show or hide grand totals in both rows and columns axis of the pivot table.
+ * * `grandTotalsPosition`: Allows the grand totals to be position at first position in the row and column axis of the pivot table.
  * * `showRowGrandTotals`: Allows to show or hide grand totals in row axis of the pivot table.
  * * `showColumnGrandTotals`: Allows to show or hide grand totals in column axis of the pivot table.
  * * `showHeaderWhenEmpty`: Allows the undefined headers to be displayed in the pivot table, when the specific field(s) are not defined in the raw data.
@@ -538,6 +542,10 @@ export interface IDataOptions {
      * Allows to show or hide grand totals in both rows and columns axis of the pivot table.
      */
     showGrandTotals?: boolean;
+    /**
+     * Allows the grand totals to be position at first position in the row and column axis of the pivot table.
+     */
+    grandTotalsPosition?: GrandTotalsPosition;
     /**
      * Allows to show or hide grand totals in row axis of the pivot table.
      */
@@ -1420,6 +1428,14 @@ export interface ICustomProperties {
      * Specifies the current locale information of the component.
      */
     localeObj?: L10n;
+    /**
+     * Specifies the current culture information of the component.
+     */
+    globalize?: Internationalization;
+    /**
+     * Specifies the current currency code of the component.
+     */
+    currenyCode?: string;
     /**
      * Specifies the customized field type information.
      */

package/src/base/engine.js

@@ -148,7 +148,8 @@ var PivotEngine = /** @class */ (function () {
         this.isLastHeaderHasMeasures = true;
         this.isEditing = false;
         var fields;
-        this.globalize = new Internationalization();
+        this.globalize = (customProperties && customProperties.globalize) ? customProperties.globalize : new Internationalization();
+        this.currencyCode = (customProperties && customProperties.currenyCode) ? customProperties.currenyCode : undefined;
         this.localeObj = customProperties ? customProperties.localeObj : undefined;
         this.fieldsType = customProperties ? customProperties.fieldsType : {};
         this.clonedReport = customProperties ? (customProperties.clonedReport &&
@@ -162,6 +163,7 @@ var PivotEngine = /** @class */ (function () {
         this.showRowSubTotals = isNullOrUndefined(dataSource.showRowSubTotals) ? true : dataSource.showRowSubTotals;
         this.showColumnSubTotals = isNullOrUndefined(dataSource.showColumnSubTotals) ? true : dataSource.showColumnSubTotals;
         this.showGrandTotals = isNullOrUndefined(dataSource.showGrandTotals) ? true : dataSource.showGrandTotals;
+        this.grandTotalsPosition = isNullOrUndefined(dataSource.grandTotalsPosition) ? 'Bottom' : dataSource.grandTotalsPosition;
         this.showRowGrandTotals = isNullOrUndefined(dataSource.showRowGrandTotals) ? true : dataSource.showRowGrandTotals;
         this.showColumnGrandTotals = isNullOrUndefined(dataSource.showColumnGrandTotals) ? true : dataSource.showColumnGrandTotals;
         this.allowValueFilter = dataSource.allowValueFilter;
@@ -275,6 +277,7 @@ var PivotEngine = /** @class */ (function () {
             this.showRowSubTotals = isNullOrUndefined(dataSource.showRowSubTotals) ? true : dataSource.showRowSubTotals;
             this.showColumnSubTotals = isNullOrUndefined(dataSource.showColumnSubTotals) ? true : dataSource.showColumnSubTotals;
             this.showGrandTotals = isNullOrUndefined(dataSource.showGrandTotals) ? true : dataSource.showGrandTotals;
+            this.grandTotalsPosition = isNullOrUndefined(dataSource.grandTotalsPosition) ? 'Bottom' : dataSource.grandTotalsPosition;
             this.showRowGrandTotals = isNullOrUndefined(dataSource.showRowGrandTotals) ? true : dataSource.showRowGrandTotals;
             this.showColumnGrandTotals = isNullOrUndefined(dataSource.showColumnGrandTotals) ? true : dataSource.showColumnGrandTotals;
             this.allowValueFilter = dataSource.allowValueFilter;
@@ -577,6 +580,7 @@ var PivotEngine = /** @class */ (function () {
                                         }
                                         if (!PivotUtil.getFieldByName(groupKeys[gCnt], dataFields)) {
                                             groupField = groupFields[groupKeys[gCnt]];
+                                            caption_1 = (caption_1.indexOf(' (') !== -1 && caption_1.indexOf(')') !== -1) ? caption_1.slice(caption_1.indexOf('(') + 1, caption_1.length - 1) : caption_1;
                                             var newField = {
                                                 name: groupKeys[gCnt],
                                                 caption: (this_1.localeObj ? this_1.localeObj.getConstant(groupField) : groupField) + ' (' + caption_1 + ')',
@@ -604,6 +608,8 @@ var PivotEngine = /** @class */ (function () {
                         }
                     }
                     gCnt = Object.keys(groupKeys).length;
+                    var field = this_1.getMappingField(fieldName, this_1.clonedReport ? this_1.clonedReport.fieldMapping : this_1.fieldMapping);
+                    var caption_2 = field.caption ? field.caption : fieldName;
                     while (gCnt--) {
                         groupField = groupFields[groupKeys[gCnt]];
                         for (var i = 0, len_3 = this_1.formats.length; i < len_3; i++) {
@@ -622,6 +628,33 @@ var PivotEngine = /** @class */ (function () {
                             };
                             this_1.formats.push(formatSettings);
                         }
+                        if (!isDataSource) {
+                            var mappingField = this_1.getMappingField(groupKeys[gCnt], this_1.fieldMapping);
+                            if (groupKeys[gCnt] !== fieldName && isNullOrUndefined(mappingField.name)) {
+                                var newField = {
+                                    name: groupKeys[gCnt],
+                                    caption: (this_1.localeObj ? this_1.localeObj.getConstant(groupField) : groupField) + ' (' + caption_2 + ')'
+                                };
+                                this_1.fieldMapping.push(newField);
+                            }
+                            else if (groupKeys[gCnt] !== fieldName) {
+                                mappingField.caption = (this_1.localeObj ? this_1.localeObj.getConstant(groupField) : groupField) + ' (' + caption_2 + ')';
+                            }
+                        }
+                    }
+                    if (!isDataSource) {
+                        var mappingField = this_1.getMappingField(fieldName, this_1.fieldMapping);
+                        groupField = groupFields[fieldName];
+                        if (groupKeys[gCnt] !== fieldName && isNullOrUndefined(mappingField.name)) {
+                            var newField = {
+                                name: fieldName,
+                                caption: (this_1.localeObj ? this_1.localeObj.getConstant(groupField) : groupField) + ' (' + caption_2 + ')'
+                            };
+                            this_1.fieldMapping.push(newField);
+                        }
+                        else {
+                            mappingField.caption = (this_1.localeObj ? this_1.localeObj.getConstant(groupField) : groupField) + ' (' + caption_2 + ')';
+                        }
                     }
                 }
                 else if (group.type === 'Number' && group.rangeInterval) {
@@ -870,7 +903,7 @@ var PivotEngine = /** @class */ (function () {
             this.fieldList = this.savedFieldList;
             while (len--) { /** while is used for better performance than for */
                 var key = keys[len];
-                var field = this.getMappingField(key);
+                var field = this.getMappingField(key, this.fieldMapping);
                 if (this.fieldList[key]) {
                     this.fieldList[key].isSelected = false;
                     this.fieldList[key].index = len;
@@ -949,7 +982,7 @@ var PivotEngine = /** @class */ (function () {
             this.fieldList = {};
             while (len--) { /** while is used for better performance than for */
                 var key = keys[len];
-                var field = this.getMappingField(key);
+                var field = this.getMappingField(key, this.fieldMapping);
                 type = (field && 'dataType' in field && field.dataType && dataTypes.indexOf(field.dataType.toLowerCase()) > -1) ?
                     field.dataType.toLowerCase() : PivotUtil.getType(fields[this.fieldKeys[key]]);
                 this.fieldList[key] = {
@@ -993,12 +1026,12 @@ var PivotEngine = /** @class */ (function () {
         }
         this.updateTreeViewData(dataFields);
     };
-    PivotEngine.prototype.getMappingField = function (key) {
+    PivotEngine.prototype.getMappingField = function (key, fieldMapping) {
         var field = {};
-        if (this.fieldMapping.length > 0) {
-            for (var index = 0, cnt = this.fieldMapping.length; index < cnt; index++) {
-                if (this.fieldMapping[index].name === key) {
-                    field = this.fieldMapping[index];
+        if (fieldMapping.length > 0) {
+            for (var index = 0, cnt = fieldMapping.length; index < cnt; index++) {
+                if (fieldMapping[index].name === key) {
+                    field = fieldMapping[index];
                     break;
                 }
             }
@@ -1572,8 +1605,8 @@ var PivotEngine = /** @class */ (function () {
         field.filter = filter;
         field.filterType = type;
         field.isExcelFilter = isLabelFilter;
-        var members = (this.formatFields[name] &&
-            (['date', 'dateTime', 'time'].indexOf(this.formatFields[name].type) > -1)) ?
+        var members = ((this.formatFields[name] &&
+            (['date', 'dateTime', 'time'].indexOf(this.formatFields[name].type) > -1)) || (name in this.groupingFields)) ?
             field.formattedMembers : field.members;
         var allowFil = isInclude;
         var final = {};
@@ -1620,7 +1653,7 @@ var PivotEngine = /** @class */ (function () {
     };
     PivotEngine.prototype.applyValueFiltering = function (rowData, level, rows, columns, valueFilter, rowFilterData, type) {
         this.isValueFiltered = false;
-        var allMember = extend({}, (type === 'row' && this.rowGrandTotal ? this.rowGrandTotal : type === 'column' && this.columnGrandTotal ? this.columnGrandTotal : rows[rows.length - 1]), null, true);
+        var allMember = extend({}, (type === 'row' && this.rowGrandTotal ? this.rowGrandTotal : type === 'column' && this.columnGrandTotal ? this.columnGrandTotal : (!(this.grandTotalsPosition === 'Top') ? rows[rows.length - 1] : rows[0])), null, true);
         this.getFilteredData(rows, columns, valueFilter, rowFilterData, level, rowData.name, allMember, type);
         if (this.isValueFiltered) {
             if ((type === 'row' && this.rowGrandTotal === null) || (type === 'column' && this.columnGrandTotal === null)) {
@@ -1967,14 +2000,14 @@ var PivotEngine = /** @class */ (function () {
                         for (var i = 0; i < rLen; i++) {
                             if (filterElement.name === rows[i].name && valueFields[filterElement.measure] && !isAvail) {
                                 isAvail = true;
-                                rowFilteredData = this.applyValueFiltering(rows[i], i, rowHeaders, (this.columnGrandTotal ? this.columnGrandTotal : columnHeaders[columnHeaders.length - 1]), valueFilters, this.valueFilteredData, 'row');
+                                rowFilteredData = this.applyValueFiltering(rows[i], i, rowHeaders, (this.columnGrandTotal ? this.columnGrandTotal : (this.grandTotalsPosition === 'Top' && this.showGrandTotals) ? columnHeaders[0] : columnHeaders[columnHeaders.length - 1]), valueFilters, this.valueFilteredData, 'row');
                                 break;
                             }
                         }
                         for (var j = 0; j < cLen; j++) {
                             if (filterElement.name === columns[j].name && valueFields[filterElement.measure] && !isAvail) {
                                 isAvail = true;
-                                columnFilteredData = this.applyValueFiltering(columns[j], j, columnHeaders, (this.rowGrandTotal ? this.rowGrandTotal : rowHeaders[rowHeaders.length - 1]), valueFilters, this.valueFilteredData, 'column');
+                                columnFilteredData = this.applyValueFiltering(columns[j], j, columnHeaders, (this.rowGrandTotal ? this.rowGrandTotal : (this.grandTotalsPosition === 'Top' && this.showGrandTotals) ? rowHeaders[0] : rowHeaders[rowHeaders.length - 1]), valueFilters, this.valueFilteredData, 'column');
                                 break;
                             }
                         }
@@ -2286,7 +2319,7 @@ var PivotEngine = /** @class */ (function () {
         }
         var engine = this;
         return headers.filter(function (item) {
-            return item.members.length > 0 ? item.members.length > 0 : engine.matchIndexes(item.indexObject, filterObjects);
+            return (item.members.length > 0 || item.type === 'grand sum') ? true : engine.matchIndexes(item.indexObject, filterObjects);
         });
     };
     PivotEngine.prototype.matchIndexes = function (index, filterObjects) {
@@ -2366,6 +2399,14 @@ var PivotEngine = /** @class */ (function () {
             }
             /* eslint-enable */
             rawHeaders = this.getSortedHeaders(rawHeaders.concat(excessHeaders), this.fieldList[headersInfo.fields[0].name].sort).concat(grandHeader);
+            if (headersInfo.axis === 'row') {
+                this.cMembers = this.getIndexedHeaders(this.columns, this.data, 0, this.filterMembers, 'column', '');
+                this.insertAllMember(this.cMembers, this.filterMembers, '', 'column');
+            }
+            else {
+                this.rMembers = this.getIndexedHeaders(this.rows, this.data, 0, this.filterMembers, 'row', '');
+                this.insertAllMember(this.rMembers, this.filterMembers, '', 'row');
+            }
         }
         if (headersInfo.axis === 'row') {
             this.rowCount = 0;
@@ -2512,8 +2553,8 @@ var PivotEngine = /** @class */ (function () {
                     }
                 }
                 if (stringValue.length > 0) {
-                    stringValue = childrens.sort === 'Ascending' ? (stringValue.sort(function (a, b) { return (a.actualText > b.actualText) ? 1 : ((b.actualText > a.actualText) ? -1 : 0); })) :
-                        childrens.sort === 'Descending' ? (stringValue.sort(function (a, b) { return (a.actualText < b.actualText) ? 1 : ((b.actualText < a.actualText) ? -1 : 0); })) : stringValue;
+                    stringValue = childrens.sort === 'Ascending' ? (stringValue.sort(function (a, b) { return (a.actualText === 'Grand Total' || b.actualText === 'Grand Total') ? 0 : ((a.actualText > b.actualText) ? 1 : ((b.actualText > a.actualText) ? -1 : 0)); })) :
+                        childrens.sort === 'Descending' ? (stringValue.sort(function (a, b) { return (a.actualText === 'Grand Total' || b.actualText === 'Grand Total') ? 0 : ((a.actualText < b.actualText) ? 1 : ((b.actualText < a.actualText) ? -1 : 0)); })) : stringValue;
                 }
                 if (alphaNumbervalue.length > 0) {
                     alphaNumbervalue = childrens.sort === 'Ascending' ?
@@ -2526,9 +2567,9 @@ var PivotEngine = /** @class */ (function () {
             }
             else {
                 return sortOrder === 'Ascending' ?
-                    (headers.sort(function (a, b) { return (a.actualText > b.actualText) ? 1 : ((b.actualText > a.actualText) ? -1 : 0); })) :
+                    (headers.sort(function (a, b) { return (a.actualText === 'Grand Total' || b.actualText === 'Grand Total') ? 0 : ((a.actualText > b.actualText) ? 1 : ((b.actualText > a.actualText) ? -1 : 0)); })) :
                     sortOrder === 'Descending' ?
-                        (headers.sort(function (a, b) { return (a.actualText < b.actualText) ? 1 : ((b.actualText < a.actualText) ? -1 : 0); })) :
+                        (headers.sort(function (a, b) { return (a.actualText === 'Grand Total' || b.actualText === 'Grand Total') ? 0 : ((a.actualText < b.actualText) ? 1 : ((b.actualText < a.actualText) ? -1 : 0)); })) :
                         headers;
             }
         }
@@ -2548,7 +2589,8 @@ var PivotEngine = /** @class */ (function () {
             this.valueSortHeaderText = undefined;
             if (this.enableValueSorting && this.valueSortSettings.headerText && !this.valueSortHeaderText &&
                 this.valueSortSettings.headerText !== '' && this.values.length > 0) {
-                var textArray = this.valueSortSettings.headerText.split(this.valueSortSettings.headerDelimiter);
+                this.valueSortHeaderText = this.valueSortSettings.headerText;
+                var textArray = this.valueSortHeaderText.split(this.valueSortSettings.headerDelimiter);
                 for (var _i = 0, _a = this.values; _i < _a.length; _i++) {
                     var field = _a[_i];
                     var name_1 = field.caption ? field.caption : field.name;
@@ -3340,7 +3382,7 @@ var PivotEngine = /** @class */ (function () {
     PivotEngine.prototype.insertAllMember = function (set, filter, customText, axis) {
         var len = set.length;
         customText = ' Total';
-        set[len] = {
+        var grandTotalSet = {
             hasChild: false,
             index: filter,
             level: 0,
@@ -3354,13 +3396,14 @@ var PivotEngine = /** @class */ (function () {
             type: 'grand sum',
             valueSort: {}
         };
-        set[len].valueSort[set[len].formattedText] = 1;
-        set[len].valueSort.levelName = set[len].formattedText;
-        set[len].valueSort[set[len].actualText] = 1;
-        set[len].valueSort.uniqueName = set[len].actualText;
+        grandTotalSet.valueSort[grandTotalSet.formattedText] = 1;
+        grandTotalSet.valueSort.levelName = grandTotalSet.formattedText;
+        grandTotalSet.valueSort[grandTotalSet.actualText] = 1;
+        grandTotalSet.valueSort.uniqueName = grandTotalSet.actualText;
         for (var ln = 0, lt = filter.length; ln < lt; ln++) {
-            set[len].indexObject[filter[ln]] = filter[ln];
+            grandTotalSet.indexObject[filter[ln]] = filter[ln];
         }
+        (this.dataSourceSettings.grandTotalsPosition === 'Top' && this.dataSourceSettings.showGrandTotals) ? set.unshift(grandTotalSet) : set.push(grandTotalSet);
         // if (axis === 'row') {
         //     this.rowCount += this.rowValuesLength;
         // } else {
@@ -3408,7 +3451,7 @@ var PivotEngine = /** @class */ (function () {
                         for (var cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
                             if (!isValueIndexFound) {
                                 for (vln = 0; vln < vlt; vln++) {
-                                    if (row.valueSort.uniqueName && row.valueSort.uniqueName.toString().split(this.valueSortSettings.headerDelimiter).indexOf(this.values[vln].name) > -1) {
+                                    if (row.valueSort.uniqueName && row.valueSort.uniqueName.toString().indexOf(this.values[vln].name) > -1) {
                                         isValueIndexFound = true;
                                         isValueCellUpdated = true;
                                         break;
@@ -3443,7 +3486,7 @@ var PivotEngine = /** @class */ (function () {
                     for (var cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
                         for (var vln = 0; vln < vlt; vln++) {
                             if (!this.valueAxis && !this.isLastHeaderHasMeasures) {
-                                if (columns[cln].valueSort.uniqueName && columns[cln].valueSort.uniqueName.toString().split(this.valueSortSettings.headerDelimiter).indexOf(this.values[vln].name) > -1) {
+                                if (columns[cln].valueSort.uniqueName && columns[cln].valueSort.uniqueName.toString().indexOf(this.values[vln].name) > -1) {
                                     this.updateRowData(rows, columns, tnum, data, vln, rln, cln, dln, actCnt, rTotal, cTotal);
                                     dln = data[tnum].length;
                                 }
@@ -4400,6 +4443,10 @@ var PivotEngine = /** @class */ (function () {
                 this.updateValueMembers(this.measureIndex === 0 && axis.length > 1, null, null, columnHeaders, axis.slice(0, axis.length - 1), vcnt, 0);
                 this.updateValueMembers(false, null, null, columnHeaders, axis.slice(axis.length - 1, axis.length), vcnt, -1);
             }
+            else if (this.grandTotalsPosition === 'Top' && this.showGrandTotals && this.measureIndex === 0) {
+                this.updateValueMembers(false, null, null, columnHeaders, axis.slice(0, 1), vcnt, -1);
+                this.updateValueMembers(this.measureIndex === 0 && axis.length > 1, null, null, columnHeaders, axis.slice(1, axis.length), vcnt, 0);
+            }
             else {
                 var hasColumnTotal = columns.length === 0 && axis.length === 1 && axis[0].type == 'grand sum';
                 this.updateValueMembers(!hasColumnTotal && this.measureIndex === 0, null, null, columnHeaders, axis, vcnt, hasColumnTotal ? -1 : 0);
@@ -4440,6 +4487,10 @@ var PivotEngine = /** @class */ (function () {
                 this.updateValueMembers(this.measureIndex == 0 && this.rMembers.length > 1, null, null, rowAxis, this.rMembers.slice(0, this.rMembers.length - 1), this.values.length, 0);
                 this.updateValueMembers(false, null, null, rowAxis, this.rMembers.slice(this.rMembers.length - 1, this.rMembers.length), this.values.length, -1);
             }
+            else if (this.grandTotalsPosition === 'Top' && this.showGrandTotals && this.measureIndex === 0) {
+                this.updateValueMembers(false, null, null, rowAxis, this.rMembers.slice(0, 1), this.values.length, -1);
+                this.updateValueMembers(this.measureIndex == 0 && this.rMembers.length > 1, null, null, rowAxis, this.rMembers.slice(1, this.rMembers.length), this.values.length, 0);
+            }
             else {
                 var hasRowTotal = rows.length === 0 && this.rMembers.length === 1 && this.rMembers[0].type == 'grand sum';
                 this.updateValueMembers(!hasRowTotal && this.measureIndex == 0, null, null, rowAxis, this.rMembers, this.values.length, hasRowTotal ? -1 : 0);

package/src/base/export-util.d.ts

@@ -0,0 +1,17 @@
+import { IPivotValues } from './engine';
+/**
+ * This is a file to perform common utility for OLAP and Relational datasource
+ * @hidden
+ */
+export declare class PivotExportUtil {
+    private static getDefinedObj;
+    static getClonedPivotValues(pivotValues: IPivotValues): IPivotValues;
+    private static getClonedPivotValueObj;
+    static isContainCommonElements(collection1: Object[], collection2: Object[]): boolean;
+    static formatPdfHeaderFooter(pdf: any): any;
+    static formatPdfExportProperties(pdf: any): any;
+    static formatExcelStyle(style: any): any;
+    static formatExcelCell(cell: any): any;
+    static formatExcelHeaderFooter(excel: any): any;
+    static formatExcelExportProperties(excel: any): any;
+}