@syncfusion/ej2-pivotview 19.3.43 → 19.3.48

package/dist/es6/ej2-pivotview.es5.js

@@ -3949,10 +3949,14 @@ var PivotEngine = /** @__PURE__ @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) ?
@@ -4120,10 +4124,16 @@ var PivotEngine = /** @__PURE__ @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);
@@ -4308,6 +4318,7 @@ var PivotEngine = /** @__PURE__ @class */ (function () {
             isDrilled: false,
             indexObject: {},
             members: [],
+            actualText: 'Grand' + customText,
             formattedText: 'Grand' + customText,
             ordinal: len,
             type: 'grand sum',
@@ -4315,6 +4326,8 @@ var PivotEngine = /** @__PURE__ @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];
         }
@@ -4335,74 +4348,85 @@ var PivotEngine = /** @__PURE__ @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);
             }
         }
@@ -4662,7 +4686,7 @@ var PivotEngine = /** @__PURE__ @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;
@@ -4684,7 +4708,7 @@ var PivotEngine = /** @__PURE__ @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 {
@@ -4775,7 +4799,7 @@ var PivotEngine = /** @__PURE__ @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];
@@ -4798,7 +4822,7 @@ var PivotEngine = /** @__PURE__ @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];
@@ -4820,7 +4844,7 @@ var PivotEngine = /** @__PURE__ @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 ?
@@ -4844,7 +4868,7 @@ var PivotEngine = /** @__PURE__ @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]) {
@@ -4870,7 +4894,7 @@ var PivotEngine = /** @__PURE__ @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]) {
@@ -4895,7 +4919,7 @@ var PivotEngine = /** @__PURE__ @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;
@@ -4906,7 +4930,7 @@ var PivotEngine = /** @__PURE__ @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 {
@@ -4937,7 +4961,7 @@ var PivotEngine = /** @__PURE__ @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];
@@ -4954,7 +4978,7 @@ var PivotEngine = /** @__PURE__ @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;
@@ -4977,7 +5001,7 @@ var PivotEngine = /** @__PURE__ @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]) {
@@ -5001,7 +5025,7 @@ var PivotEngine = /** @__PURE__ @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;
@@ -5031,10 +5055,10 @@ var PivotEngine = /** @__PURE__ @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] = [];
                                                     }
@@ -5063,10 +5087,10 @@ var PivotEngine = /** @__PURE__ @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] = [];
                                                     }
@@ -5235,15 +5259,18 @@ var PivotEngine = /** @__PURE__ @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,
@@ -5254,14 +5281,16 @@ var PivotEngine = /** @__PURE__ @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 {
@@ -5272,7 +5301,9 @@ var PivotEngine = /** @__PURE__ @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]) ||
@@ -5283,16 +5314,16 @@ var PivotEngine = /** @__PURE__ @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);
                 }
             }
         }
@@ -5335,11 +5366,12 @@ var PivotEngine = /** @__PURE__ @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) {
@@ -5374,11 +5406,12 @@ var PivotEngine = /** @__PURE__ @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) {
@@ -5463,12 +5496,12 @@ var PivotEngine = /** @__PURE__ @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,
@@ -5484,8 +5517,10 @@ var PivotEngine = /** @__PURE__ @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;
                     }
@@ -8120,6 +8155,8 @@ var Render = /** @__PURE__ @class */ (function () {
         if (tCell && (this.parent.notEmpty) && this.engine.headerContent) {
             var customClass = this.parent.hyperlinkSettings.cssClass;
             var cell = args.data[0];
+            var isRowFieldsAvail = cell.valueSort && cell.valueSort.levelName === (this.parent.dataSourceSettings.rows.length === 0 && this.parent.dataSourceSettings.valueAxis === 'row' &&
+                this.parent.localeObj.getConstant('grandTotal') + (this.parent.dataSourceSettings.valueSortSettings.headerDelimiter) + (cell.formattedText));
             tCell.setAttribute('index', cell.rowIndex ? cell.rowIndex.toString() : '0');
             if (tCell.getAttribute('aria-colindex') === '0') {
                 if (this.parent.dataType === 'pivot') {
@@ -8174,11 +8211,17 @@ var Render = /** @__PURE__ @class */ (function () {
                     if (cell.type === 'grand sum') {
                         this.rowGrandPos = cell.rowIndex;
                         tCell.classList.add('e-gtot');
-                        localizedText = isNullOrUndefined(cell.valueSort.axis) ? this.parent.localeObj.getConstant('grandTotal') : cell.formattedText;
+                        var values = this.parent.dataSourceSettings.values;
+                        localizedText = isNullOrUndefined(cell.valueSort.axis) ? (this.parent.dataSourceSettings.rows.length === 0 && values.length === 1 && this.parent.dataSourceSettings.valueAxis === 'row') ?
+                            this.parent.localeObj.getConstant('total') + ' ' + this.parent.localeObj.getConstant(values[values.length - 1].type) + ' ' +
+                                this.parent.localeObj.getConstant('of') + ' ' + (!isNullOrUndefined(values[values.length - 1].caption) ? values[values.length - 1].caption : values[values.length - 1].name) :
+                            this.parent.localeObj.getConstant('grandTotal') : cell.formattedText;
                     }
                     else if (cell.valueSort.levelName === (this.parent.localeObj.getConstant('grandTotal') +
                         (this.parent.dataSourceSettings.valueSortSettings.headerDelimiter) + (cell.formattedText))) {
                         tCell.classList.add('e-gtot');
+                        localizedText = isRowFieldsAvail ? this.parent.localeObj.getConstant('total') + ' ' + this.parent.localeObj.getConstant(this.parent.engineModule.fieldList[cell.actualText].aggregateType) + ' '
+                            + this.parent.localeObj.getConstant('of') + ' ' + cell.formattedText : localizedText;
                     }
                     else {
                         tCell.classList.add('e-stot');
@@ -8200,8 +8243,9 @@ var Render = /** @__PURE__ @class */ (function () {
                 }));
                 var vSort = this.parent.pivotView.dataSourceSettings.valueSortSettings;
                 if (this.parent.enableValueSorting) {
-                    if (vSort && vSort.headerText && this.parent.dataSourceSettings.valueAxis === 'row'
-                        && this.parent.pivotValues[Number(tCell.getAttribute('index'))][0].valueSort.levelName) {
+                    if (vSort && vSort.headerText && this.parent.dataSourceSettings.valueAxis === 'row' &&
+                        this.parent.pivotValues[Number(tCell.getAttribute('index'))][0] &&
+                        this.parent.pivotValues[Number(tCell.getAttribute('index'))][0].valueSort.levelName) {
                         if (this.parent.pivotValues[Number(tCell.getAttribute('index'))][0].valueSort.levelName
                             === vSort.headerText) {
                             var style = (tCell.querySelector('.e-expand') || tCell.querySelector('.e-collapse')) ?
@@ -8222,6 +8266,7 @@ var Render = /** @__PURE__ @class */ (function () {
                 tCell.classList.add(VALUESCONTENT);
                 cell = args.data[Number(tCell.getAttribute('aria-colindex'))];
                 cell = isNullOrUndefined(cell) ? args.column.customAttributes.cell : cell;
+                cell.isGrandSum = isRowFieldsAvail ? true : cell.isGrandSum;
                 if (cell.isSum) {
                     tCell.classList.add(SUMMARY);
                 }
@@ -8430,16 +8475,20 @@ var Render = /** @__PURE__ @class */ (function () {
                 else {
                     tCell = this.onOlapColumnCellBoundEvent(tCell, cell);
                 }
-                if (cell.type) {
+                var isColumnFieldsAvail = (this.parent.dataSourceSettings.columns.length === 0 && this.parent.dataSourceSettings.valueAxis === 'column' && cell.valueSort &&
+                    cell.valueSort.levelName === (this.parent.localeObj.getConstant('grandTotal') + (this.parent.dataSourceSettings.valueSortSettings.headerDelimiter) + (cell.formattedText)));
+                if (cell.type || isColumnFieldsAvail) {
                     tCell.classList.add(cell.type === 'grand sum' ? 'e-gtot' : 'e-stot');
                     if (cell.type === 'grand sum') {
                         this.colGrandPos = cell.colIndex;
                     }
-                    else {
+                    else if (cell.type) {
                         tCell.classList.add('e-colstot');
                     }
                     var localizedText = cell.type === 'grand sum' ? (isNullOrUndefined(cell.valueSort.axis) ? this.parent.localeObj.getConstant('grandTotal') : cell.formattedText) :
                         cell.formattedText.split('Total')[0] + this.parent.localeObj.getConstant('total');
+                    localizedText = isColumnFieldsAvail ? this.parent.localeObj.getConstant('total') + ' ' + this.parent.localeObj.getConstant(this.parent.engineModule.fieldList[cell.actualText].aggregateType)
+                        + ' ' + this.parent.localeObj.getConstant('of') + ' ' + cell.formattedText : localizedText;
                     if (tCell.querySelector('.e-headertext') !== null) {
                         tCell.querySelector('.e-headertext').innerText = localizedText;
                     }
@@ -8877,8 +8926,39 @@ var Render = /** @__PURE__ @class */ (function () {
         }
         return formatArray;
     };
+    Render.prototype.getValidHeader = function (args, axis) {
+        var values = this.parent.dataSourceSettings.values;
+        if (axis === 'row') {
+            var cellInfo = args;
+            if (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) {
+                if (this.parent.dataSourceSettings.rows.length === 0 && this.parent.dataSourceSettings.valueAxis === 'row' && (this.parent.localeObj.getConstant('grandTotal') +
+                    this.parent.dataSourceSettings.valueSortSettings.headerDelimiter + cellInfo.value) === cellInfo.data[0].valueSort.levelName) {
+                    return this.parent.localeObj.getConstant('total') + ' ' + this.parent.localeObj.getConstant(this.parent.engineModule.fieldList[cellInfo.value.toString()].aggregateType)
+                        + ' ' + this.parent.localeObj.getConstant('of') + ' ' + cellInfo.value.toString();
+                }
+                else if (values.length === 1) {
+                    return this.parent.localeObj.getConstant('total') + ' ' + this.parent.localeObj.getConstant(values[values.length - 1].type)
+                        + ' ' + this.parent.localeObj.getConstant('of') + ' ' + (!isNullOrUndefined(values[values.length - 1].caption) ? values[values.length - 1].caption : values[values.length - 1].name);
+                }
+            }
+            return cellInfo.value;
+        }
+        else if (axis === 'column') {
+            var cellInfo = args;
+            if (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) {
+                if (!isNullOrUndefined(args.gridCell.column.customAttributes) && this.parent.dataSourceSettings.columns.length === 0 && this.parent.dataSourceSettings.valueAxis === 'column' &&
+                    (this.parent.localeObj.getConstant('grandTotal') + this.parent.dataSourceSettings.valueSortSettings.headerDelimiter + cellInfo.gridCell.column.customAttributes.cell.formattedText)
+                        === cellInfo.gridCell.column.customAttributes.cell.valueSort.levelName) {
+                    return this.parent.localeObj.getConstant('total') + ' ' + this.parent.localeObj.getConstant(this.parent.engineModule.fieldList[cellInfo
+                        .gridCell.column.customAttributes.cell.actualText].aggregateType) + ' ' + this.parent.localeObj.getConstant('of') + ' ' + cellInfo.gridCell.column.customAttributes.cell.formattedText;
+                }
+            }
+            return (cellInfo.cell).value;
+        }
+    };
     /* eslint-disable */
     Render.prototype.excelColumnEvent = function (args) {
+        (args.cell).value = this.getValidHeader(args, 'column');
         if (args.gridCell !== undefined && args.gridCell.column.width === 'auto') {
             this.parent.lastColumn = args.gridCell.column;
             args.gridCell.column.width = args.gridCell.column.minWidth;
@@ -8887,6 +8967,7 @@ var Render = /** @__PURE__ @class */ (function () {
         this.parent.trigger(excelHeaderQueryCellInfo, args);
     };
     Render.prototype.pdfColumnEvent = function (args) {
+        (args.cell).value = this.getValidHeader(args, 'column');
         if (args.gridCell !== undefined && args.gridCell.column.width === 'auto') {
             this.parent.lastColumn = args.gridCell.column;
             args.gridCell.column.width = args.gridCell.column.minWidth;
@@ -8927,6 +9008,7 @@ var Render = /** @__PURE__ @class */ (function () {
             }
         }
         args = this.exportContentEvent(args);
+        args.value = args.column.field === '0.formattedText' ? this.getValidHeader(args, 'row') : args.value;
         this.parent.trigger(excelQueryCellInfo, args);
     };
     /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -8950,6 +9032,7 @@ var Render = /** @__PURE__ @class */ (function () {
             }
             args.style = { paragraphIndent: level * 10 };
             this.lastSpan = isValueCell ? this.lastSpan : level;
+            args.value = this.getValidHeader(args, 'row');
         }
         this.parent.trigger(pdfQueryCellInfo, args);
     };
@@ -14043,11 +14126,13 @@ var DrillThrough = /** @__PURE__ @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),
@@ -24354,13 +24439,21 @@ var PivotView = /** @__PURE__ @class */ (function (_super) {
         var cell = this.pivotValues[rowIndex][colIndex];
         var level = this.getLevel(cell);
         var rowText = cell.type === 'grand sum' ? this.localeObj.getConstant('grandTotal') : cell.formattedText;
-        while (level > 0 || cell.index === undefined) {
-            rowIndex--;
-            cell = this.pivotValues[rowIndex][colIndex];
-            if (cell.index !== undefined) {
-                if (level > cell.level) {
-                    rowText = rowText + ' - ' + cell.formattedText;
-                    level = level - 1;
+        if (this.dataSourceSettings.valueAxis === 'row') {
+            rowText = (this.dataSourceSettings.rows.length === 0 && this.dataSourceSettings.values.length > 1) ? this.pivotValues[rowIndex][0].valueSort.levelName.toString().slice((this.localeObj.getConstant('grandTotal')
+                + this.dataSourceSettings.valueSortSettings.headerDelimiter).length).toString() : this.dataSourceSettings.values.length === 1 ? !isNullOrUndefined(this.dataSourceSettings.values[0].caption) ?
+                this.dataSourceSettings.values[0].caption : this.dataSourceSettings.values[0].name : this.pivotValues[rowIndex][0].valueSort.levelName.toString();
+            return rowText.split(this.dataSourceSettings.valueSortSettings.headerDelimiter).join(' - ');
+        }
+        else {
+            while (level > 0 || cell.index === undefined) {
+                rowIndex--;
+                cell = this.pivotValues[rowIndex][colIndex];
+                if (cell.index !== undefined) {
+                    if (level > cell.level) {
+                        rowText = rowText + ' - ' + cell.formattedText;
+                        level = level - 1;
+                    }
                 }
             }
         }
@@ -24818,7 +24911,7 @@ var PivotView = /** @__PURE__ @class */ (function (_super) {
             ele = target;
         }
         else if (target.classList.contains('e-stackedheadercelldiv') || target.classList.contains('e-cellvalue') ||
-            target.classList.contains('e-headercelldiv')) {
+            target.classList.contains('e-headercelldiv') || target.classList.contains('e-sortfilterdiv')) {
             ele = target.parentElement;
         }
         else if (target.classList.contains('e-headertext')) {
@@ -25763,6 +25856,22 @@ var PivotView = /** @__PURE__ @class */ (function (_super) {
             this.numberFormattingModule.showNumberFormattingDialog();
         }
     };
+    /** @hidden */
+    PivotView.prototype.getValuesHeader = function (pivotCell, type) {
+        var values = this.dataSourceSettings.values;
+        if (type === 'value' && !isNullOrUndefined(pivotCell.valueSort) && (this.localeObj.getConstant('grandTotal') + this.dataSourceSettings.valueSortSettings.headerDelimiter + pivotCell.formattedText)
+            === pivotCell.valueSort.levelName && ((pivotCell.axis === 'column' && this.dataSourceSettings.columns.length === 0 && this.dataSourceSettings.valueAxis === 'column') || (pivotCell.axis === 'row' &&
+            this.dataSourceSettings.rows.length === 0 && this.dataSourceSettings.valueAxis === 'row'))) {
+            return this.localeObj.getConstant('total') + ' ' + this.localeObj.getConstant(this.engineModule.fieldList[pivotCell.actualText].aggregateType) + ' ' +
+                this.localeObj.getConstant('of') + ' ' + pivotCell.formattedText;
+        }
+        else if (type === 'grandTotal' && values.length === 1 && this.dataSourceSettings.valueAxis === 'row' && pivotCell.formattedText === this.localeObj.getConstant('grandTotal')) {
+            return this.localeObj.getConstant('total') + ' ' + this.localeObj.getConstant(values[values.length - 1].type) + ' ' +
+                this.localeObj.getConstant('of') + ' ' + (!isNullOrUndefined(values[values.length - 1].caption) ? values[values.length - 1].caption
+                : values[values.length - 1].name);
+        }
+        return pivotCell.formattedText;
+    };
     __decorate([
         Property('USD')
     ], PivotView.prototype, "currencyCode", void 0);
@@ -26211,13 +26320,14 @@ var ExcelExport$1 = /** @__PURE__ @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({
@@ -26535,9 +26645,10 @@ var PDFExport = /** @__PURE__ @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;