@syncfusion/ej2-pivotview 19.3.43 → 19.3.48

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

@@ -3866,10 +3866,14 @@ class PivotEngine {
                     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);
                     }
                     let memberString = member.valueSort.axis + this.valueSortSettings.headerDelimiter + member.valueSort.levelName;
                     member.isDrilled = (valueFil && this.isValueFiltersAvail) ?
@@ -4037,10 +4041,16 @@ class PivotEngine {
                             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);
@@ -4225,6 +4235,7 @@ class PivotEngine {
             isDrilled: false,
             indexObject: {},
             members: [],
+            actualText: 'Grand' + customText,
             formattedText: 'Grand' + customText,
             ordinal: len,
             type: 'grand sum',
@@ -4232,6 +4243,8 @@ class PivotEngine {
         };
         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 (let ln = 0, lt = filter.length; ln < lt; ln++) {
             set[len].indexObject[filter[ln]] = filter[ln];
         }
@@ -4252,74 +4265,85 @@ class PivotEngine {
             let 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);
+            let 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)) {
-                let hpos = tnum;
-                let actpos = actCnt;
-                let rowIndex = tnum;
-                let 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)) {
-                    let vln = 0;
-                    let isValueIndexFound = false;
-                    for (let cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
-                        if (!isValueIndexFound) {
-                            for (vln = 0; vln < vlt; vln++) {
-                                let name = this.values[vln].caption ? this.values[vln].caption : this.values[vln].name;
-                                if (row.valueSort.levelName && row.valueSort.levelName.toString().indexOf(name) > -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)) {
+                    let hpos = tnum;
+                    let actpos = actCnt;
+                    let rowIndex = tnum;
+                    let 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)) {
+                        let vln = 0;
+                        let isValueIndexFound = false;
+                        for (let 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 (let 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 (let 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 (let cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
-                    for (let vln = 0; vln < vlt; vln++) {
-                        if (!this.valueAxis && !this.isLastHeaderHasMeasures) {
-                            let name = this.values[vln].caption ? this.values[vln].caption : this.values[vln].name;
-                            if (columns[cln].valueSort.levelName && columns[cln].valueSort.levelName.toString().indexOf(name) > -1) {
+                        for (let 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);
             }
         }
@@ -5115,14 +5139,17 @@ class PivotEngine {
         return currentCellSets;
     }
     /* eslint-disable , @typescript-eslint/no-explicit-any */
-    updateValueMembers(hasMeasureIndex, headerInfo, levelName, columnHeaders, axis, vcnt, levelIndex) {
+    updateValueMembers(hasMeasureIndex, headerInfo, levelInfo, columnHeaders, axis, vcnt, levelIndex) {
+        let levelName = levelInfo && !isNullOrUndefined(levelInfo.levelName) ? levelInfo.levelName.toString() : undefined;
+        let uniqueName = levelInfo && !isNullOrUndefined(levelInfo.uniqueName) ? levelInfo.uniqueName.toString() : undefined;
         if (hasMeasureIndex) {
             for (let vln = 0; vln < vcnt; vln++) {
-                let name = this.values[vln].caption ? this.values[vln].caption : this.values[vln].name;
+                let field = this.values[vln];
+                let name = field.caption ? field.caption : field.name;
                 let calObj = {
                     axis: this.valueAxis ? 'row' : 'column',
                     rowIndex: !this.valueAxis ? (headerInfo && levelIndex <= headerInfo.rowIndex ? (headerInfo.rowIndex + 1) : levelIndex) : 0,
-                    actualText: this.values[vln].name,
+                    actualText: field.name,
                     formattedText: name,
                     level: 0,
                     valueSort: {},
@@ -5134,14 +5161,16 @@ class PivotEngine {
                     indexObject: !this.valueAxis && headerInfo ? headerInfo.indexObject : null
                 };
                 if (axis.length > 0) {
-                    calObj.showSubTotals = this.values[vln].showSubTotals;
+                    calObj.showSubTotals = field.showSubTotals;
                 }
                 let vData = calObj.valueSort;
-                vData.axis = !this.valueAxis ? this.values[vln].name : undefined;
+                vData.axis = !this.valueAxis ? field.name : undefined;
                 vData[(levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + name] = 1;
+                vData[(uniqueName ? (uniqueName + this.valueSortSettings.headerDelimiter) : '') + field.name] = 1;
                 vData.levelName = (levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + name;
+                vData.uniqueName = (uniqueName ? (uniqueName + this.valueSortSettings.headerDelimiter) : '') + field.name;
                 columnHeaders.push(calObj);
-                this.updateValueMembers(false, headerInfo, ((levelName ? (levelName + this.valueSortSettings.headerDelimiter) : '') + name), calObj.members, axis, vcnt, levelIndex + 1);
+                this.updateValueMembers(false, headerInfo, vData, calObj.members, axis, vcnt, levelIndex + 1);
             }
         }
         else {
@@ -5152,7 +5181,9 @@ class PivotEngine {
                 let 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;
                 let drillInfo = hData.axis + this.valueSortSettings.headerDelimiter + hData.levelName;
                 if (header.isDrilled && ((this.isExpandAll && this.fieldDrillCollection[drillInfo]) ||
@@ -5163,16 +5194,16 @@ class PivotEngine {
                 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);
                 }
             }
         }
@@ -5215,11 +5246,12 @@ class PivotEngine {
         if (!this.valueAxis && !this.isLastHeaderHasMeasures) {
             let 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);
+                let 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) {
@@ -5253,11 +5285,12 @@ class PivotEngine {
         }
         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);
+                let 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) {
@@ -5365,6 +5398,8 @@ class PivotEngine {
                     let vData = data[colItmLn][(tnum * vcnt) + 1 + vln].valueSort;
                     vData[axis[rln].valueSort.levelName + this.valueSortSettings.headerDelimiter + name] = 1;
                     vData.levelName = axis[rln].valueSort.levelName + this.valueSortSettings.headerDelimiter + name;
+                    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;
                     }
@@ -7980,6 +8015,8 @@ class Render {
         if (tCell && (this.parent.notEmpty) && this.engine.headerContent) {
             let customClass = this.parent.hyperlinkSettings.cssClass;
             let cell = args.data[0];
+            let 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') {
@@ -8033,11 +8070,17 @@ class Render {
                     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;
+                        let 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');
@@ -8059,8 +8102,9 @@ class Render {
                 }));
                 let 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) {
                             let style = (tCell.querySelector('.e-expand') || tCell.querySelector('.e-collapse')) ?
@@ -8081,6 +8125,7 @@ class Render {
                 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);
                 }
@@ -8288,16 +8333,20 @@ class Render {
                 else {
                     tCell = this.onOlapColumnCellBoundEvent(tCell, cell);
                 }
-                if (cell.type) {
+                let 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');
                     }
                     let 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;
                     }
@@ -8735,8 +8784,39 @@ class Render {
         }
         return formatArray;
     }
+    getValidHeader(args, axis) {
+        let values = this.parent.dataSourceSettings.values;
+        if (axis === 'row') {
+            let 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') {
+            let 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 */
     excelColumnEvent(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;
@@ -8745,6 +8825,7 @@ class Render {
         this.parent.trigger(excelHeaderQueryCellInfo, args);
     }
     pdfColumnEvent(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;
@@ -8785,6 +8866,7 @@ class Render {
             }
         }
         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 */
@@ -8808,6 +8890,7 @@ class Render {
             }
             args.style = { paragraphIndent: level * 10 };
             this.lastSpan = isValueCell ? this.lastSpan : level;
+            args.value = this.getValidHeader(args, 'row');
         }
         this.parent.trigger(pdfQueryCellInfo, args);
     }
@@ -13724,11 +13807,13 @@ class DrillThrough {
         let valuetText = aggType === 'CalculatedField' ? valueCaption.toString() : aggType !== '' ?
             (this.parent.localeObj.getConstant(aggType) + ' ' + this.parent.localeObj.getConstant('of') + ' ' + valueCaption) :
             valueCaption;
+        let 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(' - ');
         let 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),
@@ -23656,13 +23741,21 @@ let PivotView = class PivotView extends Component {
         let cell = this.pivotValues[rowIndex][colIndex];
         let level = this.getLevel(cell);
         let 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;
+                    }
                 }
             }
         }
@@ -24113,7 +24206,7 @@ let PivotView = class PivotView extends Component {
             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')) {
@@ -25047,6 +25140,22 @@ let PivotView = class PivotView extends Component {
             this.numberFormattingModule.showNumberFormattingDialog();
         }
     }
+    /** @hidden */
+    getValuesHeader(pivotCell, type) {
+        let 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')
@@ -25494,13 +25603,14 @@ class ExcelExport$1 {
                             if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
                                 let 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({
@@ -25817,9 +25927,10 @@ class PDFExport {
                                 let pivotCell = pivotValues[rCnt][cCnt];
                                 if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
                                     let 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;