@syncfusion/ej2-pivotview 20.2.38 → 20.2.39

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

@@ -1326,7 +1326,7 @@ class PivotEngine {
                                             if (this.fields.indexOf(newFieldName) === -1) {
                                                 this.fields.push(newFieldName);
                                             }
-                                            item[this.fieldKeys[newFieldName]] = (isInRangeAvail ? undefined : new Date(newDate.setMonth(date.getMonth(), newDate.getDate())).toString());
+                                            item[this.fieldKeys[newFieldName]] = (isInRangeAvail ? undefined : new Date(newDate.setMonth(date.getMonth(), 1)).toString());
                                         }
                                         break;
                                     case 'Days':
@@ -4784,8 +4784,9 @@ class PivotEngine {
                             }
                             for (let index of indexCollection) {
                                 let currentSet = data[index[0]][index[1]];
+                                let actualValue = isNullOrUndefined(selectedRowValues[index[1]].actualValue) ? 0 : selectedRowValues[index[1]].actualValue;
                                 // let cVal: number = currentSet.value - (selectedRowValues[index[1]] as IAxisSet).value;
-                                let cVal = currentSet.actualValue - selectedRowValues[index[1]].actualValue;
+                                let cVal = (isNullOrUndefined(currentSet.actualValue) ? 0 : currentSet.actualValue) - actualValue;
                                 cVal = isNaN(cVal) ? 0 : (currentSet.value === 0 && selectedRowValues[index[1]].value === 0) ? 0 : cVal;
                                 if (!this.aggregatedValueMatrix[index[0]]) {
                                     this.aggregatedValueMatrix[index[0]] = [];
@@ -4797,8 +4798,7 @@ class PivotEngine {
                                 else {
                                     // cVal = ((selectedRowValues[index[1]] as IAxisSet).value === 0 ?
                                     // 0 : (cVal / (selectedRowValues[index[1]] as IAxisSet).value));
-                                    cVal = (selectedRowValues[index[1]].actualValue === 0 ?
-                                        0 : (cVal / selectedRowValues[index[1]].actualValue));
+                                    cVal = (actualValue === 0 ? 0 : (cVal / actualValue));
                                     this.aggregatedValueMatrix[index[0]][index[1]] = cVal;
                                     currentSet.formattedText = currentSet.showSubTotals ? (cVal !== 0 ? this.globalize.formatNumber(cVal, { format: 'P', maximumFractionDigits: this.getPercentFormat(this.formatFields, currentSet.actualText) }) : this.emptyCellTextContent) : currentSet.formattedText;
                                 }
@@ -5021,7 +5021,9 @@ class PivotEngine {
                                                 activeColumn[cln].valueSort[item.valueSort.levelName] &&
                                                 currentSet.axis === 'value' && currentSet.actualText === name) {
                                                 if (activeColumn[cln].type !== 'grand sum') {
-                                                    cVal += currentSet.value;
+                                                    if (!isNullOrUndefined(currentSet.value)) {
+                                                        cVal += currentSet.value;
+                                                    }
                                                     currentSet.formattedText = subTotal ? '' : this.getFormattedValue(cVal, name).formattedText;
                                                     if (!this.aggregatedValueMatrix[rln]) {
                                                         this.aggregatedValueMatrix[rln] = [];
@@ -8460,7 +8462,7 @@ class Render {
                 if (cell.isGrandSum || (isGrandSum || this.colGrandPos === Number(tCell.getAttribute('aria-colindex'))) || this.rowGrandPos === Number(tCell.getAttribute('index'))) {
                     tCell.classList.add('e-gtot');
                 }
-                else if (this.parent.dataType === 'olap' ? cell.isSum : this.validateColumnTotalcell(!isNullOrUndefined(cell.value) ? cell.colIndex : cell.colIndex - 1)) {
+                else if (this.parent.dataType === 'olap' ? cell.isSum : this.validateColumnTotalcell(cell.colIndex)) {
                     tCell.classList.add('e-colstot');
                 }
                 if (cell.cssClass) {
@@ -13469,7 +13471,7 @@ class VirtualScroll$1 {
                 this.parent.actionBeginMethod();
                 this.parent.showWaitingPopup();
                 this.parent.scrollPosObject.vertical = section;
-                engine.pageSettings.rowCurrentPage = section > 1 ? section : 1;
+                this.parent.pageSettings.rowCurrentPage = engine.pageSettings.rowCurrentPage = section > 1 ? section : 1;
                 let rowStartPos = 0;
                 this.parent.trigger(enginePopulating, args, (observedArgs) => {
                     if (this.parent.dataType === 'pivot') {
@@ -13507,7 +13509,7 @@ class VirtualScroll$1 {
                 this.parent.showWaitingPopup();
                 let pivot = this.parent;
                 pivot.scrollPosObject.horizontal = section;
-                engine.pageSettings.columnCurrentPage = section > 1 ? section : 1;
+                this.parent.pageSettings.columnCurrentPage = engine.pageSettings.columnCurrentPage = section > 1 ? section : 1;
                 let colStartPos = 0;
                 this.parent.trigger(enginePopulating, args, (observedArgs) => {
                     if (pivot.dataType === 'pivot') {
@@ -15641,14 +15643,14 @@ class PivotChart {
         let aggregateType = this.parent.dataType === 'olap' ? '' : this.parent.localeObj.getConstant(measureField.aggregateType);
         let measureAggregatedName = (this.parent.dataType === 'olap' ? '' : aggregateType + ' ' +
             this.parent.localeObj.getConstant('of') + ' ') + measureField.caption;
-        let formattedText = this.accumulationType.indexOf(this.parent.chartSettings.chartSeries.type) < 0 ?
-            args.text.split('<b>')[1].split('</b>')[0] : this.engineModule.pivotValues[rowIndex][colIndex].formattedText;
+        let formattedText = this.engineModule.pivotValues[rowIndex][colIndex].formattedText;
         let formatField = this.engineModule.formatFields[measureField.id];
-        let formattedValue = ((formatField && formatField.format && formatField.format.toLowerCase().match(/n|p|c/) !== null &&
+        let valueFormat = this.engineModule.getFormattedValue(args.point.y, measureField.id, formattedText);
+        let formattedValue = (formatField && formatField.format && formatField.format.toLowerCase().match(/n|p|c/) !== null &&
             this.chartSettings.useGroupingSeparator) ? this.parent.dataType === 'olap' ?
-            this.engineModule.getFormattedValue(args.point.y, measureField.id, formattedText) :
-            this.parent.engineModule.getFormattedValue(args.point.y, measureField.id).formattedText :
-            formattedText);
+            valueFormat.toString() :
+            valueFormat.formattedText :
+            formattedText;
         let columnText = (args.series.name ? args.series.name.split(' | ')[0] : args.data.seriesName.split(' | ')[0]);
         let rowText = args.point.x;
         if (this.parent.tooltipTemplate && this.parent.getTooltipTemplate() !== undefined || this.chartSettings.tooltip.template) {
@@ -15977,6 +15979,16 @@ class PivotChart {
                 args.text = '';
             }
         }
+        if (args.axis.name !== 'primaryXAxis') {
+            let formatField = this.engineModule.formatFields[args.axis.name];
+            let valueFormat = this.engineModule.getFormattedValue(args.value, args.axis.name, args.text);
+            let formattedValue = ((formatField && formatField.format && formatField.format.toLowerCase().match(/n|p|c/) !== null &&
+                this.chartSettings.useGroupingSeparator) ? this.parent.dataType === 'olap' ?
+                valueFormat.toString() :
+                valueFormat.formattedText :
+                args.value.toString());
+            args.text = formattedValue;
+        }
         this.parent.trigger(chartAxisLabelRender, args);
     }
     multiLevelLabelClick(args) {