@syncfusion/ej2-pivotview 20.1.57 → 20.2.36

package/src/base/engine.js

@@ -1699,8 +1699,8 @@ var PivotEngine = /** @class */ (function () {
                     var mPos = this.fieldList[measure].index;
                     var 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));
                     var cellDetails = {
                         fieldName: measure,
                         row: rows[i],
@@ -2389,70 +2389,94 @@ var PivotEngine = /** @class */ (function () {
         return headers;
     };
     PivotEngine.prototype.performFilterCommonUpdate = function (filterItem, headersInfo, addPos) {
-        var rawHeaders = headersInfo.axis === 'row' ? this.rMembers : this.cMembers;
-        var filterObjects = {};
-        for (var _i = 0, _a = this.filterMembers; _i < _a.length; _i++) {
-            var item = _a[_i];
-            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(function (item) { return item.showNoDataItems; }).length > 0) {
-                for (var 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);
-            var headerNames_1 = {};
-            for (var _b = 0, rawHeaders_1 = rawHeaders; _b < rawHeaders_1.length; _b++) {
-                var header = rawHeaders_1[_b];
-                headerNames_1[header.valueSort.levelName.toString()] = header.valueSort.levelName.toString();
-            }
-            var excessHeaders = this.headerObjectsCollection['parent'].filter(function (header) {
-                return !headerNames_1[header.valueSort.levelName.toString()];
-            });
-            var grandHeader = rawHeaders.filter(function (item) { return item.type === 'grand sum'; });
-            if (grandHeader.length > 0) {
-                rawHeaders.pop();
+        if (headersInfo.axis === 'row' || headersInfo.axis === 'column') {
+            var rawHeaders = headersInfo.axis === 'row' ? this.rMembers : this.cMembers;
+            var filterObjects = {};
+            for (var _i = 0, _a = this.filterMembers; _i < _a.length; _i++) {
+                var item = _a[_i];
+                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(function (item) { return item.showNoDataItems; }).length > 0) {
+                    for (var 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);
+                var headerNames_1 = {};
+                for (var _b = 0, rawHeaders_1 = rawHeaders; _b < rawHeaders_1.length; _b++) {
+                    var header = rawHeaders_1[_b];
+                    headerNames_1[header.valueSort.levelName.toString()] = header.valueSort.levelName.toString();
+                }
+                var excessHeaders = this.headerObjectsCollection['parent'].filter(function (header) {
+                    return !headerNames_1[header.valueSort.levelName.toString()];
+                });
+                var grandHeader = rawHeaders.filter(function (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');
+                }
             }
-            /* 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');
+                this.rowCount = 0;
             }
             else {
-                this.rMembers = this.getIndexedHeaders(this.rows, this.data, 0, this.filterMembers, 'row', '');
-                this.insertAllMember(this.rMembers, this.filterMembers, '', 'row');
+                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.insertTotalPosition(rawHeaders);
+                this.rMembers = this.headerCollection.rowHeaders = rawHeaders;
+                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.columnHeadersCount = this.columnCount;
             }
-        }
-        if (headersInfo.axis === 'row') {
-            this.rowCount = 0;
         }
         else {
+            var 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();
@@ -2575,15 +2599,13 @@ var PivotEngine = /** @class */ (function () {
                     }
                     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);
@@ -2742,7 +2764,7 @@ var PivotEngine = /** @class */ (function () {
             }
             else {
                 this.rawIndexObject = {};
-                var value = this.getAggregateValue(header.index, member.indexObject, mIndex, mType);
+                var value = this.getAggregateValue(header.index, member.indexObject, mIndex, mType, false);
                 var cellDetails = {
                     fieldName: this.fields[mIndex],
                     row: header,
@@ -3143,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;
                     }
@@ -3153,32 +3175,55 @@ 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')) {
                         var stringValue = [];
+                        var outOfRange = void 0;
                         var alphaNumbervalue = [];
                         var nullValue = [];
                         for (var 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);
@@ -4037,7 +4082,7 @@ var PivotEngine = /** @class */ (function () {
                                 var selectedColumnValue = 0;
                                 if (selectedColumnValues.length === 0) {
                                     var selectedRow = this.getSelectedRow(currentSet.rowHeaders, rowheads);
-                                    selectedColumnValue = this.getAggregateValue(selectedRow.index, selectedColumn.indexObject, this.fieldList[name_3].index, headers.type);
+                                    selectedColumnValue = this.getAggregateValue(selectedRow.index, selectedColumn.indexObject, this.fieldList[name_3].index, headers.type, false);
                                 }
                                 else {
                                     selectedColumnValue = selectedColumnValues[index[0]].value;
@@ -4096,7 +4141,7 @@ var PivotEngine = /** @class */ (function () {
                                 // let cVal: number = currentSet.value / (selectedRowValues[i[1]] as IAxisSet).value;
                                 var selectedRowValue = 0;
                                 if (selectedRowValues.length === 0 && activeValues) {
-                                    selectedRowValue = this.getAggregateValue(activeValues.index, colheads[i[1] - 1].indexObject, this.fieldList[name_3].index, headers.type);
+                                    selectedRowValue = this.getAggregateValue(activeValues.index, colheads[i[1] - 1].indexObject, this.fieldList[name_3].index, headers.type, false);
                                 }
                                 else {
                                     selectedRowValue = selectedRowValues[i[1]] ? selectedRowValues[i[1]].actualValue : 0;
@@ -4143,7 +4188,7 @@ var PivotEngine = /** @class */ (function () {
                                 var selectedColValue = 0;
                                 if (selectedColumnValues.length === 0) {
                                     var selectedRow = this.getSelectedRow(currentSet.rowHeaders, rowheads);
-                                    selectedColValue = this.getAggregateValue(selectedRow.index, selectedCol.indexObject, this.fieldList[name_3].index, headers.type);
+                                    selectedColValue = this.getAggregateValue(selectedRow.index, selectedCol.indexObject, this.fieldList[name_3].index, headers.type, false);
                                 }
                                 else {
                                     selectedColValue = selectedColumnValues[i[0]].value;
@@ -4175,7 +4220,7 @@ var PivotEngine = /** @class */ (function () {
                                                 rowheads[rlen].level === item.level && currentSet.axis === 'value' &&
                                                 currentSet.actualText === name_3) {
                                                 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_3).formattedText) : currentSet.formattedText;
                                                     if (!this.aggregatedValueMatrix[rlen]) {
                                                         this.aggregatedValueMatrix[rlen] = [];
@@ -4280,7 +4325,7 @@ var PivotEngine = /** @class */ (function () {
                     var i = 0;
                     for (var _i = 0, gTotalIndex_1 = gTotalIndex; _i < gTotalIndex_1.length; _i++) {
                         var rIndex = gTotalIndex_1[_i];
-                        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++;
                     }
                     var val_1 = ((totalValues.cVal) * (totalValues.gTotalVal)) / ((totalValues.rTotalVal) * (totalValues.cTotalVal));
@@ -4301,7 +4346,7 @@ var PivotEngine = /** @class */ (function () {
                     var i = 0;
                     for (var _a = 0, gTotalIndex_2 = gTotalIndex; _a < gTotalIndex_2.length; _a++) {
                         var rIndex = gTotalIndex_2[_a];
-                        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++;
                     }
                     var val_2 = ((totalValues.cVal) / (totalValues.gTotalVal));
@@ -4312,7 +4357,7 @@ var PivotEngine = /** @class */ (function () {
                 }
                 break;
             default:
-                var val = this.getAggregateValue(rows[rln].index, columns[cln].indexObject, mPos, aggregate);
+                var 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;
@@ -4350,6 +4395,7 @@ var PivotEngine = /** @class */ (function () {
             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) ?
@@ -4662,7 +4708,7 @@ var PivotEngine = /** @class */ (function () {
         }
     };
     /* eslint-disable */
-    PivotEngine.prototype.getAggregateValue = function (rowIndex, columnIndex, value, type) {
+    PivotEngine.prototype.getAggregateValue = function (rowIndex, columnIndex, value, type, isGrandTotal) {
         //rowIndex = rowIndex.sort();
         //columnIndex = columnIndex.sort();
         var rlt = rowIndex.length;
@@ -4843,7 +4889,7 @@ var PivotEngine = /** @class */ (function () {
                         var value_1 = aggregateField[aggregatedValue.formula];
                         if (value_1 === undefined) {
                             var type_1 = aggregatedValue.type;
-                            value_1 = this.getAggregateValue(rowIndex, columnIndex, aggregatedValue.index, type_1);
+                            value_1 = this.getAggregateValue(rowIndex, columnIndex, aggregatedValue.index, type_1, false);
                             aggregateField[aggregatedValue.formula] = value_1;
                         }
                         actualFormula = (actualFormula).replace(aggregatedValue.formula, String(value_1));
@@ -4857,7 +4903,9 @@ var PivotEngine = /** @class */ (function () {
                 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];
                         var currentVal = this.valueMatrix[rowIndex[ri]][value];
                         if (isNullOrUndefined(cellValue) && isNullOrUndefined(currentVal)) {

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/base/util.js

@@ -864,9 +864,9 @@ var PivotUtil = /** @class */ (function () {
         }
         else if (type === true) {
             sortOrder === 'Ascending' ?
-                (sortMembersOrder.sort(function (a, b) { return (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(function (a, b) { return (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(function (a, b) { return (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(function (a, b) { return (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 {

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;
     }
     /**
@@ -109,6 +111,15 @@ var EventBase = /** @class */ (function () {
                 /* eslint-disable  */
                 var membersInfo = fieldInfo && fieldInfo.membersOrder ?
                     fieldInfo.membersOrder.slice() : [];
+                var outOfRange = void 0;
+                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);
+                }
                 var sortDetails = {
                     fieldName: fieldName,
                     sortOrder: fieldInfo.sort,
@@ -130,6 +141,24 @@ var EventBase = /** @class */ (function () {
                     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) {
                     var copyOrder = [];
                     for (var m = 0, n = 0; m < members.length; m++) {
@@ -169,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;
+                    }
                 }
             }
         }
@@ -425,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/css-constant.d.ts

@@ -43,12 +43,26 @@ export declare const OLAP_FIELD_LIST_CLASS: string;
 /** @hidden */
 export declare const FIELD_LIST_TREE_CLASS: string;
 /** @hidden */
+export declare const FIELD_LIST_TREE_OUTER_DIV_CLASS: string;
+/** @hidden */
+export declare const FIELD_LIST_TREE_OUTER_DIV_SEARCH_CLASS: string;
+/** @hidden */
+export declare const FIELD_LIST_SEARCH_MODE_CLASS: string;
+/** @hidden */
 export declare const FIELD_HEADER_CLASS: string;
 /** @hidden */
+export declare const FIELD_HEADER_CONTAINER_CLASS: string;
+/** @hidden */
 export declare const FIELD_LIST_TITLE_CLASS: string;
 /** @hidden */
 export declare const FIELD_LIST_TITLE_CONTENT_CLASS: string;
 /** @hidden */
+export declare const FIELD_LIST_SEARCH_CLASS: string;
+/** @hidden */
+export declare const FIELD_LIST_SEARCH_INPUT_CLASS: string;
+/** @hidden */
+export declare const FIELD_LIST_SEARCH_ICON_CLASS: string;
+/** @hidden */
 export declare const FIELD_LIST_FOOTER_CLASS: string;
 /** @hidden */
 export declare const CALCULATED_FIELD_CLASS: string;
@@ -357,6 +371,8 @@ export declare const TREEVIEW: string;
 /** @hidden */
 export declare const TREEVIEWOUTER: string;
 /** @hidden */
+export declare const TREE_CONTAINER: string;
+/** @hidden */
 export declare const CALCCANCELBTN: string;
 /** @hidden */
 export declare const CALCADDBTN: string;

package/src/common/base/css-constant.js

@@ -43,12 +43,26 @@ export var OLAP_FIELD_LIST_CLASS = 'e-olap-field-list-tree';
 /** @hidden */
 export var FIELD_LIST_TREE_CLASS = 'e-field-list-tree';
 /** @hidden */
+export var FIELD_LIST_TREE_OUTER_DIV_CLASS = 'e-field-list-tree-outer-div';
+/** @hidden */
+export var FIELD_LIST_TREE_OUTER_DIV_SEARCH_CLASS = 'e-field-list-tree-outer-div-searchMode';
+/** @hidden */
+export var FIELD_LIST_SEARCH_MODE_CLASS = 'e-search-mode';
+/** @hidden */
 export var FIELD_HEADER_CLASS = 'e-field-header';
 /** @hidden */
+export var FIELD_HEADER_CONTAINER_CLASS = 'e-field-header-container';
+/** @hidden */
 export var FIELD_LIST_TITLE_CLASS = 'e-field-list-title';
 /** @hidden */
 export var FIELD_LIST_TITLE_CONTENT_CLASS = 'e-title-content';
 /** @hidden */
+export var FIELD_LIST_SEARCH_CLASS = 'e-field-list-search';
+/** @hidden */
+export var FIELD_LIST_SEARCH_INPUT_CLASS = 'e-field-list-search-input';
+/** @hidden */
+export var FIELD_LIST_SEARCH_ICON_CLASS = 'e-field-list-search-icon';
+/** @hidden */
 export var FIELD_LIST_FOOTER_CLASS = 'e-field-list-footer';
 /** @hidden */
 export var CALCULATED_FIELD_CLASS = 'e-calculated-field';
@@ -359,6 +373,8 @@ export var TREEVIEW = 'e-pivot-treeview';
 /** @hidden */
 export var TREEVIEWOUTER = 'e-pivot-treeview-outer';
 /** @hidden */
+export var TREE_CONTAINER = 'e-treeContainer';
+/** @hidden */
 export var CALCCANCELBTN = 'e-pivot-cancel-button';
 /** @hidden */
 export var CALCADDBTN = 'e-pivot-add-button';