@syncfusion/ej2-pivotview 20.1.57 → 20.1.58

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

@@ -5115,6 +5115,7 @@ class PivotEngine {
             isNaN(value) && !isNullOrUndefined(value) &&
             (['PopulationStDev', 'SampleStDev', 'PopulationVar', 'SampleVar']).indexOf(aggregate) !== -1) {
             formattedText = '#DIV/0!';
+            value = 0;
         }
         //dln = data[tnum].length;
         formattedText = (cellDetails.skipFormatting ? isNullOrUndefined(value) ?
@@ -9052,6 +9053,12 @@ class Render {
                 }
             }
             else {
+                if ((['PercentageOfDifferenceFrom', 'PercentageOfRowTotal', 'PercentageOfColumnTotal', 'PercentageOfGrandTotal', 'PercentageOfParentRowTotal', 'PercentageOfParentColumnTotal', 'PercentageOfParentTotal']).indexOf(field.type) > -1) {
+                    format = 'P2';
+                }
+                else if (['PopulationStDev', 'SampleStDev', 'PopulationVar', 'SampleVar', 'Index'].indexOf(field.type) > -1) {
+                    format = undefined;
+                }
                 if (this.parent.dataSourceSettings.formatSettings.length > 0) {
                     for (let fCnt = 0; fCnt < this.parent.dataSourceSettings.formatSettings.length; fCnt++) {
                         let formatSettings = this.parent.dataSourceSettings.formatSettings[fCnt];
@@ -9146,12 +9153,18 @@ class Render {
         else {
             this.colPos++;
             /* eslint-disable-next-line */
-            if (isNullOrUndefined(args.data[this.colPos].value) || isNullOrUndefined(args.data[this.colPos].formattedText) || args.data[this.colPos].formattedText === "") {
+            let pivotValue = args.data[this.colPos];
+            if (isNullOrUndefined(pivotValue.value) || isNullOrUndefined(pivotValue.formattedText) || pivotValue.formattedText === "") {
                 args.value = this.parent.exportType === 'Excel' ? null : '';
             }
             else {
-                /* eslint-disable-next-line */
-                args.value = !isNullOrUndefined(args.data[this.colPos].value) ? args.data[this.colPos].value : args.data[this.colPos].formattedText;
+                let aggMatrix = this.parent.engineModule.aggregatedValueMatrix;
+                if (aggMatrix[pivotValue.rowIndex] && aggMatrix[pivotValue.rowIndex][pivotValue.colIndex]) {
+                    args.value = aggMatrix[pivotValue.rowIndex][pivotValue.colIndex];
+                }
+                else {
+                    args.value = !isNullOrUndefined(pivotValue.value) ? (pivotValue.formattedText === '#DIV/0!' ? pivotValue.formattedText : pivotValue.value) : pivotValue.formattedText;
+                }
             }
         }
         args = this.exportContentEvent(args);
@@ -26887,7 +26900,8 @@ class ExcelExport$1 {
                             let styles = (pivotCell.axis == 'row') ? { hAlign: 'Left', bold: true, wrapText: true } : { numberFormat: formatList[field], bold: false, wrapText: true };
                             let headerStyle = { bold: true, vAlign: 'Center', wrapText: true, indent: cCnt === 0 ? pivotCell.level * 10 : 0 };
                             if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
-                                let cellValue = pivotCell.axis === 'value' ? pivotCell.value : pivotCell.formattedText;
+                                let aggMatrix = this.parent.engineModule.aggregatedValueMatrix;
+                                let cellValue = pivotCell.axis === 'value' ? ((aggMatrix[rCnt] && aggMatrix[rCnt][cCnt]) ? aggMatrix[rCnt][cCnt] : (pivotCell.formattedText === '#DIV/0!' ? pivotCell.formattedText : pivotCell.value)) : pivotCell.formattedText;
                                 let isgetValuesHeader = ((this.parent.dataSourceSettings.rows.length === 0 && this.parent.dataSourceSettings.valueAxis === 'row')
                                     || (this.parent.dataSourceSettings.columns.length === 0 && this.parent.dataSourceSettings.valueAxis === 'column'));
                                 if (pivotCell.type === 'grand sum' && !(this.parent.dataSourceSettings.values.length === 1 && this.parent.dataSourceSettings.valueAxis === 'row' && pivotCell.axis === 'column')) {