@syncfusion/ej2-pivotview 19.3.43 → 19.3.48

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 19.3.43
+*  version : 19.3.48
 *  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@18.15.12",
+  "_id": "@syncfusion/ej2-pivotview@19.3.47",
   "_inBundle": false,
-  "_integrity": "sha512-xbTA+j1gKmrDekK3iZivk4Wh8Pv98RuU9exB3GguZBPxdtkGv6ROf2RPcwBEMgWUp4uTLwqjkPNE8CnTP5WoOg==",
+  "_integrity": "sha512-QQ2EsAps5ihvb8r/LnIRKagB9bxlvStzANMQxaAHNmagCyivhZCuVRckVi6dJTosc5SOSraGgdhiONORu9uFag==",
   "_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-release/@syncfusion/ej2-pivotview/-/ej2-pivotview-18.15.12.tgz",
-  "_shasum": "c413c496780132cfa52d212a151192d2411d9a81",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix/@syncfusion/ej2-pivotview/-/ej2-pivotview-19.3.47.tgz",
+  "_shasum": "2c273275b3fbd7410fc90f7ac1df1729501e927f",
   "_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.43",
-    "@syncfusion/ej2-buttons": "~19.3.43",
-    "@syncfusion/ej2-calendars": "~19.3.43",
-    "@syncfusion/ej2-charts": "~19.3.43",
+    "@syncfusion/ej2-base": "~19.3.47",
+    "@syncfusion/ej2-buttons": "~19.3.44",
+    "@syncfusion/ej2-calendars": "~19.3.46",
+    "@syncfusion/ej2-charts": "~19.3.48",
     "@syncfusion/ej2-compression": "~19.3.43",
-    "@syncfusion/ej2-data": "~19.3.43",
-    "@syncfusion/ej2-dropdowns": "~19.3.43",
-    "@syncfusion/ej2-excel-export": "~19.3.43",
+    "@syncfusion/ej2-data": "~19.3.47",
+    "@syncfusion/ej2-dropdowns": "~19.3.48",
+    "@syncfusion/ej2-excel-export": "~19.3.48",
     "@syncfusion/ej2-file-utils": "~19.3.43",
-    "@syncfusion/ej2-grids": "~19.3.43",
-    "@syncfusion/ej2-inputs": "~19.3.43",
-    "@syncfusion/ej2-lists": "~19.3.43",
-    "@syncfusion/ej2-navigations": "~19.3.43",
+    "@syncfusion/ej2-grids": "~19.3.48",
+    "@syncfusion/ej2-inputs": "~19.3.48",
+    "@syncfusion/ej2-lists": "~19.3.48",
+    "@syncfusion/ej2-navigations": "~19.3.46",
     "@syncfusion/ej2-pdf-export": "~19.3.43",
-    "@syncfusion/ej2-popups": "~19.3.43",
-    "@syncfusion/ej2-splitbuttons": "~19.3.43",
-    "@syncfusion/ej2-svg-base": "~19.3.43"
+    "@syncfusion/ej2-popups": "~19.3.47",
+    "@syncfusion/ej2-splitbuttons": "~19.3.48",
+    "@syncfusion/ej2-svg-base": "~19.3.45"
   },
   "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.43",
+  "version": "19.3.48",
   "sideEffects": false
 }

package/src/base/engine.d.ts

@@ -89,6 +89,8 @@ export declare class PivotEngine {
     /** @hidden */
     valueSortSettings: IValueSortSettings;
     /** @hidden */
+    rowIndex: number[];
+    /** @hidden */
     isEngineUpdated: boolean;
     /** @hidden */
     savedFieldList: IFieldListOptions;

package/src/base/engine.js

@@ -2977,10 +2977,14 @@ var PivotEngine = /** @class */ (function () {
                     if (keyInd !== 0) {
                         member.valueSort.levelName = parentMember + this.valueSortSettings.headerDelimiter + member.formattedText;
                         member.valueSort[parentMember + this.valueSortSettings.headerDelimiter + member.formattedText] = 1;
+                        member.valueSort.uniqueName = parentMember + this.valueSortSettings.headerDelimiter + (member.actualText ? member.actualText : member.formattedText);
+                        member.valueSort[parentMember + this.valueSortSettings.headerDelimiter + (member.actualText ? member.actualText : member.formattedText)] = 1;
                     }
                     else {
                         member.valueSort[member.formattedText] = 1;
                         member.valueSort.levelName = member.formattedText;
+                        member.valueSort[member.actualText ? member.actualText : member.formattedText] = 1;
+                        member.valueSort.uniqueName = (member.actualText ? member.actualText : member.formattedText);
                     }
                     var memberString = member.valueSort.axis + this.valueSortSettings.headerDelimiter + member.valueSort.levelName;
                     member.isDrilled = (valueFil && this.isValueFiltersAvail) ?
@@ -3148,10 +3152,16 @@ var PivotEngine = /** @class */ (function () {
                             slicedHeader.formattedText;
                         slicedHeader.valueSort[parentMember + this.valueSortSettings.headerDelimiter +
                             slicedHeader.formattedText] = 1;
+                        slicedHeader.valueSort.uniqueName = parentMember + this.valueSortSettings.headerDelimiter +
+                            (slicedHeader.actualText ? slicedHeader.actualText : slicedHeader.formattedText);
+                        slicedHeader.valueSort[parentMember + this.valueSortSettings.headerDelimiter +
+                            (slicedHeader.actualText ? slicedHeader.actualText : slicedHeader.formattedText)] = 1;
                     }
                     else {
                         slicedHeader.valueSort[slicedHeader.formattedText] = 1;
                         slicedHeader.valueSort.levelName = slicedHeader.formattedText;
+                        slicedHeader.valueSort[(slicedHeader.actualText ? slicedHeader.actualText : slicedHeader.formattedText)] = 1;
+                        slicedHeader.valueSort.uniqueName = (slicedHeader.actualText ? slicedHeader.actualText : slicedHeader.formattedText);
                     }
                     member.members = [];
                     hierarchy.push(member);
@@ -3337,6 +3347,7 @@ var PivotEngine = /** @class */ (function () {
             isDrilled: false,
             indexObject: {},
             members: [],
+            actualText: 'Grand' + customText,
             formattedText: 'Grand' + customText,
             ordinal: len,
             type: 'grand sum',
@@ -3344,6 +3355,8 @@ var PivotEngine = /** @class */ (function () {
         };
         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;
         for (var ln = 0, lt = filter.length; ln < lt; ln++) {
             set[len].indexObject[filter[ln]] = filter[ln];
         }
@@ -3364,74 +3377,85 @@ var PivotEngine = /** @class */ (function () {
             var isLeastNode = !reformAxis[tnum].members.length;
             row.colIndex = 0;
             row.rowIndex = tnum;
-            if (!data[tnum]) {
-                data[tnum] = [];
-                this.valueContent[actCnt] = {};
-                data[tnum][0] = this.valueContent[actCnt][0] = this.frameHeaderWithKeys(row);
+            var isRowFieldsAvail = false;
+            if (this.valueAxis && this.dataSourceSettings.rows.length === 0 && this.dataSourceSettings.values.length > 1) {
+                this.rowIndex = (isNullOrUndefined(this.rowIndex) && !isLeastNode && this.dataSourceSettings.rows.length === 0) ? row.index : this.rowIndex;
+                isRowFieldsAvail = (this.valueAxis && this.dataSourceSettings.rows.length === 0 && row.valueSort.levelName.toString().indexOf('Grand Total.') !== 0);
+                if (this.valueAxis && this.dataSourceSettings.rows.length === 0 && row.valueSort.levelName.toString().indexOf('Grand Total.') === 0) {
+                    row.index = this.rowIndex;
+                }
             }
-            else {
-                data[tnum][0] = this.valueContent[actCnt][0] = this.frameHeaderWithKeys(row);
-            }
-            if (this.valueAxis && (this.isMultiMeasures || this.alwaysShowValueHeader)) {
-                var hpos = tnum;
-                var actpos = actCnt;
-                var rowIndex = tnum;
-                var isValueCellUpdated = false;
-                if ((((!(level === 0 && this.measureIndex === 0) && !isLeastNode) || isLeastNode) && row.type === 'value' && !row.valueSort.axis) ||
-                    (level > this.measureIndex && row.axis === 'row' && row.valueSort.axis)) {
-                    var vln = 0;
-                    var isValueIndexFound = false;
-                    for (var cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
-                        if (!isValueIndexFound) {
-                            for (vln = 0; vln < vlt; vln++) {
-                                var name_3 = this.values[vln].caption ? this.values[vln].caption : this.values[vln].name;
-                                if (row.valueSort.levelName && row.valueSort.levelName.toString().indexOf(name_3) > -1) {
-                                    isValueIndexFound = true;
-                                    isValueCellUpdated = true;
+            if (!isRowFieldsAvail) {
+                if (!data[tnum]) {
+                    data[tnum] = [];
+                    this.valueContent[actCnt] = {};
+                    data[tnum][0] = this.valueContent[actCnt][0] = this.frameHeaderWithKeys(row);
+                }
+                else {
+                    data[tnum][0] = this.valueContent[actCnt][0] = this.frameHeaderWithKeys(row);
+                }
+                if (this.valueAxis && (this.isMultiMeasures || this.alwaysShowValueHeader)) {
+                    var hpos = tnum;
+                    var actpos = actCnt;
+                    var rowIndex = tnum;
+                    var isValueCellUpdated = false;
+                    if ((((!(level === 0 && this.measureIndex === 0) && !isLeastNode) || isLeastNode) && row.type === 'value' && !row.valueSort.axis) ||
+                        (level > this.measureIndex && row.axis === 'row' && row.valueSort.axis)) {
+                        var vln = 0;
+                        var isValueIndexFound = false;
+                        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) {
+                                        isValueIndexFound = true;
+                                        isValueCellUpdated = true;
+                                        break;
+                                    }
+                                }
+                            }
+                            if (level > this.measureIndex && row.axis == 'row' && row.valueSort.axis) {
+                                this.updateRowData(rows, columns, tnum, data, vln, rln, cln, dln, actCnt, rTotal, cTotal);
+                            }
+                            else {
+                                if (!reformAxis[pIndex]) {
+                                    isValueCellUpdated = false;
                                     break;
                                 }
+                                this.updateRowData(reformAxis, columns, tnum, data, vln, pIndex, cln, dln, actCnt, rTotal, cTotal);
                             }
+                            dln = data[tnum].length;
                         }
-                        if (level > this.measureIndex && row.axis == 'row' && row.valueSort.axis) {
-                            this.updateRowData(rows, columns, tnum, data, vln, rln, cln, dln, actCnt, rTotal, cTotal);
-                        }
-                        else {
-                            if (!reformAxis[pIndex]) {
-                                isValueCellUpdated = false;
-                                break;
-                            }
-                            this.updateRowData(reformAxis, columns, tnum, data, vln, pIndex, cln, dln, actCnt, rTotal, cTotal);
+                    }
+                    if (!isValueCellUpdated) {
+                        for (var cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
+                            dln = data[tnum].length;
+                            data[hpos][dln] = this.valueContent[actpos][dln] = {
+                                axis: 'value', actualText: '', colSpan: 1,
+                                colIndex: dln, formattedText: '', hasChild: false
+                            };
                         }
-                        dln = data[tnum].length;
                     }
+                    this.recursiveRowData(rows, reformAxis, columns, rowIndex, data, vlt, isLeastNode, rln, vlt, level, rTotal, cTotal);
                 }
-                if (!isValueCellUpdated) {
+                else {
                     for (var cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
-                        dln = data[tnum].length;
-                        data[hpos][dln] = this.valueContent[actpos][dln] = {
-                            axis: 'value', actualText: '', colSpan: 1,
-                            colIndex: dln, formattedText: '', hasChild: false
-                        };
-                    }
-                }
-                this.recursiveRowData(rows, reformAxis, columns, rowIndex, data, vlt, isLeastNode, rln, vlt, level, rTotal, cTotal);
-            }
-            else {
-                for (var cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
-                    for (var vln = 0; vln < vlt; vln++) {
-                        if (!this.valueAxis && !this.isLastHeaderHasMeasures) {
-                            var name_4 = this.values[vln].caption ? this.values[vln].caption : this.values[vln].name;
-                            if (columns[cln].valueSort.levelName && columns[cln].valueSort.levelName.toString().indexOf(name_4) > -1) {
+                        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) {
+                                    this.updateRowData(rows, columns, tnum, data, vln, rln, cln, dln, actCnt, rTotal, cTotal);
+                                    dln = data[tnum].length;
+                                }
+                            }
+                            else {
                                 this.updateRowData(rows, columns, tnum, data, vln, rln, cln, dln, actCnt, rTotal, cTotal);
                                 dln = data[tnum].length;
                             }
                         }
-                        else {
-                            this.updateRowData(rows, columns, tnum, data, vln, rln, cln, dln, actCnt, rTotal, cTotal);
-                            dln = data[tnum].length;
-                        }
                     }
+                    this.recursiveRowData(rows, reformAxis, columns, tnum, data, vlt, isLeastNode, rln, 0, level, rTotal, cTotal);
                 }
+            }
+            else if (!isLeastNode) {
                 this.recursiveRowData(rows, reformAxis, columns, tnum, data, vlt, isLeastNode, rln, 0, level, rTotal, cTotal);
             }
         }
@@ -3691,7 +3715,7 @@ var PivotEngine = /** @class */ (function () {
         for (var _i = 0, selectedHeaders_1 = selectedHeaders; _i < selectedHeaders_1.length; _i++) {
             var headers = selectedHeaders_1[_i];
             var selectedHeaderCollection = headers.aggregateHeaders;
-            var name_5 = headers.value;
+            var name_3 = headers.value;
             // let valueCount: number = (this.valueAxis && (this.isMutiMeasures || this.alwaysShowValueHeader) ? headers.valueCount : 0);
             var aggregateType = headers.type;
             var uniqueName = headers.uniqueName;
@@ -3713,7 +3737,7 @@ var PivotEngine = /** @class */ (function () {
                                 if (rowheads[rln].valueSort[uniqueName]) {
                                     activeValues = rowheads[rln];
                                     if (this.valueAxis === 0 || (this.valueAxis && data[rln] && data[rln][1] &&
-                                        data[rln][1].actualText === name_5)) {
+                                        data[rln][1].actualText === name_3)) {
                                         selectedRowValues = data[rln];
                                     }
                                     else {
@@ -3804,7 +3828,7 @@ var PivotEngine = /** @class */ (function () {
                                                 for (var _d = 0, colIndex_2 = colIndex; _d < colIndex_2.length; _d++) {
                                                     var index = colIndex_2[_d];
                                                     var currentSet = data[rln][index];
-                                                    if (currentSet.axis === 'value' && currentSet.actualText === name_5) {
+                                                    if (currentSet.axis === 'value' && currentSet.actualText === name_3) {
                                                         indexCollection.push([rln, index]);
                                                         if (pivotIndex[rln + ',' + index]) {
                                                             delete pivotIndex[rln + ',' + index];
@@ -3827,7 +3851,7 @@ var PivotEngine = /** @class */ (function () {
                                             for (var _f = 0, colIndex_3 = colIndex; _f < colIndex_3.length; _f++) {
                                                 var index = colIndex_3[_f];
                                                 var currentSet = data[rlen][index];
-                                                if (currentSet.axis === 'value' && currentSet.actualText === name_5) {
+                                                if (currentSet.axis === 'value' && currentSet.actualText === name_3) {
                                                     indexCollection.push([rlen, index]);
                                                     if (pivotIndex[rlen + ',' + index]) {
                                                         delete pivotIndex[rlen + ',' + index];
@@ -3849,7 +3873,7 @@ var PivotEngine = /** @class */ (function () {
                                 }
                                 if (aggregateType === 'DifferenceFrom') {
                                     this.aggregatedValueMatrix[index[0]][index[1]] = cVal;
-                                    currentSet.formattedText = cVal === 0 ? this.emptyCellTextContent : this.getFormattedValue(cVal, name_5).formattedText;
+                                    currentSet.formattedText = cVal === 0 ? this.emptyCellTextContent : this.getFormattedValue(cVal, name_3).formattedText;
                                 }
                                 else {
                                     // cVal = ((selectedRowValues[index[1]] as IAxisSet).value === 0 ?
@@ -3873,7 +3897,7 @@ var PivotEngine = /** @class */ (function () {
                                             for (var _j = 0, rowindexCollection_1 = rowindexCollection; _j < rowindexCollection_1.length; _j++) {
                                                 var index = rowindexCollection_1[_j];
                                                 var currentSet = data[index][cln];
-                                                if (currentSet.axis === 'value' && currentSet.actualText === name_5) {
+                                                if (currentSet.axis === 'value' && currentSet.actualText === name_3) {
                                                     isSelectedColumn = true;
                                                     indexCollection.push([index, cln]);
                                                     if (pivotIndex[index + ',' + cln]) {
@@ -3899,7 +3923,7 @@ var PivotEngine = /** @class */ (function () {
                                             for (var _k = 0, rowindexCollection_2 = rowindexCollection; _k < rowindexCollection_2.length; _k++) {
                                                 var index = rowindexCollection_2[_k];
                                                 var currentSet = data[index][clen];
-                                                if (currentSet.axis === 'value' && currentSet.actualText === name_5) {
+                                                if (currentSet.axis === 'value' && currentSet.actualText === name_3) {
                                                     isSelectedColumn = true;
                                                     indexCollection.push([index, clen]);
                                                     if (pivotIndex[index + ',' + clen]) {
@@ -3924,7 +3948,7 @@ var PivotEngine = /** @class */ (function () {
                                 var selectedColumnValue = 0;
                                 if (selectedColumnValues.length === 0) {
                                     var selectedRow = this.getSelectedRow(currentSet.rowHeaders, rowheads);
-                                    selectedColumnValue = this.getAggregateValue(selectedRow.index, selectedColumn.indexObject, this.fieldList[name_5].index, headers.type);
+                                    selectedColumnValue = this.getAggregateValue(selectedRow.index, selectedColumn.indexObject, this.fieldList[name_3].index, headers.type);
                                 }
                                 else {
                                     selectedColumnValue = selectedColumnValues[index[0]].value;
@@ -3935,7 +3959,7 @@ var PivotEngine = /** @class */ (function () {
                                     this.aggregatedValueMatrix[index[0]] = [];
                                 }
                                 if (aggregateType === 'DifferenceFrom') {
-                                    currentSet.formattedText = cVal === 0 ? this.emptyCellTextContent : this.getFormattedValue(cVal, name_5).formattedText;
+                                    currentSet.formattedText = cVal === 0 ? this.emptyCellTextContent : this.getFormattedValue(cVal, name_3).formattedText;
                                     this.aggregatedValueMatrix[index[0]][index[1]] = cVal;
                                 }
                                 else {
@@ -3966,7 +3990,7 @@ var PivotEngine = /** @class */ (function () {
                                             for (var _p = 0, colIndex_4 = colIndex; _p < colIndex_4.length; _p++) {
                                                 var index = colIndex_4[_p];
                                                 var currentSet = data[i][index];
-                                                if (currentSet.axis === 'value' && currentSet.actualText === name_5) {
+                                                if (currentSet.axis === 'value' && currentSet.actualText === name_3) {
                                                     indexCollection.push([i, index]);
                                                     if (pivotIndex[i + ',' + index]) {
                                                         delete pivotIndex[i + ',' + index];
@@ -3983,7 +4007,7 @@ var PivotEngine = /** @class */ (function () {
                                 // let cVal: number = currentSet.value / (selectedRowValues[i[1]] as IAxisSet).value;
                                 var selectedRowValue = 0;
                                 if (selectedRowValues.length === 0 && activeValues) {
-                                    selectedRowValue = this.getAggregateValue(activeValues.index, colheads[i[1] - 1].indexObject, this.fieldList[name_5].index, headers.type);
+                                    selectedRowValue = this.getAggregateValue(activeValues.index, colheads[i[1] - 1].indexObject, this.fieldList[name_3].index, headers.type);
                                 }
                                 else {
                                     selectedRowValue = selectedRowValues[i[1]] ? selectedRowValues[i[1]].actualValue : 0;
@@ -4006,7 +4030,7 @@ var PivotEngine = /** @class */ (function () {
                                         for (var _s = 0, rowindexCollection_3 = rowindexCollection; _s < rowindexCollection_3.length; _s++) {
                                             var index = rowindexCollection_3[_s];
                                             var currentSet = data[index][j];
-                                            if (currentSet.axis === 'value' && currentSet.actualText === name_5) {
+                                            if (currentSet.axis === 'value' && currentSet.actualText === name_3) {
                                                 isSelectedColumn = true;
                                                 indexCollection.push([index, j]);
                                                 if (pivotIndex[index + ',' + j]) {
@@ -4030,7 +4054,7 @@ var PivotEngine = /** @class */ (function () {
                                 var selectedColValue = 0;
                                 if (selectedColumnValues.length === 0) {
                                     var selectedRow = this.getSelectedRow(currentSet.rowHeaders, rowheads);
-                                    selectedColValue = this.getAggregateValue(selectedRow.index, selectedCol.indexObject, this.fieldList[name_5].index, headers.type);
+                                    selectedColValue = this.getAggregateValue(selectedRow.index, selectedCol.indexObject, this.fieldList[name_3].index, headers.type);
                                 }
                                 else {
                                     selectedColValue = selectedColumnValues[i[0]].value;
@@ -4060,10 +4084,10 @@ var PivotEngine = /** @class */ (function () {
                                             var currentSet = data[rlen][index];
                                             if (rowheads[rlen] !== undefined && rowheads[rlen].valueSort[item.valueSort.levelName] &&
                                                 rowheads[rlen].level === item.level && currentSet.axis === 'value' &&
-                                                currentSet.actualText === name_5) {
+                                                currentSet.actualText === name_3) {
                                                 if (rowheads[rlen].type !== 'grand sum') {
                                                     cVal += (!currentSet.showSubTotals && !(!isNullOrUndefined(currentSet.actualValue) && isNaN(currentSet.actualValue))) ? currentSet.actualValue : currentSet.value;
-                                                    currentSet.formattedText = currentSet.showSubTotals ? (cVal === 0 && (currentSet.actualValue && currentSet.actualValue !== 0) ? '' : this.getFormattedValue(cVal, name_5).formattedText) : currentSet.formattedText;
+                                                    currentSet.formattedText = currentSet.showSubTotals ? (cVal === 0 && (currentSet.actualValue && currentSet.actualValue !== 0) ? '' : this.getFormattedValue(cVal, name_3).formattedText) : currentSet.formattedText;
                                                     if (!this.aggregatedValueMatrix[rlen]) {
                                                         this.aggregatedValueMatrix[rlen] = [];
                                                     }
@@ -4092,10 +4116,10 @@ var PivotEngine = /** @class */ (function () {
                                             var currentSet = data[rln][cln];
                                             if (activeColumn[cln] !== undefined &&
                                                 activeColumn[cln].valueSort[item.valueSort.levelName] &&
-                                                currentSet.axis === 'value' && currentSet.actualText === name_5) {
+                                                currentSet.axis === 'value' && currentSet.actualText === name_3) {
                                                 if (activeColumn[cln].type !== 'grand sum') {
                                                     cVal += currentSet.value;
-                                                    currentSet.formattedText = subTotal ? '' : this.getFormattedValue(cVal, name_5).formattedText;
+                                                    currentSet.formattedText = subTotal ? '' : this.getFormattedValue(cVal, name_3).formattedText;
                                                     if (!this.aggregatedValueMatrix[rln]) {
                                                         this.aggregatedValueMatrix[rln] = [];
                                                     }
@@ -4264,15 +4288,18 @@ var PivotEngine = /** @class */ (function () {
         return currentCellSets;
     };
     /* eslint-disable , @typescript-eslint/no-explicit-any */
-    PivotEngine.prototype.updateValueMembers = function (hasMeasureIndex, headerInfo, levelName, columnHeaders, axis, vcnt, levelIndex) {
+    PivotEngine.prototype.updateValueMembers = function (hasMeasureIndex, headerInfo, levelInfo, columnHeaders, axis, vcnt, levelIndex) {
+        var levelName = levelInfo && !isNullOrUndefined(levelInfo.levelName) ? levelInfo.levelName.toString() : undefined;
+        var uniqueName = levelInfo && !isNullOrUndefined(levelInfo.uniqueName) ? levelInfo.uniqueName.toString() : undefined;
         if (hasMeasureIndex) {
             for (var vln = 0; vln < vcnt; vln++) {
-                var name_6 = this.values[vln].caption ? this.values[vln].caption : this.values[vln].name;
+                var field = this.values[vln];
+                var name_4 = field.caption ? field.caption : field.name;
                 var calObj = {
                     axis: this.valueAxis ? 'row' : 'column',
                     rowIndex: !this.valueAxis ? (headerInfo && levelIndex <= headerInfo.rowIndex ? (headerInfo.rowIndex + 1) : levelIndex) : 0,
-                    actualText: this.values[vln].name,
-                    formattedText: name_6,
+                    actualText: field.name,
+                    formattedText: name_4,
                     level: 0,
                     valueSort: {},
                     // colIndex: (tnum) + 1 + vln,
@@ -4283,14 +4310,16 @@ var PivotEngine = /** @class */ (function () {
                     indexObject: !this.valueAxis && headerInfo ? headerInfo.indexObject : null
                 };
                 if (axis.length > 0) {
-                    calObj.showSubTotals = this.values[vln].showSubTotals;
+                    calObj.showSubTotals = field.showSubTotals;
                 }
                 var vData = calObj.valueSort;
-                vData.axis = !this.valueAxis ? this.values[vln].name : undefined;
-                vData[(levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + name_6] = 1;
-                vData.levelName = (levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + name_6;
+                vData.axis = !this.valueAxis ? field.name : undefined;
+                vData[(levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + name_4] = 1;
+                vData[(uniqueName ? (uniqueName + this.valueSortSettings.headerDelimiter) : '') + field.name] = 1;
+                vData.levelName = (levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + name_4;
+                vData.uniqueName = (uniqueName ? (uniqueName + this.valueSortSettings.headerDelimiter) : '') + field.name;
                 columnHeaders.push(calObj);
-                this.updateValueMembers(false, headerInfo, ((levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + name_6), calObj.members, axis, vcnt, levelIndex + 1);
+                this.updateValueMembers(false, headerInfo, vData, calObj.members, axis, vcnt, levelIndex + 1);
             }
         }
         else {
@@ -4301,7 +4330,9 @@ var PivotEngine = /** @class */ (function () {
                 var hData = {};
                 hData.axis = header.valueSort.axis;
                 hData[(levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + header.formattedText] = 1;
+                hData[(uniqueName ? (uniqueName + this.valueSortSettings.headerDelimiter) : '') + header.actualText] = 1;
                 hData.levelName = (levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + header.formattedText;
+                hData.uniqueName = (uniqueName ? (uniqueName + this.valueSortSettings.headerDelimiter) : '') + header.actualText;
                 header.valueSort = hData;
                 var drillInfo = hData.axis + this.valueSortSettings.headerDelimiter + hData.levelName;
                 if (header.isDrilled && ((this.isExpandAll && this.fieldDrillCollection[drillInfo]) ||
@@ -4312,16 +4343,16 @@ var PivotEngine = /** @class */ (function () {
                 if (header.isDrilled && axis[rln].members.length > 0) {
                     if (this.valueAxis && levelIndex < this.measureIndex && this.measureIndex !== (levelIndex + 1) && (!(axis[rln].hasChild &&
                         ((!isNullOrUndefined(axis[rln].showSubTotals) && !axis[rln].showSubTotals) || !this.showSubTotals || !this.showRowSubTotals)))) {
-                        this.updateValueMembers(true, header, hData.levelName, columnHeaders[columnHeaders.length - 1].members, [], vcnt, levelIndex);
+                        this.updateValueMembers(true, header, hData, columnHeaders[columnHeaders.length - 1].members, [], vcnt, levelIndex);
                     }
-                    this.updateValueMembers(this.measureIndex === (levelIndex + 1), header, hData.levelName, columnHeaders[columnHeaders.length - 1].members, axis[rln].members, vcnt, levelIndex + 1);
+                    this.updateValueMembers(this.measureIndex === (levelIndex + 1), header, hData, columnHeaders[columnHeaders.length - 1].members, axis[rln].members, vcnt, levelIndex + 1);
                     if (!this.valueAxis && levelIndex < this.measureIndex && this.measureIndex !== (levelIndex + 1) && (!(axis[rln].hasChild &&
                         ((!isNullOrUndefined(axis[rln].showSubTotals) && !axis[rln].showSubTotals) || !this.showSubTotals || !this.showColumnSubTotals)))) {
-                        this.updateValueMembers(true, header, hData.levelName, columnHeaders[columnHeaders.length - 1].members, [], vcnt, levelIndex);
+                        this.updateValueMembers(true, header, hData, columnHeaders[columnHeaders.length - 1].members, [], vcnt, levelIndex);
                     }
                 }
                 else if (levelIndex < this.measureIndex) {
-                    this.updateValueMembers(true, header, hData.levelName, columnHeaders[columnHeaders.length - 1].members, [], vcnt, levelIndex);
+                    this.updateValueMembers(true, header, hData, columnHeaders[columnHeaders.length - 1].members, [], vcnt, levelIndex);
                 }
             }
         }
@@ -4364,11 +4395,12 @@ var PivotEngine = /** @class */ (function () {
         if (!this.valueAxis && !this.isLastHeaderHasMeasures) {
             var columnHeaders = [];
             if (this.showGrandTotals && this.showColumnGrandTotals && axis[axis.length - 1].type == 'grand sum') {
-                this.updateValueMembers(this.measureIndex === 0, null, null, columnHeaders, axis.slice(0, axis.length - 1), vcnt, 0);
+                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 {
-                this.updateValueMembers(this.measureIndex === 0, null, null, columnHeaders, axis, vcnt, 0);
+                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);
             }
             this.getAggregatedHeaders(rows, columns, this.rMembers, columnHeaders, values);
             if (this.selectedHeaders.values.length > 0) {
@@ -4403,11 +4435,12 @@ var PivotEngine = /** @class */ (function () {
         }
         else if (rowAxis.length == 0 && (this.valueAxis && (this.isMultiMeasures || this.alwaysShowValueHeader)) && this.values.length > 0) {
             if (this.showGrandTotals && this.showRowGrandTotals && this.rMembers[this.rMembers.length - 1].type == 'grand sum') {
-                this.updateValueMembers(this.measureIndex == 0, null, null, rowAxis, this.rMembers.slice(0, this.rMembers.length - 1), this.values.length, 0);
+                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 {
-                this.updateValueMembers(this.measureIndex == 0, null, null, rowAxis, this.rMembers, this.values.length, 0);
+                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);
             }
             this.getAggregatedHeaders(rows, columns, rowAxis, axis, values);
             if (this.selectedHeaders.values.length > 0) {
@@ -4492,12 +4525,12 @@ var PivotEngine = /** @class */ (function () {
             var isSingleMeasure = (this.columns.length === 0 && this.values.length === 1) ? true : false;
             if ((this.isMultiMeasures || this.alwaysShowValueHeader || isSingleMeasure) && !this.valueAxis && isTotalHide) {
                 for (var vln = 0; vln < vcnt; vln++) {
-                    var name_7 = this.values[vln].caption ? this.values[vln].caption : this.values[vln].name;
+                    var name_5 = this.values[vln].caption ? this.values[vln].caption : this.values[vln].name;
                     /* eslint-disable */
                     var calObj = {
                         axis: 'column',
                         actualText: this.values[vln].name,
-                        formattedText: name_7,
+                        formattedText: name_5,
                         level: 0,
                         valueSort: {},
                         colIndex: (tnum * vcnt) + 1 + vln,
@@ -4513,8 +4546,10 @@ var PivotEngine = /** @class */ (function () {
                         data[colItmLn][(tnum * vcnt) + 1 + vln] = this.headerContent[colItmLn][(tnum * vcnt) + 1 + vln] = calObj;
                     }
                     var vData = data[colItmLn][(tnum * vcnt) + 1 + vln].valueSort;
-                    vData[axis[rln].valueSort.levelName + this.valueSortSettings.headerDelimiter + name_7] = 1;
-                    vData.levelName = axis[rln].valueSort.levelName + this.valueSortSettings.headerDelimiter + name_7;
+                    vData[axis[rln].valueSort.levelName + this.valueSortSettings.headerDelimiter + name_5] = 1;
+                    vData.levelName = axis[rln].valueSort.levelName + this.valueSortSettings.headerDelimiter + name_5;
+                    vData[axis[rln].valueSort.uniqueName + this.valueSortSettings.headerDelimiter + this.values[vln].name] = 1;
+                    vData.uniqueName = axis[rln].valueSort.uniqueName + this.valueSortSettings.headerDelimiter + this.values[vln].name;
                     if (vData && vData[sortText]) {
                         this.valueSortSettings.columnIndex = (tnum * vcnt) + 1 + vln;
                     }

package/src/global.js

@@ -1,3 +1,4 @@
 import * as index from './index';
 index.PivotView.Inject(index.GroupingBar, index.FieldList, index.CalculatedField, index.ConditionalFormatting, index.VirtualScroll, index.DrillThrough, index.Toolbar, index.PivotChart, index.PDFExport, index.ExcelExport, index.NumberFormatting, index.Grouping);
+index.PivotFieldList.Inject(index.CalculatedField);
 export * from './index';

package/src/pivotview/actions/drill-through.js

@@ -174,11 +174,13 @@ var DrillThrough = /** @class */ (function () {
         var valuetText = aggType === 'CalculatedField' ? valueCaption.toString() : aggType !== '' ?
             (this.parent.localeObj.getConstant(aggType) + ' ' + this.parent.localeObj.getConstant('of') + ' ' + valueCaption) :
             valueCaption;
+        var rowHeaders = this.parent.dataSourceSettings.valueAxis === 'row' ? this.parent.getRowText(Number(element.getAttribute('index')), 0) :
+            pivotValue.rowHeaders === '' ? '' : pivotValue.rowHeaders.toString().split(this.parent.dataSourceSettings.valueSortSettings.headerDelimiter).join(' - ');
         var eventArgs = {
             currentTarget: element,
             currentCell: pivotValue,
             rawData: rawData,
-            rowHeaders: pivotValue.rowHeaders === '' ? '' : pivotValue.rowHeaders.toString().split(this.parent.dataSourceSettings.valueSortSettings.headerDelimiter).join(' - '),
+            rowHeaders: rowHeaders,
             columnHeaders: pivotValue.columnHeaders === '' ? '' : pivotValue.columnHeaders.toString().split(this.parent.dataSourceSettings.valueSortSettings.headerDelimiter).join(' - '),
             value: valuetText + '(' + pivotValue.formattedText + ')',
             gridColumns: this.drillThroughDialog.frameGridColumns(rawData),

package/src/pivotview/actions/excel-export.js

@@ -124,13 +124,14 @@ var ExcelExport = /** @class */ (function () {
                             if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
                                 var cellValue = pivotCell.axis === 'value' ? pivotCell.value : pivotCell.formattedText;
                                 if (pivotCell.type === 'grand sum') {
-                                    cellValue = this.parent.localeObj.getConstant('grandTotal');
+                                    cellValue = (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'grandTotal') :
+                                        this.parent.localeObj.getConstant('grandTotal');
                                 }
                                 else if (pivotCell.type === 'sum') {
                                     cellValue = cellValue.toString().replace('Total', this.parent.localeObj.getConstant('total'));
                                 }
                                 else {
-                                    cellValue = cellValue;
+                                    cellValue = (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'value') : cellValue;
                                 }
                                 if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
                                     cells.push({

package/src/pivotview/actions/pdf-export.js

@@ -222,9 +222,10 @@ var PDFExport = /** @class */ (function () {
                                 var pivotCell = pivotValues[rCnt][cCnt];
                                 if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
                                     var cellValue = pivotCell.formattedText;
-                                    cellValue = pivotCell.type === 'grand sum' ? this.parent.localeObj.getConstant('grandTotal') :
-                                        (pivotCell.type === 'sum' ?
-                                            cellValue.toString().replace('Total', this.parent.localeObj.getConstant('total')) : cellValue);
+                                    cellValue = (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'value') : cellValue;
+                                    cellValue = pivotCell.type === 'grand sum' ? (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'grandTotal') :
+                                        this.parent.localeObj.getConstant('grandTotal') : (pivotCell.type === 'sum' ?
+                                        cellValue.toString().replace('Total', this.parent.localeObj.getConstant('total')) : cellValue);
                                     if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
                                         pdfGridRow.cells.getCell(localCnt).columnSpan = pivotCell.colSpan ?
                                             (pageSize - localCnt < pivotCell.colSpan ? pageSize - localCnt : pivotCell.colSpan) : 1;