@syncfusion/ej2-pivotview 20.1.58 → 20.1.61

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

@@ -862,9 +862,9 @@ class PivotUtil {
         }
         else if (type === true) {
             sortOrder === 'Ascending' ?
-                (sortMembersOrder.sort((a, b) => (a.actualText === 'Grand Total' || b.actualText === 'Grand Total') ? 0 : (Number(a.actualText.toString().match(/\d+/)[0]) > Number(b.actualText.toString().match(/\d+/)[0])) ? 1 : ((Number(b.actualText.toString().match(/\d+/)[0]) > Number(a.actualText.toString().match(/\d+/)[0])) ? -1 : 0))) :
+                (sortMembersOrder.sort((a, b) => (a.actualText === 'Grand Total' || b.actualText === 'Grand Total') ? 0 : (a.actualText === 'Out of Range') ? 1 : (b.actualText === 'Out of Range') ? -1 : (Number(a.actualText.toString().match(/\d+/)) > Number(b.actualText.toString().match(/\d+/))) ? 1 : ((Number(b.actualText.toString().match(/\d+/)) > Number(a.actualText.toString().match(/\d+/))) ? -1 : 0))) :
                 sortOrder === 'Descending' ?
-                    (sortMembersOrder.sort((a, b) => (a.actualText === 'Grand Total' || b.actualText === 'Grand Total') ? 0 : (Number(a.actualText.toString().match(/\d+/)[0]) < Number(b.actualText.toString().match(/\d+/)[0])) ? 1 : ((Number(b.actualText.toString().match(/\d+/)[0]) < Number(a.actualText.toString().match(/\d+/)[0])) ? -1 : 0))) :
+                    (sortMembersOrder.sort((a, b) => (a.actualText === 'Grand Total' || b.actualText === 'Grand Total') ? 0 : (a.actualText === 'Out of Range') ? -1 : (b.actualText === 'Out of Range') ? 1 : (Number(a.actualText.toString().match(/\d+/)) < Number(b.actualText.toString().match(/\d+/))) ? 1 : ((Number(b.actualText.toString().match(/\d+/)) < Number(a.actualText.toString().match(/\d+/))) ? -1 : 0))) :
                     sortMembersOrder;
         }
         else {
@@ -2536,8 +2536,8 @@ class PivotEngine {
                     let mPos = this.fieldList[measure].index;
                     let aggregate = this.fieldList[measure].aggregateType;
                     this.rawIndexObject = {};
-                    value = (type === 'row' ? this.getAggregateValue(rows[i].index, columns.indexObject, mPos, aggregate) :
-                        this.getAggregateValue(columns.index, rows[i].indexObject, mPos, aggregate));
+                    value = (type === 'row' ? this.getAggregateValue(rows[i].index, columns.indexObject, mPos, aggregate, false) :
+                        this.getAggregateValue(columns.index, rows[i].indexObject, mPos, aggregate, false));
                     let cellDetails = {
                         fieldName: measure,
                         row: rows[i],
@@ -3202,68 +3202,92 @@ class PivotEngine {
         return headers;
     }
     performFilterCommonUpdate(filterItem, headersInfo, addPos) {
-        let rawHeaders = headersInfo.axis === 'row' ? this.rMembers : this.cMembers;
-        let filterObjects = {};
-        for (let item of this.filterMembers) {
-            filterObjects[item] = item;
-        }
-        if (this.fieldFilterMem[filterItem.name]) {
-            rawHeaders = this.performFilterDeletion(headersInfo.headers, filterItem, headersInfo, filterObjects, 0);
-        }
-        if (addPos.length > 0 && headersInfo.fields.length > 0) {
-            this.frameHeaderObjectsCollection = true;
-            if (headersInfo.fields.filter((item) => { return item.showNoDataItems; }).length > 0) {
-                for (let i = 0; i < this.data.length; i++) {
-                    addPos.push(i);
+        if (headersInfo.axis === 'row' || headersInfo.axis === 'column') {
+            let rawHeaders = headersInfo.axis === 'row' ? this.rMembers : this.cMembers;
+            let filterObjects = {};
+            for (let item of this.filterMembers) {
+                filterObjects[item] = item;
+            }
+            if (this.fieldFilterMem[filterItem.name]) {
+                rawHeaders = this.performFilterDeletion(headersInfo.headers, filterItem, headersInfo, filterObjects, 0);
+            }
+            if (addPos.length > 0 && headersInfo.fields.length > 0) {
+                this.frameHeaderObjectsCollection = true;
+                if (headersInfo.fields.filter((item) => { return item.showNoDataItems; }).length > 0) {
+                    for (let i = 0; i < this.data.length; i++) {
+                        addPos.push(i);
+                    }
+                    //addPos = (this.data as any).map((item, pos) => { return pos; });
+                }
+                /* eslint-disable */
+                this.headerObjectsCollection['parent'] = this.getIndexedHeaders(headersInfo.fields, this.data, 0, addPos, headersInfo.axis, '');
+                rawHeaders = this.performFilterAddition(rawHeaders, headersInfo.fields, headersInfo);
+                let headerNames = {};
+                for (let header of rawHeaders) {
+                    headerNames[header.valueSort.levelName.toString()] = header.valueSort.levelName.toString();
+                }
+                let excessHeaders = this.headerObjectsCollection['parent'].filter((header) => {
+                    return !headerNames[header.valueSort.levelName.toString()];
+                });
+                let grandHeader = rawHeaders.filter((item) => { return item.type === 'grand sum'; });
+                if (grandHeader.length > 0) {
+                    rawHeaders.pop();
+                }
+                /* eslint-enable */
+                rawHeaders = this.getSortedHeaders(rawHeaders.concat(excessHeaders), this.fieldList[headersInfo.fields[0].name].sort).concat(grandHeader);
+                if (headersInfo.axis === 'row') {
+                    this.cMembers = this.getIndexedHeaders(this.columns, this.data, 0, this.filterMembers, 'column', '');
+                    this.insertAllMember(this.cMembers, this.filterMembers, '', 'column');
+                }
+                else {
+                    this.rMembers = this.getIndexedHeaders(this.rows, this.data, 0, this.filterMembers, 'row', '');
+                    this.insertAllMember(this.rMembers, this.filterMembers, '', 'row');
                 }
-                //addPos = (this.data as any).map((item, pos) => { return pos; });
             }
-            /* eslint-disable */
-            this.headerObjectsCollection['parent'] = this.getIndexedHeaders(headersInfo.fields, this.data, 0, addPos, headersInfo.axis, '');
-            rawHeaders = this.performFilterAddition(rawHeaders, headersInfo.fields, headersInfo);
-            let headerNames = {};
-            for (let header of rawHeaders) {
-                headerNames[header.valueSort.levelName.toString()] = header.valueSort.levelName.toString();
-            }
-            let excessHeaders = this.headerObjectsCollection['parent'].filter((header) => {
-                return !headerNames[header.valueSort.levelName.toString()];
-            });
-            let grandHeader = rawHeaders.filter((item) => { return item.type === 'grand sum'; });
-            if (grandHeader.length > 0) {
-                rawHeaders.pop();
+            if (headersInfo.axis === 'row') {
+                this.rowCount = 0;
             }
-            /* eslint-enable */
-            rawHeaders = this.getSortedHeaders(rawHeaders.concat(excessHeaders), this.fieldList[headersInfo.fields[0].name].sort).concat(grandHeader);
+            else {
+                this.columnCount = 0;
+            }
+            this.updateHeadersCount(rawHeaders, headersInfo.axis, 0, headersInfo.fields, 'plus', false);
             if (headersInfo.axis === 'row') {
-                this.cMembers = this.getIndexedHeaders(this.columns, this.data, 0, this.filterMembers, 'column', '');
-                this.insertAllMember(this.cMembers, this.filterMembers, '', 'column');
+                if (headersInfo.position > 0) {
+                    this.insertPosition(this.rows, this.data, 0, this.filterMembers, 'row', '', rawHeaders);
+                }
+                this.insertTotalPosition(rawHeaders);
+                this.rMembers = this.headerCollection.rowHeaders = rawHeaders;
+                this.headerCollection.rowHeadersCount = this.rowCount;
             }
             else {
-                this.rMembers = this.getIndexedHeaders(this.rows, this.data, 0, this.filterMembers, 'row', '');
-                this.insertAllMember(this.rMembers, this.filterMembers, '', 'row');
+                if (headersInfo.position > 0) {
+                    this.insertPosition(this.columns, this.data, 0, this.filterMembers, 'column', '', rawHeaders);
+                }
+                this.insertTotalPosition(rawHeaders);
+                this.cMembers = this.headerCollection.columnHeaders = rawHeaders;
+                this.headerCollection.columnHeadersCount = this.columnCount;
             }
         }
-        if (headersInfo.axis === 'row') {
-            this.rowCount = 0;
-        }
         else {
+            let showNoDataItems = (this.rows[0] && this.rows[0].showNoDataItems) || (this.columns[0] && this.columns[0].showNoDataItems);
+            if (this.rows.length > 0) {
+                this.rMembers = this.getIndexedHeaders(this.rows, this.data, 0, showNoDataItems ? addPos : this.filterMembers, 'row', '');
+            }
+            if (this.columns.length > 0) {
+                this.cMembers = this.getIndexedHeaders(this.columns, this.data, 0, showNoDataItems ? addPos : this.filterMembers, 'column', '');
+            }
+            this.insertAllMembersCommon();
+            this.rowCount = 0;
             this.columnCount = 0;
-        }
-        this.updateHeadersCount(rawHeaders, headersInfo.axis, 0, headersInfo.fields, 'plus', false);
-        if (headersInfo.axis === 'row') {
-            if (headersInfo.position > 0) {
-                this.insertPosition(this.rows, this.data, 0, this.filterMembers, 'row', '', rawHeaders);
+            this.updateHeadersCount(this.cMembers, 'column', 0, this.columns, 'plus', false);
+            this.updateHeadersCount(this.rMembers, 'row', 0, this.rows, 'plus', false);
+            if (showNoDataItems) {
+                this.insertPosition(this.rows, this.data, 0, this.filterMembers, 'row', '', this.rMembers);
+                this.insertPosition(this.columns, this.data, 0, this.filterMembers, 'column', '', this.cMembers);
             }
-            this.insertTotalPosition(rawHeaders);
-            this.rMembers = this.headerCollection.rowHeaders = rawHeaders;
+            this.headerCollection.rowHeaders = this.rMembers;
             this.headerCollection.rowHeadersCount = this.rowCount;
-        }
-        else {
-            if (headersInfo.position > 0) {
-                this.insertPosition(this.columns, this.data, 0, this.filterMembers, 'column', '', rawHeaders);
-            }
-            this.insertTotalPosition(rawHeaders);
-            this.cMembers = this.headerCollection.columnHeaders = rawHeaders;
+            this.headerCollection.columnHeaders = this.cMembers;
             this.headerCollection.columnHeadersCount = this.columnCount;
         }
         this.applyValueSorting();
@@ -3384,15 +3408,13 @@ class PivotEngine {
                     }
                     else {
                         alphaNumbervalue.push(headers[i]);
+                        break;
                     }
                 }
-                if (stringValue.length > 1) {
-                    stringValue = this.sortHeaders(fieldName, childrens, headers, childrens.sort, childrens.type);
-                }
                 if (alphaNumbervalue.length > 0) {
                     alphaNumbervalue = this.sortHeaders(fieldName, childrens, headers, childrens.sort, childrens.isAlphanumeric);
                 }
-                return headers = nullValue.concat(alphaNumbervalue, stringValue);
+                return headers;
             }
             else {
                 return this.sortHeaders(fieldName, childrens, headers, sortOrder, childrens.type);
@@ -3549,7 +3571,7 @@ class PivotEngine {
             }
             else {
                 this.rawIndexObject = {};
-                let value = this.getAggregateValue(header.index, member.indexObject, mIndex, mType);
+                let value = this.getAggregateValue(header.index, member.indexObject, mIndex, mType, false);
                 let cellDetails = {
                     fieldName: this.fields[mIndex],
                     row: header,
@@ -3960,27 +3982,50 @@ class PivotEngine {
                 else {
                     if (childrens.type === 'number' && hierarchy.length > 0 && (typeof (hierarchy[0].actualText) === 'string')) {
                         let stringValue = [];
+                        let outOfRange;
                         let alphaNumbervalue = [];
                         let nullValue = [];
                         for (let i = 0; i < hierarchy.length; i++) {
                             if (isNaN(hierarchy[i].actualText.toString().charAt(0))) {
                                 stringValue.push(hierarchy[i]);
+                                if (!outOfRange && childrens.sort !== 'None') {
+                                    if (hierarchy[i].actualText === 'Out of Range') {
+                                        outOfRange = hierarchy[i];
+                                        hierarchy.splice(i, 1);
+                                    }
+                                }
                             }
                             else if (hierarchy[i].actualText === "") {
                                 nullValue.push(hierarchy[i]);
                             }
                             else {
+                                this.fieldList[fieldName].isAlphanumeric = true;
                                 alphaNumbervalue.push(hierarchy[i]);
+                                break;
                             }
                         }
-                        if (stringValue.length > 0) {
-                            stringValue = this.sortHeaders(fieldName, childrens, hierarchy, childrens.sort, childrens.type);
+                        if (outOfRange) {
+                            if (childrens.sort === 'Ascending') {
+                                if (hierarchy[0].actualText === 'Grand Total') {
+                                    hierarchy.splice(1, 0, outOfRange);
+                                }
+                                else {
+                                    hierarchy.splice(0, 0, outOfRange);
+                                }
+                            }
+                            else {
+                                if (hierarchy[hierarchy.length - 1].actualText === 'Grand Total') {
+                                    hierarchy.splice(hierarchy.length - 1, 0, outOfRange);
+                                }
+                                else {
+                                    hierarchy.splice(hierarchy.length, 0, outOfRange);
+                                }
+                            }
                         }
                         if (alphaNumbervalue.length > 0) {
-                            this.fieldList[fieldName].isAlphanumeric = true;
-                            alphaNumbervalue = this.sortHeaders(fieldName, childrens, hierarchy, childrens.sort, childrens.isAlphanumeric);
+                            this.sortHeaders(fieldName, childrens, hierarchy, childrens.sort, childrens.isAlphanumeric);
                         }
-                        return hierarchy = nullValue.concat(alphaNumbervalue, stringValue);
+                        return hierarchy;
                     }
                     else {
                         return this.sortHeaders(fieldName, childrens, hierarchy, childrens.sort, childrens.type);
@@ -4818,7 +4863,7 @@ class PivotEngine {
                                 let selectedColumnValue = 0;
                                 if (selectedColumnValues.length === 0) {
                                     let selectedRow = this.getSelectedRow(currentSet.rowHeaders, rowheads);
-                                    selectedColumnValue = this.getAggregateValue(selectedRow.index, selectedColumn.indexObject, this.fieldList[name].index, headers.type);
+                                    selectedColumnValue = this.getAggregateValue(selectedRow.index, selectedColumn.indexObject, this.fieldList[name].index, headers.type, false);
                                 }
                                 else {
                                     selectedColumnValue = selectedColumnValues[index[0]].value;
@@ -4873,7 +4918,7 @@ class PivotEngine {
                                 // let cVal: number = currentSet.value / (selectedRowValues[i[1]] as IAxisSet).value;
                                 let selectedRowValue = 0;
                                 if (selectedRowValues.length === 0 && activeValues) {
-                                    selectedRowValue = this.getAggregateValue(activeValues.index, colheads[i[1] - 1].indexObject, this.fieldList[name].index, headers.type);
+                                    selectedRowValue = this.getAggregateValue(activeValues.index, colheads[i[1] - 1].indexObject, this.fieldList[name].index, headers.type, false);
                                 }
                                 else {
                                     selectedRowValue = selectedRowValues[i[1]] ? selectedRowValues[i[1]].actualValue : 0;
@@ -4917,7 +4962,7 @@ class PivotEngine {
                                 let selectedColValue = 0;
                                 if (selectedColumnValues.length === 0) {
                                     let selectedRow = this.getSelectedRow(currentSet.rowHeaders, rowheads);
-                                    selectedColValue = this.getAggregateValue(selectedRow.index, selectedCol.indexObject, this.fieldList[name].index, headers.type);
+                                    selectedColValue = this.getAggregateValue(selectedRow.index, selectedCol.indexObject, this.fieldList[name].index, headers.type, false);
                                 }
                                 else {
                                     selectedColValue = selectedColumnValues[i[0]].value;
@@ -4946,7 +4991,7 @@ class PivotEngine {
                                                 rowheads[rlen].level === item.level && currentSet.axis === 'value' &&
                                                 currentSet.actualText === name) {
                                                 if (rowheads[rlen].type !== 'grand sum') {
-                                                    cVal += (!currentSet.showSubTotals && !(!isNullOrUndefined(currentSet.actualValue) && isNaN(currentSet.actualValue))) ? currentSet.actualValue : currentSet.value;
+                                                    cVal += (!currentSet.showSubTotals && !(!isNullOrUndefined(currentSet.actualValue) && isNaN(currentSet.actualValue))) ? currentSet.actualValue : (!isNullOrUndefined(currentSet.value) && !isNaN(currentSet.value)) ? currentSet.value : null;
                                                     currentSet.formattedText = currentSet.showSubTotals ? (cVal === 0 && (currentSet.actualValue && currentSet.actualValue !== 0) ? '' : this.getFormattedValue(cVal, name).formattedText) : currentSet.formattedText;
                                                     if (!this.aggregatedValueMatrix[rlen]) {
                                                         this.aggregatedValueMatrix[rlen] = [];
@@ -5046,7 +5091,7 @@ class PivotEngine {
                     let valueContent = ['cVal', 'rTotalVal', 'cTotalVal', 'gTotalVal'];
                     let i = 0;
                     for (let rIndex of gTotalIndex) {
-                        totalValues[valueContent[i]] = this.getAggregateValue((rIndex[0]).index, (rIndex[1]).indexObject, mPos, aggregate);
+                        totalValues[valueContent[i]] = this.getAggregateValue((rIndex[0]).index, (rIndex[1]).indexObject, mPos, aggregate, i === 0 ? false : true);
                         i++;
                     }
                     let val = ((totalValues.cVal) * (totalValues.gTotalVal)) / ((totalValues.rTotalVal) * (totalValues.cTotalVal));
@@ -5066,7 +5111,7 @@ class PivotEngine {
                     let valueContent = ['cVal', 'gTotalVal'];
                     let i = 0;
                     for (let rIndex of gTotalIndex) {
-                        totalValues[valueContent[i]] = this.getAggregateValue((rIndex[0]).index, (rIndex[1]).indexObject, mPos, aggregate);
+                        totalValues[valueContent[i]] = this.getAggregateValue((rIndex[0]).index, (rIndex[1]).indexObject, mPos, aggregate, i === 0 ? false : true);
                         i++;
                     }
                     let val = ((totalValues.cVal) / (totalValues.gTotalVal));
@@ -5077,7 +5122,7 @@ class PivotEngine {
                 }
                 break;
             default:
-                let val = this.getAggregateValue(rows[rln].index, columns[cln].indexObject, mPos, aggregate);
+                let val = this.getAggregateValue(rows[rln].index, columns[cln].indexObject, mPos, aggregate, false);
                 value = (rows[rln].members.length > 0 && rows[rln].hasChild && rows[rln].isDrilled && ((!isNullOrUndefined(rows[rln].showSubTotals) && !rows[rln].showSubTotals) ||
                     !this.showSubTotals || !this.showRowSubTotals)) ? undefined : val;
                 actualValue = val;
@@ -5426,7 +5471,7 @@ class PivotEngine {
         }
     }
     /* eslint-disable */
-    getAggregateValue(rowIndex, columnIndex, value, type) {
+    getAggregateValue(rowIndex, columnIndex, value, type, isGrandTotal) {
         //rowIndex = rowIndex.sort();
         //columnIndex = columnIndex.sort();
         let rlt = rowIndex.length;
@@ -5604,7 +5649,7 @@ class PivotEngine {
                         let value = aggregateField[aggregatedValue.formula];
                         if (value === undefined) {
                             let type = aggregatedValue.type;
-                            value = this.getAggregateValue(rowIndex, columnIndex, aggregatedValue.index, type);
+                            value = this.getAggregateValue(rowIndex, columnIndex, aggregatedValue.index, type, false);
                             aggregateField[aggregatedValue.formula] = value;
                         }
                         actualFormula = (actualFormula).replace(aggregatedValue.formula, String(value));
@@ -5618,7 +5663,9 @@ class PivotEngine {
                 while (rowIndex[ri] !== undefined) {
                     if (columnIndex[rowIndex[ri]] !== undefined) {
                         isValueExist = true;
-                        this.rawIndexObject[rowIndex[ri]] = rowIndex[ri];
+                        if (!isGrandTotal) {
+                            this.rawIndexObject[rowIndex[ri]] = rowIndex[ri];
+                        }
                         //let cIndx: number = isLeastLevel ? columnIndex.splice(columnIndex.indexOf(rowIndex[ri]), 1)[0] : rowIndex[ri];
                         let currentVal = this.valueMatrix[rowIndex[ri]][value];
                         if (isNullOrUndefined(cellValue) && isNullOrUndefined(currentVal)) {
@@ -9158,8 +9205,8 @@ class Render {
                 args.value = this.parent.exportType === 'Excel' ? null : '';
             }
             else {
-                let aggMatrix = this.parent.engineModule.aggregatedValueMatrix;
-                if (aggMatrix[pivotValue.rowIndex] && aggMatrix[pivotValue.rowIndex][pivotValue.colIndex]) {
+                let aggMatrix = this.parent.dataType === 'pivot' && this.parent.engineModule ? this.parent.engineModule.aggregatedValueMatrix : undefined;
+                if (aggMatrix && aggMatrix[pivotValue.rowIndex] && aggMatrix[pivotValue.rowIndex][pivotValue.colIndex]) {
                     args.value = aggMatrix[pivotValue.rowIndex][pivotValue.colIndex];
                 }
                 else {
@@ -9603,6 +9650,15 @@ class EventBase {
                 /* eslint-disable  */
                 let membersInfo = fieldInfo && fieldInfo.membersOrder ?
                     [...fieldInfo.membersOrder] : [];
+                let outOfRange;
+                if (members[0].actualText === 'Out of Range') {
+                    outOfRange = members[0];
+                    members.splice(0, 1);
+                }
+                else if (members[members.length - 1].actualText === 'Out of Range') {
+                    outOfRange = members[members.length - 1];
+                    members.splice(members.length - 1, 1);
+                }
                 let sortDetails = {
                     fieldName: fieldName,
                     sortOrder: fieldInfo.sort,
@@ -9624,6 +9680,24 @@ class EventBase {
                     isInclude = this.isValidFilterItemsAvail(fieldName, filterObj) && filterObj.type === 'Include' ? true : false;
                     filterItems = filterObj.items ? filterObj.items : [];
                 }
+                if (outOfRange) {
+                    if (sortDetails.sortOrder === 'Ascending') {
+                        if (members[members.length - 1].actualText === 'Grand Total') {
+                            members.splice(members.length - 1, 0, outOfRange);
+                        }
+                        else {
+                            members.splice(members.length, 0, outOfRange);
+                        }
+                    }
+                    else {
+                        if (members[0].actualText === 'Grand Total') {
+                            members.splice(1, 0, outOfRange);
+                        }
+                        else {
+                            members.splice(0, 0, outOfRange);
+                        }
+                    }
+                }
                 if (isHeaderSortByDefault) {
                     let copyOrder = [];
                     for (let m = 0, n = 0; m < members.length; m++) {
@@ -13642,9 +13716,8 @@ class DrillThroughDialog {
         }
         let actualText = eventArgs.currentCell.actualText.toString();
         try {
-            if (this.parent.currentView === 'Table' && this.engine.fieldList[actualText].aggregateType !== 'Count' && this.parent.editSettings.allowInlineEditing &&
-                this.parent.editSettings.allowEditing && eventArgs.rawData.length === 1 &&
-                this.engine.fieldList[actualText].aggregateType !== 'DistinctCount' && typeof (eventArgs.rawData[0][actualText]) !== 'string') {
+            if (this.parent.currentView === 'Table' && this.parent.editSettings.allowInlineEditing &&
+                this.parent.editSettings.allowEditing && eventArgs.rawData.length === 1) {
                 this.parent.actionObj.actionName = editRecord;
                 if (this.parent.actionBeginMethod()) {
                     return;
@@ -13802,9 +13875,9 @@ class DrillThroughDialog {
         let previousData = this.frameHeaderWithKeys(eventArgs.rawData[eventArgs.rawData.length - 1]);
         let currentData = eventArgs.rawData[eventArgs.rawData.length - 1];
         /* eslint-enable */
-        if (eventArgs.currentCell.actualText in previousData) {
-            currentData[eventArgs.currentCell.actualText] = eventArgs.currentCell.actualValue;
-        }
+        // if (eventArgs.currentCell.actualText in previousData) {
+        //     currentData[eventArgs.currentCell.actualText] = eventArgs.currentCell.actualValue;
+        // }
         let actionInfo = {
             editInfo: { type: 'Inline editing', action: 'update', data: this.gridData }
         };
@@ -14247,7 +14320,7 @@ class DrillThrough {
         let valueCaption = '';
         let aggType = '';
         let rawData = [];
-        if (pivotValue.rowHeaders !== undefined && pivotValue.columnHeaders !== undefined && !isNullOrUndefined(pivotValue.value)) {
+        if (pivotValue.rowHeaders !== undefined && pivotValue.columnHeaders !== undefined) {
             if (this.parent.dataType === 'olap') {
                 let tupleInfo;
                 if (this.parent.dataSourceSettings.valueAxis === 'row') {
@@ -14317,7 +14390,7 @@ class DrillThrough {
                     }
                 }
                 if (!isNullOrUndefined(rawData[k])) {
-                    let calculatedFeildValue = this.parent.engineModule.getAggregateValue([Number(indexArray[k])], colIndex, indexValue, 'calculatedfield');
+                    let calculatedFeildValue = this.parent.engineModule.getAggregateValue([Number(indexArray[k])], colIndex, indexValue, 'calculatedfield', false);
                     rawData[k][this.parent.dataSourceSettings.calculatedFieldSettings[i].name] = (isNaN(calculatedFeildValue) && isNullOrUndefined(calculatedFeildValue)) ? '#DIV/0!' : calculatedFeildValue;
                 }
             }
@@ -14794,6 +14867,9 @@ class PivotChart {
                 if (this.persistSettings.chartSeries && this.persistSettings.chartSeries.emptyPointSettings) {
                     currentSeries.emptyPointSettings = this.persistSettings.chartSeries.emptyPointSettings;
                 }
+                if (!currentSeries.emptyPointSettings) {
+                    currentSeries.emptyPointSettings = { mode: 'Zero' };
+                }
                 this.chartSeries = this.chartSeries.concat(currentSeries);
             }
         }
@@ -16523,7 +16599,7 @@ __decorate$3([
     Complex({ color: 'transparent', width: 0 }, Border)
 ], EmptyPointSettings.prototype, "border", void 0);
 __decorate$3([
-    Property('Gap')
+    Property('Zero')
 ], EmptyPointSettings.prototype, "mode", void 0);
 /**
  * Allows to customize the rounded corners of the column series in the chart.
@@ -16897,7 +16973,7 @@ __decorate$3([
     Complex({ color: 'transparent', width: 0 }, Border)
 ], PivotChartSeriesEmptyPointSettings.prototype, "border", void 0);
 __decorate$3([
-    Property('Gap')
+    Property('Zero')
 ], PivotChartSeriesEmptyPointSettings.prototype, "mode", void 0);
 /**
  * Allows to customize the rounded corners of the column series in the chart.
@@ -19295,9 +19371,7 @@ class OlapEngine {
         let lastAllStartPos;
         let lastAllCount;
         let availAllMember = false;
-        let withoutAllEndPos = -1;
         let isGrandtoalDataAdd = false;
-        let prevTupInfo;
         let isGrandTotalTop = false;
         while (tupPos < tuples.length && !isGrandtoalDataAdd) {
             let members = tuples[this.customArgs.action === 'down' ?
@@ -19306,21 +19380,11 @@ class OlapEngine {
             let allStartPos = this.tupRowInfo[tupPos].allStartPos;
             let measure = this.tupRowInfo[tupPos].measure;
             let typeColl = this.tupRowInfo[tupPos].typeCollection;
-            let drillStartPos = this.tupRowInfo[tupPos].drillStartPos;
-            let startDrillUniquename = this.tupRowInfo[tupPos].startDrillUniquename;
             if (tupPos === 0 && (members.length > (allCount + (measure ? 1 : 0)) || (members.length === 1 && measure))) {
                 gTotals.pop();
             }
             if ((tupPos === 0 && this.isPaging) ? gTotals.length === 0 :
                 (!availAllMember || allCount === lastAllCount || allStartPos !== lastAllStartPos || (members.length === 1 && measure))) {
-                let attrDrill = this.checkAttributeDrill(this.tupRowInfo[tupPos].drillInfo, 'rows');
-                let drillAllow = drillStartPos > -1 ? (allCount > 0 ? (attrDrill || allStartPos > drillStartPos) : true) : true;
-                drillAllow = (prevTupInfo && drillAllow && drillStartPos > -1) ?
-                    (prevTupInfo.startDrillUniquename !== startDrillUniquename ? true :
-                        ((withoutAllEndPos > prevTupInfo.measurePosition ? false :
-                            prevTupInfo.measureName !== this.tupRowInfo[tupPos].measureName) &&
-                            (allStartPos === (drillStartPos + 1) || this.tupRowInfo[tupPos].measurePosition === (drillStartPos + 1))))
-                    : drillAllow;
                 if (members.length === allCount + (measure ? 1 : 0) && measure && !isGrandTotalTop) {
                     let levelName = 'Grand Total.' + members[measurePos].querySelector('Caption').textContent;
                     let formattedText = (typeColl[measurePos] === '3' && this.dataFields[this.getUniqueName(members[measurePos].querySelector('UName').textContent)] &&
@@ -35889,7 +35953,7 @@ class Toolbar$2 {
     saveReport(args) {
         if (this.currentReport && this.currentReport !== '' && args.item.id === (this.parent.element.id + 'save')) {
             let saveArgs = {
-                report: this.parent.getPersistData(),
+                report: this.getCurrentReport(),
                 reportName: this.currentReport
             };
             this.parent.actionObj.actionName = this.parent.getActionCompleteName();
@@ -36146,7 +36210,7 @@ class Toolbar$2 {
                     return;
                 }
                 let saveArgs = {
-                    report: _this.parent.getPersistData(),
+                    report: _this.getCurrentReport(),
                     reportName: reportInput.value
                 };
                 let actionInfo = {
@@ -36182,7 +36246,7 @@ class Toolbar$2 {
                 }
                 _this.parent.trigger(newReport);
                 let saveArgs = {
-                    report: _this.parent.getPersistData(),
+                    report: _this.getCurrentReport(),
                     reportName: reportInput.value
                 };
                 let actionInfo = {
@@ -36325,7 +36389,7 @@ class Toolbar$2 {
         else if (this.action === 'New' || (this.action !== 'Save' && this.action !== 'Rename' && this.action !== 'New')) {
             if (this.currentReport && this.currentReport !== '' && this.parent.isModified) {
                 let saveArgs = {
-                    report: this.parent.getPersistData(),
+                    report: this.getCurrentReport(),
                     reportName: this.currentReport
                 };
                 let actionInfo = {
@@ -36350,7 +36414,7 @@ class Toolbar$2 {
             else if (this.action === 'New') {
                 this.parent.trigger(newReport);
                 let saveArgs = {
-                    report: this.parent.getPersistData(),
+                    report: this.getCurrentReport(),
                     reportName: this.currentReport
                 };
                 this.parent.trigger(saveReport, saveArgs);
@@ -36361,7 +36425,7 @@ class Toolbar$2 {
         }
         else if (this.action === 'Save') {
             let saveArgs = {
-                report: this.parent.getPersistData(),
+                report: this.getCurrentReport(),
                 reportName: this.currentReport
             };
             this.parent.trigger(saveReport, saveArgs);
@@ -36658,6 +36722,15 @@ class Toolbar$2 {
         }
         this.updateItemElements();
     }
+    getCurrentReport() {
+        let reportStr = this.parent.getPersistData();
+        if (this.parent.dataSourceSettings.type === 'CSV') {
+            let reportSettings = JSON.parse(reportStr);
+            reportSettings.dataSourceSettings.dataSource.splice(0, 0, this.parent.engineModule.fields);
+            reportStr = JSON.stringify(reportSettings);
+        }
+        return reportStr;
+    }
     updateItemElements() {
         let itemElements = [].slice.call(this.toolbar.element.querySelectorAll('.e-toolbar-item'));
         for (let element of itemElements) {