@syncfusion/ej2-pivotview 20.1.61 → 20.2.39

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.1.61
+*  version : 20.2.39
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/helpers/e2e/index.js

@@ -1,7 +1,9 @@
-"use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./pivotview"));
-__export(require("./pivotfieldlist"));
+define(["require", "exports", "./pivotview", "./pivotfieldlist"], function (require, exports, pivotview_1, pivotfieldlist_1) {
+    "use strict";
+    function __export(m) {
+        for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
+    }
+    Object.defineProperty(exports, "__esModule", { value: true });
+    __export(pivotview_1);
+    __export(pivotfieldlist_1);
+});

package/helpers/e2e/pivotfieldlist.js

@@ -1,32 +1,48 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const e2e_1 = require("@syncfusion/ej2-base/helpers/e2e");
-class PivotFieldListHelper extends e2e_1.TestHelper {
-    constructor(id, wrapperFn) {
-        super();
-        this.id = id;
-        if (wrapperFn !== undefined) {
-            this.wrapperFn = wrapperFn;
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+define(["require", "exports", "@syncfusion/ej2-base/helpers/e2e"], function (require, exports, e2e_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var PivotFieldListHelper = (function (_super) {
+        __extends(PivotFieldListHelper, _super);
+        function PivotFieldListHelper(id, wrapperFn) {
+            var _this = _super.call(this) || this;
+            _this.id = id;
+            if (wrapperFn !== undefined) {
+                _this.wrapperFn = wrapperFn;
+            }
+            return _this;
         }
-        return this;
-    }
-    getElement() {
-        return this.selector('#' + this.id);
-    }
-    getFieldListPopupElement() {
-        return this.selector('#' + this.id + '_Wrapper');
-    }
-    getFilterPopupElement() {
-        return this.selector('#' + this.id + '_EditorTreeView');
-    }
-    getAggregationContextMenuElement() {
-        return this.selector('#' + this.id + 'valueFieldContextMenu');
-    }
-    getValueSettingsDialogElement() {
-        return this.selector('#' + this.id + '_Wrapper_ValueDialog');
-    }
-    getCalculatedMemberPopupElement() {
-        return this.selector('#' + this.id + '_calculateddialog');
-    }
-}
-exports.PivotFieldListHelper = PivotFieldListHelper;
+        PivotFieldListHelper.prototype.getElement = function () {
+            return this.selector('#' + this.id);
+        };
+        PivotFieldListHelper.prototype.getFieldListPopupElement = function () {
+            return this.selector('#' + this.id + '_Container');
+        };
+        PivotFieldListHelper.prototype.getFilterPopupElement = function () {
+            return this.selector('#' + this.id + '_EditorTreeView');
+        };
+        PivotFieldListHelper.prototype.getAggregationContextMenuElement = function () {
+            return this.selector('#' + this.id + 'valueFieldContextMenu');
+        };
+        PivotFieldListHelper.prototype.getValueSettingsDialogElement = function () {
+            return this.selector('#' + this.id + '_Container_ValueDialog');
+        };
+        PivotFieldListHelper.prototype.getCalculatedMemberPopupElement = function () {
+            return this.selector('#' + this.id + '_calculateddialog');
+        };
+        return PivotFieldListHelper;
+    }(e2e_1.TestHelper));
+    exports.PivotFieldListHelper = PivotFieldListHelper;
+});

package/helpers/e2e/pivotview.js

@@ -1,53 +1,69 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const e2e_1 = require("@syncfusion/ej2-base/helpers/e2e");
-class PivotViewHelper extends e2e_1.TestHelper {
-    constructor(id, wrapperFn) {
-        super();
-        this.id = id;
-        if (wrapperFn !== undefined) {
-            this.wrapperFn = wrapperFn;
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+define(["require", "exports", "@syncfusion/ej2-base/helpers/e2e"], function (require, exports, e2e_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    var PivotViewHelper = (function (_super) {
+        __extends(PivotViewHelper, _super);
+        function PivotViewHelper(id, wrapperFn) {
+            var _this = _super.call(this) || this;
+            _this.id = id;
+            if (wrapperFn !== undefined) {
+                _this.wrapperFn = wrapperFn;
+            }
+            return _this;
         }
-        return this;
-    }
-    getElement() {
-        return this.selector('#' + this.id);
-    }
-    getGridElement() {
-        return this.selector('#' + this.id + '_grid');
-    }
-    getFilterPopupElement() {
-        return this.selector('#' + this.id + '_EditorTreeView');
-    }
-    getAggregationContextMenuElement() {
-        return this.selector('#' + this.id + 'valueFieldContextMenu');
-    }
-    getValueSettingsDialogElement() {
-        return this.selector('#' + this.id + '_ValueDialog');
-    }
-    getDrillThroughPopupElement() {
-        return this.selector('#' + this.id + '_drillthrough');
-    }
-    getConditionalFormattingPopupElement() {
-        return this.selector('#' + this.id + 'conditionalformatting');
-    }
-    getFieldListIconElement() {
-        return this.selector('#' + this.id + '_PivotFieldList');
-    }
-    getFieldListPopupElement() {
-        return this.selector('#' + this.id + '_PivotFieldList_Wrapper');
-    }
-    getCalculatedMemberPopupElement() {
-        return this.selector('#' + this.id + '_PivotFieldListcalculateddialog');
-    }
-    getFieldListFilterPopupElement() {
-        return this.selector('#' + this.id + '_PivotFieldList_EditorTreeView');
-    }
-    getFieldListAggregationContextMenuElement() {
-        return this.selector('#' + this.id + '_PivotFieldListvalueFieldContextMenu');
-    }
-    getFieldListValueSettingsPopupElement() {
-        return this.selector('#' + this.id + '_PivotFieldList_Wrapper_ValueDialog');
-    }
-}
-exports.PivotViewHelper = PivotViewHelper;
+        PivotViewHelper.prototype.getElement = function () {
+            return this.selector('#' + this.id);
+        };
+        PivotViewHelper.prototype.getGridElement = function () {
+            return this.selector('#' + this.id + '_grid');
+        };
+        PivotViewHelper.prototype.getFilterPopupElement = function () {
+            return this.selector('#' + this.id + '_EditorTreeView');
+        };
+        PivotViewHelper.prototype.getAggregationContextMenuElement = function () {
+            return this.selector('#' + this.id + 'valueFieldContextMenu');
+        };
+        PivotViewHelper.prototype.getValueSettingsDialogElement = function () {
+            return this.selector('#' + this.id + '_ValueDialog');
+        };
+        PivotViewHelper.prototype.getDrillThroughPopupElement = function () {
+            return this.selector('#' + this.id + '_drillthrough');
+        };
+        PivotViewHelper.prototype.getConditionalFormattingPopupElement = function () {
+            return this.selector('#' + this.id + 'conditionalformatting');
+        };
+        PivotViewHelper.prototype.getFieldListIconElement = function () {
+            return this.selector('#' + this.id + '_PivotFieldList');
+        };
+        PivotViewHelper.prototype.getFieldListPopupElement = function () {
+            return this.selector('#' + this.id + '_PivotFieldList_Container');
+        };
+        PivotViewHelper.prototype.getCalculatedMemberPopupElement = function () {
+            return this.selector('#' + this.id + '_PivotFieldListcalculateddialog');
+        };
+        PivotViewHelper.prototype.getFieldListFilterPopupElement = function () {
+            return this.selector('#' + this.id + '_PivotFieldList_EditorTreeView');
+        };
+        PivotViewHelper.prototype.getFieldListAggregationContextMenuElement = function () {
+            return this.selector('#' + this.id + '_PivotFieldListvalueFieldContextMenu');
+        };
+        PivotViewHelper.prototype.getFieldListValueSettingsPopupElement = function () {
+            return this.selector('#' + this.id + '_PivotFieldList_Container_ValueDialog');
+        };
+        return PivotViewHelper;
+    }(e2e_1.TestHelper));
+    exports.PivotViewHelper = PivotViewHelper;
+});

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-pivotview@*",
-  "_id": "@syncfusion/ej2-pivotview@20.1.58",
+  "_id": "@syncfusion/ej2-pivotview@20.2.38",
   "_inBundle": false,
-  "_integrity": "sha512-4w6FZoxhrgTBV4KX7gFdqmTvF0ud9CbjyuZ9ISHRQtmWVe05cAeR0dMlvNy3+NeNaxRdsq1N3H/j1ijYXNvYFQ==",
+  "_integrity": "sha512-teTnfOCRdXz/7//+6qdx0e188/v/JyqpzUZLqpm9wTTeJG4CPTI1d40nZb8fGXEY8iv6TimEHmX7yQFqcFZzsQ==",
   "_location": "/@syncfusion/ej2-pivotview",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-pivotview",
     "/@syncfusion/ej2-vue-pivotview"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-pivotview/-/ej2-pivotview-20.1.58.tgz",
-  "_shasum": "a41867faab6e4082ba5f230462630ce20d8e382d",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-pivotview/-/ej2-pivotview-20.2.38.tgz",
+  "_shasum": "eae3e4c94e3012d3263bc0b50480dab45fc3307b",
   "_spec": "@syncfusion/ej2-pivotview@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -35,23 +35,23 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.1.61",
-    "@syncfusion/ej2-buttons": "~20.1.61",
-    "@syncfusion/ej2-calendars": "~20.1.58",
-    "@syncfusion/ej2-charts": "~20.1.61",
-    "@syncfusion/ej2-compression": "~20.1.55",
-    "@syncfusion/ej2-data": "~20.1.55",
-    "@syncfusion/ej2-dropdowns": "~20.1.61",
-    "@syncfusion/ej2-excel-export": "~20.1.55",
-    "@syncfusion/ej2-file-utils": "~20.1.55",
-    "@syncfusion/ej2-grids": "~20.1.61",
-    "@syncfusion/ej2-inputs": "~20.1.61",
-    "@syncfusion/ej2-lists": "~20.1.55",
-    "@syncfusion/ej2-navigations": "~20.1.61",
-    "@syncfusion/ej2-pdf-export": "~20.1.55",
-    "@syncfusion/ej2-popups": "~20.1.58",
-    "@syncfusion/ej2-splitbuttons": "~20.1.57",
-    "@syncfusion/ej2-svg-base": "~20.1.55"
+    "@syncfusion/ej2-base": "~20.2.38",
+    "@syncfusion/ej2-buttons": "~20.2.38",
+    "@syncfusion/ej2-calendars": "~20.2.38",
+    "@syncfusion/ej2-charts": "~20.2.38",
+    "@syncfusion/ej2-compression": "~20.2.38",
+    "@syncfusion/ej2-data": "~20.2.38",
+    "@syncfusion/ej2-dropdowns": "~20.2.39",
+    "@syncfusion/ej2-excel-export": "~20.2.39",
+    "@syncfusion/ej2-file-utils": "~20.2.38",
+    "@syncfusion/ej2-grids": "~20.2.39",
+    "@syncfusion/ej2-inputs": "~20.2.38",
+    "@syncfusion/ej2-lists": "~20.2.39",
+    "@syncfusion/ej2-navigations": "~20.2.39",
+    "@syncfusion/ej2-pdf-export": "~20.2.38",
+    "@syncfusion/ej2-popups": "~20.2.39",
+    "@syncfusion/ej2-splitbuttons": "~20.2.38",
+    "@syncfusion/ej2-svg-base": "~20.2.38"
   },
   "deprecated": false,
   "description": "The pivot grid, or pivot table, is used to visualize large sets of relational data in a cross-tabular format, similar to an Excel pivot table.",
@@ -78,6 +78,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "20.1.61",
+  "version": "20.2.39",
   "sideEffects": false
 }

package/src/base/engine.js

@@ -463,7 +463,7 @@ var PivotEngine = /** @class */ (function () {
                                             if (this_1.fields.indexOf(newFieldName) === -1) {
                                                 this_1.fields.push(newFieldName);
                                             }
-                                            item[this_1.fieldKeys[newFieldName]] = (isInRangeAvail ? undefined : new Date(newDate.setMonth(date.getMonth(), newDate.getDate())).toString());
+                                            item[this_1.fieldKeys[newFieldName]] = (isInRangeAvail ? undefined : new Date(newDate.setMonth(date.getMonth(), 1)).toString());
                                         }
                                         break;
                                     case 'Days':
@@ -1706,7 +1706,7 @@ var PivotEngine = /** @class */ (function () {
                         row: rows[i],
                         column: columns,
                         value: value,
-                        cellSets: this.getCellSet(this.rawIndexObject),
+                        cellSets: this.getValueCellInfo ? this.getCellSet(this.rawIndexObject) : [],
                         rowCellType: (rows[i].hasChild && rows[i].isDrilled ? 'subTotal' : rows[i].type === 'grand sum' ? 'grandTotal' : 'value'),
                         columnCellType: (columns.hasChild && columns.isDrilled ? 'subTotal' : columns.type === 'grand sum' ? 'grandTotal' : 'value'),
                         aggregateType: aggregate,
@@ -2634,7 +2634,7 @@ var PivotEngine = /** @class */ (function () {
             PivotUtil.applyHeadersSort(sortMembersOrder, sortOrder, type);
             isHeaderSortByDefault = true;
         }
-        if (isHeaderSortByDefault) {
+        if (isHeaderSortByDefault && this.getHeaderSortInfo) {
             var copyOrder = [];
             for (var m = 0, n = 0; m < sortMembersOrder.length; m++) {
                 var member = sortMembersOrder[m];
@@ -2770,7 +2770,7 @@ var PivotEngine = /** @class */ (function () {
                     row: header,
                     column: member,
                     value: value,
-                    cellSets: this.getCellSet(this.rawIndexObject),
+                    cellSets: this.getValueCellInfo ? this.getCellSet(this.rawIndexObject) : [],
                     rowCellType: (header.hasChild && header.isDrilled ? 'subTotal' : header.type === 'grand sum' ? 'grandTotal' : 'value'),
                     columnCellType: (member.hasChild && member.isDrilled ? 'subTotal' : member.type === 'grand sum' ? 'grandTotal' : 'value'),
                     aggregateType: mType,
@@ -3165,7 +3165,7 @@ var PivotEngine = /** @class */ (function () {
                     this.columnCount -= (!(this.showSubTotals && this.showColumnSubTotals && field.showSubTotals) && axis === 'column') ?
                         this.colValuesLength : 0;
                     var filterPosition = hierarchy[iln].index;
-                    hierarchy[iln].members = this.getIndexedHeaders(keys, data, keyInd + 1, (filterPosition === undefined ? [] : filterPosition), axis, parentMember);
+                    hierarchy[iln].members = this.getIndexedHeaders(keys, data, keyInd + 1, (filterPosition === undefined ? [] : filterPosition), axis, parentMember, valueFil);
                     if (this.frameHeaderObjectsCollection) {
                         this.headerObjectsCollection[parentMember] = hierarchy[iln].members;
                     }
@@ -3175,7 +3175,7 @@ var PivotEngine = /** @class */ (function () {
             if (this.enableSort) {
                 // return new DataManager(hierarchy as JSON[]).executeLocal(new Query().sortBy('actualText', childrens.sort.toLowerCase()));
                 if (isDateType) {
-                    return this.sortHeaders(fieldName, childrens, hierarchy, childrens.sort, childrens.type);
+                    return this.sortHeaders(fieldName, childrens, hierarchy, childrens.sort, 'date');
                 }
                 else {
                     if (childrens.type === 'number' && hierarchy.length > 0 && (typeof (hierarchy[0].actualText) === 'string')) {
@@ -3999,8 +3999,9 @@ var PivotEngine = /** @class */ (function () {
                             for (var _g = 0, indexCollection_2 = indexCollection; _g < indexCollection_2.length; _g++) {
                                 var index = indexCollection_2[_g];
                                 var currentSet = data[index[0]][index[1]];
+                                var actualValue = isNullOrUndefined(selectedRowValues[index[1]].actualValue) ? 0 : selectedRowValues[index[1]].actualValue;
                                 // let cVal: number = currentSet.value - (selectedRowValues[index[1]] as IAxisSet).value;
-                                var cVal = currentSet.actualValue - selectedRowValues[index[1]].actualValue;
+                                var 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]] = [];
@@ -4012,8 +4013,7 @@ var PivotEngine = /** @class */ (function () {
                                 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;
                                 }
@@ -4252,7 +4252,9 @@ var PivotEngine = /** @class */ (function () {
                                                 activeColumn[cln].valueSort[item.valueSort.levelName] &&
                                                 currentSet.axis === 'value' && currentSet.actualText === name_3) {
                                                 if (activeColumn[cln].type !== 'grand sum') {
-                                                    cVal += currentSet.value;
+                                                    if (!isNullOrUndefined(currentSet.value)) {
+                                                        cVal += currentSet.value;
+                                                    }
                                                     currentSet.formattedText = subTotal ? '' : this.getFormattedValue(cVal, name_3).formattedText;
                                                     if (!this.aggregatedValueMatrix[rln]) {
                                                         this.aggregatedValueMatrix[rln] = [];
@@ -4368,7 +4370,7 @@ var PivotEngine = /** @class */ (function () {
             row: rows[rln],
             column: columns[cln],
             value: value,
-            cellSets: this.getCellSet(this.rawIndexObject),
+            cellSets: this.getValueCellInfo ? this.getCellSet(this.rawIndexObject) : [],
             rowCellType: (rows[rln].hasChild && rows[rln].isDrilled ? 'subTotal' : rows[rln].type === 'grand sum' ? 'grandTotal' : 'value'),
             columnCellType: (columns[cln].hasChild && columns[cln].isDrilled ? 'subTotal' : columns[cln].type === 'grand sum' ? 'grandTotal' : 'value'),
             aggregateType: aggregate,

package/src/base/olap/engine.js

@@ -810,7 +810,9 @@ var OlapEngine = /** @class */ (function () {
         var lastAllStartPos;
         var lastAllCount;
         var availAllMember = false;
+        var withoutAllEndPos = -1;
         var isGrandtoalDataAdd = false;
+        var prevTupInfo;
         var isGrandTotalTop = false;
         while (tupPos < tuples.length && !isGrandtoalDataAdd) {
             var members = tuples[this.customArgs.action === 'down' ?
@@ -820,12 +822,22 @@ var OlapEngine = /** @class */ (function () {
             var allStartPos = this.tupRowInfo[tupPos].allStartPos;
             var measure = this.tupRowInfo[tupPos].measure;
             var typeColl_1 = this.tupRowInfo[tupPos].typeCollection;
+            var drillStartPos = this.tupRowInfo[tupPos].drillStartPos;
+            var startDrillUniquename = this.tupRowInfo[tupPos].startDrillUniquename;
             memPos = 0;
             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))) {
+                var attrDrill = this.checkAttributeDrill(this.tupRowInfo[tupPos].drillInfo, 'rows');
+                var 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) {
                     var levelName = 'Grand Total.' + members[measurePos].querySelector('Caption').textContent;
                     var formattedText = (typeColl_1[measurePos] === '3' && this.dataFields[this.getUniqueName(members[measurePos].querySelector('UName').textContent)] &&
@@ -1720,7 +1732,7 @@ var OlapEngine = /** @class */ (function () {
                 }
                 isHeaderSortByDefault = true;
             }
-            if (isHeaderSortByDefault) {
+            if (isHeaderSortByDefault && this.getHeaderSortInfo) {
                 var copyOrder = [];
                 for (var m = 0, n = 0; m < headers.length; m++) {
                     if (headers[m].actualText !== 'Grand Total') {
@@ -1761,7 +1773,7 @@ var OlapEngine = /** @class */ (function () {
             }
             isHeaderSortByDefault = true;
         }
-        if (isHeaderSortByDefault) {
+        if (isHeaderSortByDefault && this.getHeaderSortInfo) {
             var copyOrder = [];
             for (var m = 0, n = 0; m < keys.length; m++) {
                 if (keys[m] !== 'Grand Total') {

package/src/base/olap/mdx-query.js

@@ -478,7 +478,7 @@ var MDXQuery = /** @class */ (function () {
             query = '((' + name + ').levels(0).AllMembers)';
         }
         else {
-            query = (dimension.isNamedSet ? '{' + name + '}' : this.isPaging ? name + '.CHILDREN' :
+            query = (dimension.isNamedSet || dimension.isCalculatedField ? '{' + name + '}' : this.isPaging ? name + '.CHILDREN' :
                 'DrilldownLevel({' + name + '}' + ((axis === 'rows' || axis === 'columns') ? ',,,INCLUDE_CALC_MEMBERS' : '') + ')');
         }
         return query;

package/src/common/actions/event-base.d.ts

@@ -9,6 +9,8 @@ import { IOlapField } from '../../base/olap/engine';
 /** @hidden */
 export declare class EventBase {
     parent: PivotCommon;
+    /** @hidden */
+    searchListItem: HTMLElement[];
     /**
      * Constructor for the dialog action.
      * @param {PivotCommon} parent - parent.
@@ -55,8 +57,8 @@ export declare class EventBase {
         [key: string]: Object;
     }[];
     private applyFilterCustomSort;
-    private getParentIDs;
-    private getChildIDs;
+    getParentIDs(treeObj: TreeView, id: string, parent: string[]): string[];
+    getChildIDs(treeObj: TreeView, id: string, children: string[]): string[];
     /**
      * show tree nodes using search text.
      * @hidden

package/src/common/actions/event-base.js

@@ -13,6 +13,8 @@ var EventBase = /** @class */ (function () {
      * @hidden
      */
     function EventBase(parent) {
+        /** @hidden */
+        this.searchListItem = [];
         this.parent = parent;
     }
     /**
@@ -196,16 +198,21 @@ var EventBase = /** @class */ (function () {
         var isItemAvail = false;
         var filterTypes = ['Include', 'Exclude'];
         if (filterObj && filterTypes.indexOf(filterObj.type) >= 0) {
-            var engineModule = this.parent.engineModule;
-            var field = engineModule.fieldList[fieldName];
-            var members = (engineModule.formatFields[fieldName] &&
-                (['date', 'dateTime', 'time'].indexOf(engineModule.formatFields[fieldName].type) > -1)) ?
-                field.formattedMembers : field.members;
-            for (var _i = 0, _a = filterObj.items; _i < _a.length; _i++) {
-                var item = _a[_i];
-                if (members[item]) {
-                    isItemAvail = true;
-                    break;
+            if (filterObj.type === 'Include' && filterObj.items.length === 0) {
+                isItemAvail = true;
+            }
+            else {
+                var engineModule = this.parent.engineModule;
+                var field = engineModule.fieldList[fieldName];
+                var members = (engineModule.formatFields[fieldName] &&
+                    (['date', 'dateTime', 'time'].indexOf(engineModule.formatFields[fieldName].type) > -1)) ?
+                    field.formattedMembers : field.members;
+                for (var _i = 0, _a = filterObj.items; _i < _a.length; _i++) {
+                    var item = _a[_i];
+                    if (members[item]) {
+                        isItemAvail = true;
+                        break;
+                    }
                 }
             }
         }
@@ -452,6 +459,7 @@ var EventBase = /** @class */ (function () {
             else {
                 treeObj.expandAll(undefined, undefined, true);
             }
+            this.searchListItem = searchList;
         }
         else {
             this.parent.searchTreeItems = [];

package/src/common/actions/field-list.js

@@ -60,7 +60,8 @@ var FieldList = /** @class */ (function () {
             maxNodeLimitInMemberEditor: this.parent.maxNodeLimitInMemberEditor,
             aggregateCellInfo: this.parent.bindTriggerEvents.bind(this.parent),
             onHeadersSort: this.parent.bindTriggerEvents.bind(this.parent),
-            cssClass: this.parent.cssClass
+            cssClass: this.parent.cssClass,
+            enableFieldSearching: this.parent.enableFieldSearching
         });
         this.parent.pivotFieldListModule.isPopupView = true;
         this.parent.pivotFieldListModule.pivotGridModule = this.parent;

package/src/common/actions/pivot-button.js

@@ -197,7 +197,7 @@ var PivotButton = /** @class */ (function () {
                                 buttonWrapper.appendChild(buttonElement);
                             }
                             element.appendChild(buttonWrapper);
-                            var pivotButton = new Button({ enableRtl: this.parent.enableRtl, locale: this.parent.locale });
+                            var pivotButton = new Button({ enableRtl: this.parent.enableRtl, locale: this.parent.locale, cssClass: this.parent.cssClass });
                             pivotButton.isStringTemplate = true;
                             pivotButton.appendTo(buttonElement);
                             this.unWireEvent(buttonWrapper, i === valuePos && axis !== 'all-fields' ? 'values' : axis, isMeasureAvail);
@@ -1021,7 +1021,7 @@ var PivotButton = /** @class */ (function () {
         return [
             {
                 buttonModel: {
-                    cssClass: 'e-clear-filter-button' + (this.parent.pivotCommon.filterDialog.allowExcelLikeFilter ? '' : ' ' + cls.ICON_DISABLE),
+                    cssClass: 'e-clear-filter-button' + (this.parent.pivotCommon.filterDialog.allowExcelLikeFilter ? '' : ' ' + cls.ICON_DISABLE) + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                     iconCss: 'e-icons e-clear-filter-icon', enableRtl: this.parent.enableRtl,
                     content: this.parent.localeObj.getConstant('clearFilter'), disabled: (this.parent.pivotCommon.filterDialog.filterObject ? false : true)
                 },
@@ -1029,13 +1029,13 @@ var PivotButton = /** @class */ (function () {
             },
             {
                 buttonModel: {
-                    cssClass: cls.OK_BUTTON_CLASS, content: this.parent.localeObj.getConstant('ok'), isPrimary: true
+                    cssClass: cls.OK_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('ok'), isPrimary: true
                 },
                 click: (this.index === 0 ? this.updateFilterState.bind(this, this.fieldName) : this.updateCustomFilter.bind(this))
             },
             {
                 click: this.parent.pivotCommon.filterDialog.closeFilterDialog.bind(this.parent.pivotCommon.filterDialog),
-                buttonModel: { cssClass: cls.CANCEL_BUTTON_CLASS, content: this.parent.localeObj.getConstant('cancel') }
+                buttonModel: { cssClass: cls.CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('cancel') }
             }
         ];
     };

package/src/common/base/constant.d.ts

@@ -144,6 +144,10 @@ export declare const uiUpdate: string;
 /** @hidden */
 export declare const scroll: string;
 /** @hidden */
+export declare const verticalScroll: string;
+/** @hidden */
+export declare const horizontalScroll: string;
+/** @hidden */
 export declare const contentReady: string;
 /** @hidden */
 export declare const dataReady: string;
@@ -343,3 +347,7 @@ export declare const windowResized: string;
 export declare const recordUpdated: string;
 /** @hidden */
 export declare const drillThroughClosed: string;
+/** @hidden */
+export declare const verticalScrolled: string;
+/** @hidden */
+export declare const horizontalScrolled: string;

package/src/common/base/constant.js

@@ -144,6 +144,10 @@ export var uiUpdate = 'ui-update';
 /** @hidden */
 export var scroll = 'scroll';
 /** @hidden */
+export var verticalScroll = 'vertical-scroll';
+/** @hidden */
+export var horizontalScroll = 'horizontal-scroll';
+/** @hidden */
 export var contentReady = 'content-ready';
 /** @hidden */
 export var dataReady = 'data-ready';
@@ -343,3 +347,7 @@ export var windowResized = 'Window resized';
 export var recordUpdated = 'Records updated';
 /** @hidden */
 export var drillThroughClosed = 'Drill-through closed';
+/** @hidden */
+export var verticalScrolled = 'Vertically scrolled';
+/** @hidden */
+export var horizontalScrolled = 'Horizontally scrolled';