@syncfusion/ej2-pivotview 20.1.57 → 20.2.36

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

@@ -3,7 +3,7 @@ import { DataManager, Deferred, Query } from '@syncfusion/ej2-data';
 import { Dialog, Tooltip, createSpinner, hideSpinner, showSpinner } from '@syncfusion/ej2-popups';
 import { ColumnChooser, CommandColumn, ContextMenu, Edit, ExcelExport, Freeze, Grid, Page, PdfExport, Reorder, Resize, Selection, Toolbar, VirtualScroll, getObject, headerRefreshed, setStyleAndAttributes } from '@syncfusion/ej2-grids';
 import { Accordion, ContextMenu as ContextMenu$1, Menu, Tab, Toolbar as Toolbar$1, TreeView } from '@syncfusion/ej2-navigations';
-import { ColorPicker, MaskedTextBox, NumericTextBox } from '@syncfusion/ej2-inputs';
+import { ColorPicker, MaskedTextBox, NumericTextBox, TextBox } from '@syncfusion/ej2-inputs';
 import { CheckBoxSelection, DropDownList, MultiSelect } from '@syncfusion/ej2-dropdowns';
 import { DateTimePicker } from '@syncfusion/ej2-calendars';
 import { DropDownButton } from '@syncfusion/ej2-splitbuttons';
@@ -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,
@@ -3945,7 +3967,7 @@ class PivotEngine {
                     this.columnCount -= (!(this.showSubTotals && this.showColumnSubTotals && field.showSubTotals) && axis === 'column') ?
                         this.colValuesLength : 0;
                     let 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;
                     }
@@ -3955,32 +3977,55 @@ class PivotEngine {
             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')) {
                         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;
@@ -5115,6 +5160,7 @@ class PivotEngine {
             isNaN(value) && !isNullOrUndefined(value) &&
             (['PopulationStDev', 'SampleStDev', 'PopulationVar', 'SampleVar']).indexOf(aggregate) !== -1) {
             formattedText = '#DIV/0!';
+            value = 0;
         }
         //dln = data[tnum].length;
         formattedText = (cellDetails.skipFormatting ? isNullOrUndefined(value) ?
@@ -5425,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;
@@ -5603,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));
@@ -5617,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)) {
@@ -6165,12 +6213,26 @@ const OLAP_FIELD_LIST_CLASS = 'e-olap-field-list-tree';
 /** @hidden */
 const FIELD_LIST_TREE_CLASS = 'e-field-list-tree';
 /** @hidden */
+const FIELD_LIST_TREE_OUTER_DIV_CLASS = 'e-field-list-tree-outer-div';
+/** @hidden */
+const FIELD_LIST_TREE_OUTER_DIV_SEARCH_CLASS = 'e-field-list-tree-outer-div-searchMode';
+/** @hidden */
+const FIELD_LIST_SEARCH_MODE_CLASS = 'e-search-mode';
+/** @hidden */
 const FIELD_HEADER_CLASS = 'e-field-header';
 /** @hidden */
+const FIELD_HEADER_CONTAINER_CLASS = 'e-field-header-container';
+/** @hidden */
 const FIELD_LIST_TITLE_CLASS = 'e-field-list-title';
 /** @hidden */
 const FIELD_LIST_TITLE_CONTENT_CLASS = 'e-title-content';
 /** @hidden */
+const FIELD_LIST_SEARCH_CLASS = 'e-field-list-search';
+/** @hidden */
+const FIELD_LIST_SEARCH_INPUT_CLASS = 'e-field-list-search-input';
+/** @hidden */
+const FIELD_LIST_SEARCH_ICON_CLASS = 'e-field-list-search-icon';
+/** @hidden */
 const FIELD_LIST_FOOTER_CLASS = 'e-field-list-footer';
 /** @hidden */
 const CALCULATED_FIELD_CLASS = 'e-calculated-field';
@@ -6481,6 +6543,8 @@ const TREEVIEW = 'e-pivot-treeview';
 /** @hidden */
 const TREEVIEWOUTER = 'e-pivot-treeview-outer';
 /** @hidden */
+const TREE_CONTAINER = 'e-treeContainer';
+/** @hidden */
 const CALCCANCELBTN = 'e-pivot-cancel-button';
 /** @hidden */
 const CALCADDBTN = 'e-pivot-add-button';
@@ -6958,13 +7022,13 @@ class AggregateMenu {
             buttons: [
                 {
                     click: this.updateValueSettings.bind(this),
-                    buttonModel: { cssClass: OK_BUTTON_CLASS, content: this.parent.localeObj.getConstant('ok'), isPrimary: true }
+                    buttonModel: { cssClass: OK_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('ok'), isPrimary: true }
                 },
                 {
                     click: () => {
                         this.valueDialog.hide();
                     },
-                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS, content: this.parent.localeObj.getConstant('cancel') }
+                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('cancel') }
                 }
             ],
             closeOnEscape: (this.parent.getModuleName() === 'pivotfieldlist' && this.parent.renderMode === 'Popup') ? false : true,
@@ -7121,7 +7185,8 @@ class AggregateMenu {
             // floatLabelType: 'Auto',
             enableRtl: this.parent.enableRtl,
             locale: this.parent.locale,
-            value: fieldCaption, width: '100%'
+            value: fieldCaption, width: '100%',
+            cssClass: this.parent.cssClass
         });
         inputObj1.isStringTemplate = true;
         inputObj1.appendTo(inputField1);
@@ -7597,6 +7662,9 @@ class Render {
     }
     /* eslint-disable */
     contextMenuOpen(args) {
+        if (args.element && this.parent.cssClass) {
+            addClass([args.element.parentElement], this.parent.cssClass);
+        }
         for (let item of args.items) {
             let cellTarget = this.parent.lastCellClicked;
             let elem = null;
@@ -9052,6 +9120,12 @@ class Render {
                 }
             }
             else {
+                if ((['PercentageOfDifferenceFrom', 'PercentageOfRowTotal', 'PercentageOfColumnTotal', 'PercentageOfGrandTotal', 'PercentageOfParentRowTotal', 'PercentageOfParentColumnTotal', 'PercentageOfParentTotal']).indexOf(field.type) > -1) {
+                    format = 'P2';
+                }
+                else if (['PopulationStDev', 'SampleStDev', 'PopulationVar', 'SampleVar', 'Index'].indexOf(field.type) > -1) {
+                    format = undefined;
+                }
                 if (this.parent.dataSourceSettings.formatSettings.length > 0) {
                     for (let fCnt = 0; fCnt < this.parent.dataSourceSettings.formatSettings.length; fCnt++) {
                         let formatSettings = this.parent.dataSourceSettings.formatSettings[fCnt];
@@ -9146,12 +9220,18 @@ class Render {
         else {
             this.colPos++;
             /* eslint-disable-next-line */
-            if (isNullOrUndefined(args.data[this.colPos].value) || isNullOrUndefined(args.data[this.colPos].formattedText) || args.data[this.colPos].formattedText === "") {
+            let pivotValue = args.data[this.colPos];
+            if (isNullOrUndefined(pivotValue.value) || isNullOrUndefined(pivotValue.formattedText) || pivotValue.formattedText === "") {
                 args.value = this.parent.exportType === 'Excel' ? null : '';
             }
             else {
-                /* eslint-disable-next-line */
-                args.value = !isNullOrUndefined(args.data[this.colPos].value) ? args.data[this.colPos].value : args.data[this.colPos].formattedText;
+                let aggMatrix = this.parent.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 {
+                    args.value = !isNullOrUndefined(pivotValue.value) ? (pivotValue.formattedText === '#DIV/0!' ? pivotValue.formattedText : pivotValue.value) : pivotValue.formattedText;
+                }
             }
         }
         args = this.exportContentEvent(args);
@@ -9494,6 +9574,8 @@ class EventBase {
      * @hidden
      */
     constructor(parent) {
+        /** @hidden */
+        this.searchListItem = [];
         this.parent = parent;
     }
     /**
@@ -9590,6 +9672,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,
@@ -9611,6 +9702,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++) {
@@ -9650,15 +9759,20 @@ class EventBase {
         let isItemAvail = false;
         let filterTypes = ['Include', 'Exclude'];
         if (filterObj && filterTypes.indexOf(filterObj.type) >= 0) {
-            let engineModule = this.parent.engineModule;
-            let field = engineModule.fieldList[fieldName];
-            let members = (engineModule.formatFields[fieldName] &&
-                (['date', 'dateTime', 'time'].indexOf(engineModule.formatFields[fieldName].type) > -1)) ?
-                field.formattedMembers : field.members;
-            for (let item of filterObj.items) {
-                if (members[item]) {
-                    isItemAvail = true;
-                    break;
+            if (filterObj.type === 'Include' && filterObj.items.length === 0) {
+                isItemAvail = true;
+            }
+            else {
+                let engineModule = this.parent.engineModule;
+                let field = engineModule.fieldList[fieldName];
+                let members = (engineModule.formatFields[fieldName] &&
+                    (['date', 'dateTime', 'time'].indexOf(engineModule.formatFields[fieldName].type) > -1)) ?
+                    field.formattedMembers : field.members;
+                for (let item of filterObj.items) {
+                    if (members[item]) {
+                        isItemAvail = true;
+                        break;
+                    }
                 }
             }
         }
@@ -9898,6 +10012,7 @@ class EventBase {
             else {
                 treeObj.expandAll(undefined, undefined, true);
             }
+            this.searchListItem = searchList;
         }
         else {
             this.parent.searchTreeItems = [];
@@ -10570,7 +10685,7 @@ class ErrorDialog {
             buttons: [
                 {
                     click: this.closeErrorDialog.bind(this),
-                    buttonModel: { cssClass: OK_BUTTON_CLASS, content: this.parent.localeObj.getConstant('ok'), isPrimary: true }
+                    buttonModel: { cssClass: OK_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('ok'), isPrimary: true }
                 }
             ],
             cssClass: this.parent.cssClass,
@@ -10644,19 +10759,19 @@ class FilterDialog {
             buttons: [
                 {
                     buttonModel: {
-                        cssClass: 'e-clear-filter-button' + (this.allowExcelLikeFilter ? '' : ' ' + ICON_DISABLE),
+                        cssClass: 'e-clear-filter-button' + (this.allowExcelLikeFilter ? '' : ' ' + 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.filterObject ? false : true)
                     }
                 },
                 {
                     buttonModel: {
-                        cssClass: OK_BUTTON_CLASS, content: this.parent.localeObj.getConstant('ok'), isPrimary: true
+                        cssClass: OK_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('ok'), isPrimary: true
                     }
                 },
                 {
                     click: this.closeFilterDialog.bind(this),
-                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS, content: this.parent.localeObj.getConstant('cancel') }
+                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('cancel') }
                 }
             ],
             closeOnEscape: this.parent.renderMode === 'Popup' ? false : true,
@@ -10757,7 +10872,7 @@ class FilterDialog {
         this.editorSearch = new MaskedTextBox({
             placeholder: this.parent.localeObj.getConstant('search') + ' ' + '&#8220' + filterCaption + '&#8220',
             enableRtl: this.parent.enableRtl,
-            cssClass: EDITOR_SEARCH_CLASS,
+            cssClass: EDITOR_SEARCH_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
             showClearButton: true,
             change: (e) => {
                 if (this.parent.dataType === 'olap') {
@@ -10795,7 +10910,8 @@ class FilterDialog {
             nodeSelected: (args) => {
                 removeClass([args.node], 'e-active');
                 args.cancel = true;
-            }
+            },
+            cssClass: this.parent.cssClass
         });
         this.allMemberSelect.isStringTemplate = true;
         if (!isNullOrUndefined(this.parent.currentTreeItems)) {
@@ -10820,7 +10936,8 @@ class FilterDialog {
                 removeClass([args.node], 'e-active');
                 args.cancel = true;
             },
-            expandOn: 'None'
+            expandOn: 'None',
+            cssClass: this.parent.cssClass
         });
         this.memberTreeView.isStringTemplate = true;
         this.memberTreeView.appendTo(treeViewContainer);
@@ -10831,7 +10948,7 @@ class FilterDialog {
         if (this.parent.dataType === 'pivot' && treeData && treeData.length > 0) {
             let sortOrder = this.parent.engineModule.fieldList[fieldName].sort;
             let sortWrapper = createElement('div', {
-                className: FILTER_SORT_CLASS + ' e-btn-group' + (this.parent.enableRtl ? ' ' + RTL : ''),
+                className: FILTER_SORT_CLASS + ' e-btn-group' + (this.parent.enableRtl ? ' ' + RTL : '') + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                 id: this.parent.element.id + '_Member_Sort'
             });
             this.parent.element.appendChild(sortWrapper);
@@ -10844,11 +10961,11 @@ class FilterDialog {
                 id: this.parent.element.id + '_Sort_Descend', attrs: { 'type': 'button' }
             });
             let sortBtnElement = new Button({
-                iconCss: ICON + ' ' + SORT_ASCEND_ICON_CLASS, enableRtl: this.parent.enableRtl
+                iconCss: ICON + ' ' + SORT_ASCEND_ICON_CLASS, enableRtl: this.parent.enableRtl, cssClass: this.parent.cssClass
             });
             sortBtnElement.appendTo(sortAscendElement);
             sortBtnElement = new Button({
-                iconCss: ICON + ' ' + SORT_DESCEND_ICON_CLASS, enableRtl: this.parent.enableRtl
+                iconCss: ICON + ' ' + SORT_DESCEND_ICON_CLASS, enableRtl: this.parent.enableRtl, cssClass: this.parent.cssClass
             });
             sortBtnElement.appendTo(sortDescendElement);
             sortWrapper.appendChild(sortAscendElement);
@@ -11191,7 +11308,8 @@ class FilterDialog {
             items: items,
             height: '100%',
             selectedItem: selectedIndex,
-            enableRtl: this.parent.enableRtl
+            enableRtl: this.parent.enableRtl,
+            cssClass: this.parent.cssClass
         });
         this.tabObj.isStringTemplate = true;
         this.tabObj.appendTo(wrapper);
@@ -11508,7 +11626,9 @@ class FilterDialog {
                     else {
                         return;
                     }
-                }, width: '100%'
+                },
+                width: '100%',
+                cssClass: this.parent.cssClass
             });
             let inputObj2 = new NumericTextBox({
                 placeholder: this.parent.localeObj.getConstant('enterValue'),
@@ -11527,7 +11647,9 @@ class FilterDialog {
                     else {
                         return;
                     }
-                }, width: '100%'
+                },
+                width: '100%',
+                cssClass: this.parent.cssClass
             });
             inputObj1.isStringTemplate = true;
             inputObj1.appendTo(inputDiv1);
@@ -11548,7 +11670,9 @@ class FilterDialog {
                     else {
                         return;
                     }
-                }, width: '100%'
+                },
+                width: '100%',
+                cssClass: this.parent.cssClass
             });
             let inputObj2 = new MaskedTextBox({
                 placeholder: this.parent.localeObj.getConstant('enterValue'),
@@ -11563,7 +11687,9 @@ class FilterDialog {
                     else {
                         return;
                     }
-                }, width: '100%'
+                },
+                width: '100%',
+                cssClass: this.parent.cssClass
             });
             inputObj1.isStringTemplate = true;
             inputObj1.appendTo(inputDiv1);
@@ -13629,9 +13755,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;
@@ -13789,9 +13914,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 }
         };
@@ -13802,6 +13927,7 @@ class DrillThroughDialog {
             enabled: true,
             format: '####.##',
             locale: this.parent.locale,
+            cssClass: this.parent.cssClass,
             change: () => {
                 let textBoxValue = this.numericTextBox.value;
                 let indexValue = eventArgs.currentCell.indexObject[indexObject];
@@ -13972,10 +14098,10 @@ class DrillThroughDialog {
                     this.drillThroughGrid.columns.push({
                         headerText: this.parent.localeObj.getConstant('manageRecords'), width: 160, showInColumnChooser: false,
                         commands: [
-                            { type: 'Edit', buttonOption: { iconCss: ' e-icons e-edit', cssClass: 'e-flat' } },
-                            { type: 'Delete', buttonOption: { iconCss: 'e-icons e-delete', cssClass: 'e-flat' } },
-                            { type: 'Save', buttonOption: { iconCss: 'e-icons e-update', cssClass: 'e-flat' } },
-                            { type: 'Cancel', buttonOption: { iconCss: 'e-icons e-cancel-icon', cssClass: 'e-flat' } }
+                            { type: 'Edit', buttonOption: { iconCss: ' e-icons e-edit', cssClass: 'e-flat' + (this.parent.cssClass ? (' ' + this.parent.cssClass) : '') } },
+                            { type: 'Delete', buttonOption: { iconCss: 'e-icons e-delete', cssClass: 'e-flat' + (this.parent.cssClass ? (' ' + this.parent.cssClass) : '') } },
+                            { type: 'Save', buttonOption: { iconCss: 'e-icons e-update', cssClass: 'e-flat' + (this.parent.cssClass ? (' ' + this.parent.cssClass) : '') } },
+                            { type: 'Cancel', buttonOption: { iconCss: 'e-icons e-cancel-icon', cssClass: 'e-flat' + (this.parent.cssClass ? (' ' + this.parent.cssClass) : '') } }
                         ]
                     });
                 }
@@ -14234,7 +14360,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') {
@@ -14304,7 +14430,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;
                 }
             }
@@ -14781,6 +14907,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);
             }
         }
@@ -16510,7 +16639,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.
@@ -16884,7 +17013,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.
@@ -18272,7 +18401,7 @@ class MDXQuery {
             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;
@@ -22722,8 +22851,8 @@ let PivotView = class PivotView extends Component {
         if (this.showTooltip) {
             if (this.tooltipTemplate) {
                 this.tooltip = new Tooltip({
-                    target: 'td.e-valuescontent' + (this.cssClass ? (' ' + this.cssClass) : ''),
-                    cssClass: 'e-pivottooltiptemplate',
+                    target: 'td.e-valuescontent',
+                    cssClass: 'e-pivottooltiptemplate' + (this.cssClass ? (' ' + this.cssClass) : ''),
                     showTipPointer: false,
                     position: 'BottomRight',
                     mouseTrail: true,
@@ -22735,7 +22864,8 @@ let PivotView = class PivotView extends Component {
             }
             else {
                 this.tooltip = new Tooltip({
-                    target: 'td.e-valuescontent' + (this.cssClass ? (' ' + this.cssClass) : ''),
+                    target: 'td.e-valuescontent',
+                    cssClass: this.cssClass,
                     showTipPointer: false,
                     position: 'BottomRight',
                     mouseTrail: true,
@@ -23658,6 +23788,8 @@ let PivotView = class PivotView extends Component {
                         this.pivotFieldListModule.axisFieldModule.render();
                     }
                     break;
+                case 'enableFieldSearching':
+                    this.pivotFieldListModule.enableFieldSearching = this.enableFieldSearching;
             }
         }
     }
@@ -26228,6 +26360,9 @@ __decorate([
 __decorate([
     Property(false)
 ], PivotView.prototype, "allowCalculatedField", void 0);
+__decorate([
+    Property(false)
+], PivotView.prototype, "enableFieldSearching", void 0);
 __decorate([
     Property(false)
 ], PivotView.prototype, "enableValueSorting", void 0);
@@ -26887,7 +27022,8 @@ class ExcelExport$1 {
                             let styles = (pivotCell.axis == 'row') ? { hAlign: 'Left', bold: true, wrapText: true } : { numberFormat: formatList[field], bold: false, wrapText: true };
                             let headerStyle = { bold: true, vAlign: 'Center', wrapText: true, indent: cCnt === 0 ? pivotCell.level * 10 : 0 };
                             if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
-                                let cellValue = pivotCell.axis === 'value' ? pivotCell.value : pivotCell.formattedText;
+                                let aggMatrix = this.parent.engineModule.aggregatedValueMatrix;
+                                let cellValue = pivotCell.axis === 'value' ? ((aggMatrix[rCnt] && aggMatrix[rCnt][cCnt]) ? aggMatrix[rCnt][cCnt] : (pivotCell.formattedText === '#DIV/0!' ? pivotCell.formattedText : pivotCell.value)) : pivotCell.formattedText;
                                 let isgetValuesHeader = ((this.parent.dataSourceSettings.rows.length === 0 && this.parent.dataSourceSettings.valueAxis === 'row')
                                     || (this.parent.dataSourceSettings.columns.length === 0 && this.parent.dataSourceSettings.valueAxis === 'column'));
                                 if (pivotCell.type === 'grand sum' && !(this.parent.dataSourceSettings.values.length === 1 && this.parent.dataSourceSettings.valueAxis === 'row' && pivotCell.axis === 'column')) {
@@ -27550,6 +27686,12 @@ class DialogRenderer {
         if (this.parent.cssClass) {
             addClass([fieldListWrappper], this.parent.cssClass);
         }
+        if (this.parent.enableFieldSearching) {
+            addClass([fieldListWrappper], FIELD_LIST_SEARCH_MODE_CLASS);
+        }
+        else {
+            removeClass([fieldListWrappper], FIELD_LIST_SEARCH_MODE_CLASS);
+        }
         this.parentElement = createElement('div', { className: CONTAINER_CLASS });
         this.parent.element.appendChild(fieldListWrappper);
         if (this.parent.isAdaptive) {
@@ -27594,13 +27736,14 @@ class DialogRenderer {
                 checked: true,
                 enableRtl: this.parent.enableRtl,
                 locale: this.parent.locale,
-                change: this.onCheckChange.bind(this)
+                change: this.onCheckChange.bind(this),
+                cssClass: this.parent.cssClass
             });
             this.deferUpdateCheckBox.isStringTemplate = true;
             this.deferUpdateCheckBox.appendTo('#' + this.parent.element.id + 'DeferUpdateCheckBox');
             this.deferUpdateApplyButton = new Button({
                 cssClass: DEFER_APPLY_BUTTON + ' ' + DEFER_UPDATE_BUTTON + (this.parent.renderMode === 'Popup' ?
-                    (' ' + BUTTON_FLAT_CLASS) : ''),
+                    (' ' + BUTTON_FLAT_CLASS) : '') + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                 content: this.parent.localeObj.getConstant('apply'),
                 enableRtl: this.parent.enableRtl,
                 locale: this.parent.locale,
@@ -27613,7 +27756,7 @@ class DialogRenderer {
         }
         this.deferUpdateCancelButton = new Button({
             cssClass: DEFER_CANCEL_BUTTON + ' ' + CANCEL_BUTTON_CLASS + (this.parent.renderMode === 'Popup' ?
-                (' ' + BUTTON_FLAT_CLASS) : ''),
+                (' ' + BUTTON_FLAT_CLASS) : '') + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
             content: this.parent.allowDeferLayoutUpdate ? this.parent.localeObj.getConstant('cancel') :
                 this.parent.localeObj.getConstant('close'),
             enableRtl: this.parent.enableRtl, isPrimary: !this.parent.allowDeferLayoutUpdate, locale: this.parent.locale
@@ -27730,7 +27873,7 @@ class DialogRenderer {
             let buttons = [{
                     click: this.showFieldListDialog.bind(this),
                     buttonModel: {
-                        cssClass: ADAPTIVE_FIELD_LIST_BUTTON_CLASS + ' ' + BUTTON_SMALL_CLASS + ' ' + BUTTON_ROUND_CLASS,
+                        cssClass: ADAPTIVE_FIELD_LIST_BUTTON_CLASS + ' ' + BUTTON_SMALL_CLASS + ' ' + BUTTON_ROUND_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                         iconCss: ICON + ' ' + ADD_ICON_CLASS,
                         isPrimary: true
                     }
@@ -27738,7 +27881,7 @@ class DialogRenderer {
                     click: this.showCalculatedField.bind(this),
                     buttonModel: {
                         cssClass: ADAPTIVE_CALCULATED_FIELD_BUTTON_CLASS +
-                            ' ' + BUTTON_SMALL_CLASS + ' ' + BUTTON_ROUND_CLASS + ' ' + ICON_DISABLE,
+                            ' ' + BUTTON_SMALL_CLASS + ' ' + BUTTON_ROUND_CLASS + ' ' + ICON_DISABLE + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                         iconCss: ICON + ' ' + ADD_ICON_CLASS, enableRtl: this.parent.enableRtl,
                         isPrimary: true
                     }
@@ -27875,7 +28018,8 @@ class DialogRenderer {
             height: '100%',
             enableRtl: this.parent.enableRtl,
             locale: this.parent.locale,
-            selected: this.tabSelect.bind(this)
+            selected: this.tabSelect.bind(this),
+            cssClass: this.parent.cssClass
         });
         if (this.parent.renderMode === 'Fixed') {
             layoutFooter.appendChild(this.createAddButton());
@@ -27921,7 +28065,7 @@ class DialogRenderer {
             }
         });
         let calculateField = new Button({
-            cssClass: CALCULATED_FIELD_CLASS + ' ' + ICON_DISABLE,
+            cssClass: CALCULATED_FIELD_CLASS + ' ' + ICON_DISABLE + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
             content: this.parent.localeObj.getConstant('CalculatedField'),
             enableRtl: this.parent.enableRtl, locale: this.parent.locale
         });
@@ -27941,12 +28085,12 @@ class DialogRenderer {
         let calculatedButton = createElement('div', {});
         let calculateField = new Button({
             cssClass: ADAPTIVE_CALCULATED_FIELD_BUTTON_CLASS +
-                ' ' + BUTTON_SMALL_CLASS + ' ' + BUTTON_ROUND_CLASS + ' ' + ICON_DISABLE,
+                ' ' + BUTTON_SMALL_CLASS + ' ' + BUTTON_ROUND_CLASS + ' ' + ICON_DISABLE + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
             iconCss: ICON + ' ' + ADD_ICON_CLASS,
             enableRtl: this.parent.enableRtl, locale: this.parent.locale
         });
         let fieldList = new Button({
-            cssClass: ADAPTIVE_FIELD_LIST_BUTTON_CLASS + ' ' + BUTTON_SMALL_CLASS + ' ' + BUTTON_ROUND_CLASS,
+            cssClass: ADAPTIVE_FIELD_LIST_BUTTON_CLASS + ' ' + BUTTON_SMALL_CLASS + ' ' + BUTTON_ROUND_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
             iconCss: ICON + ' ' + ADD_ICON_CLASS,
             enableRtl: this.parent.enableRtl, locale: this.parent.locale
         });
@@ -28136,6 +28280,8 @@ class TreeViewRenderer {
      */
     constructor(parent) {
         this.selectedNodes = [];
+        this.isSearching = false;
+        this.parentIDs = [];
         this.parent = parent;
         this.addEventListener();
     }
@@ -28156,15 +28302,42 @@ class TreeViewRenderer {
                 className: FIELD_HEADER_CLASS,
                 innerHTML: this.parent.localeObj.getConstant('allFields')
             });
-            let treeOuterDiv = createElement('div', { className: FIELD_LIST_TREE_CLASS + '-outer-div' });
+            let searchWrapper = createElement('div', {
+                id: this.parent.element.id + '_SearchDiv', attrs: { 'tabindex': '-1' },
+                className: FIELD_LIST_SEARCH_CLASS
+            });
+            let searchInput = createElement('input', { attrs: { 'type': 'text' } });
+            searchWrapper.appendChild(searchInput);
+            this.fieldSearch = new TextBox({
+                placeholder: this.parent.localeObj.getConstant('search'),
+                enableRtl: this.parent.enableRtl,
+                locale: this.parent.locale,
+                cssClass: FIELD_LIST_SEARCH_INPUT_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
+                input: this.textChange.bind(this),
+                showClearButton: true
+            });
+            this.fieldSearch.isStringTemplate = true;
+            this.fieldSearch.appendTo(searchInput);
+            this.fieldSearch.addIcon('append', FIELD_LIST_SEARCH_ICON_CLASS + ' ' + ICON);
+            let promptDiv = createElement('div', {
+                className: EMPTY_MEMBER_CLASS + ' ' + ICON_DISABLE,
+                innerHTML: this.parent.localeObj.getConstant('noMatches')
+            });
+            let treeOuterDiv = createElement('div', {
+                className: FIELD_LIST_TREE_OUTER_DIV_CLASS + ' ' + TREE_CONTAINER
+            });
             this.treeViewElement = createElement('div', {
                 id: this.parent.element.id + '_TreeView',
                 className: FIELD_LIST_CLASS + ' ' + (this.parent.dataType === 'olap' ? OLAP_FIELD_LIST_CLASS : '')
             });
-            let fieldHeaderWrappper = createElement('div', { className: 'e-field-header-container' });
+            let fieldHeaderWrappper = createElement('div', { className: FIELD_HEADER_CONTAINER_CLASS });
             fieldHeaderWrappper.appendChild(treeHeader);
             fieldTable.appendChild(fieldHeaderWrappper);
             this.updateSortElements(fieldHeaderWrappper);
+            if (this.parent.enableFieldSearching) {
+                fieldTable.appendChild(searchWrapper);
+                fieldTable.appendChild(promptDiv);
+            }
             treeOuterDiv.appendChild(this.treeViewElement);
             fieldTable.appendChild(treeOuterDiv);
             this.parentElement.appendChild(fieldTable);
@@ -28287,6 +28460,39 @@ class TreeViewRenderer {
         if (args.node.querySelector('.' + NODE_CHECK_CLASS)) {
             addClass([args.node.querySelector('.' + LIST_TEXT_CLASS)], LIST_SELECT_CLASS);
         }
+        if (this.parent.enableFieldSearching && this.isSearching) {
+            let liElement = args.node;
+            if (this.parent.dataType === 'olap') {
+                let id = liElement.getAttribute('data-uid');
+                let searchItem = this.parent.pivotCommon.eventBase.searchListItem;
+                for (let i = 0; i < this.parentIDs.length; i++) {
+                    if (id === this.parentIDs[i]) {
+                        addClass([liElement], ICON_DISABLE);
+                    }
+                    for (let li2 of searchItem) {
+                        let parentID = this.parent.pivotCommon.eventBase.getParentIDs(this.fieldTable, li2.getAttribute('data-uid'), []);
+                        if (PivotUtil.inArray(id, parentID) > -1) {
+                            removeClass([liElement], ICON_DISABLE);
+                            break;
+                        }
+                    }
+                }
+            }
+            else {
+                for (let i = 0; i < this.nonSearchList.length; i++) {
+                    if (liElement.textContent === this.nonSearchList[i].textContent) {
+                        addClass([liElement], ICON_DISABLE);
+                        break;
+                    }
+                    else {
+                        if (liElement.innerText === this.nonSearchList[i].textContent) {
+                            addClass([liElement], ICON_DISABLE);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
     }
     updateOlapTreeNode(args) {
         let allowDrag = false;
@@ -28342,12 +28548,12 @@ class TreeViewRenderer {
             buttons: [{
                     click: this.closeTreeDialog.bind(this),
                     buttonModel: {
-                        cssClass: CANCEL_BUTTON_CLASS, content: this.parent.localeObj.getConstant('cancel')
+                        cssClass: CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('cancel')
                     }
                 }, {
                     click: this.onFieldAdd.bind(this),
                     buttonModel: {
-                        cssClass: OK_BUTTON_CLASS, content: this.parent.localeObj.getConstant('add'),
+                        cssClass: OK_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('add'),
                         isPrimary: true
                     }
                 }],
@@ -28376,7 +28582,7 @@ class TreeViewRenderer {
         });
         let editorSearch = createElement('input', { attrs: { 'type': 'text' } });
         searchWrapper.appendChild(editorSearch);
-        let treeOuterDiv = createElement('div', { className: EDITOR_TREE_CONTAINER_CLASS + '-outer-div' });
+        let treeOuterDiv = createElement('div', { className: FIELD_LIST_TREE_OUTER_DIV_CLASS });
         let treeViewContainer = createElement('div', {
             className: EDITOR_TREE_CONTAINER_CLASS + ' ' + (this.parent.dataType === 'olap' ? 'e-olap-field-list-tree' : '')
         });
@@ -28386,7 +28592,7 @@ class TreeViewRenderer {
             placeholder: this.parent.localeObj.getConstant('search'),
             enableRtl: this.parent.enableRtl,
             locale: this.parent.locale,
-            cssClass: EDITOR_SEARCH_CLASS,
+            cssClass: EDITOR_SEARCH_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
             change: this.textChange.bind(this)
         });
         this.editorSearch.isStringTemplate = true;
@@ -28422,14 +28628,41 @@ class TreeViewRenderer {
     }
     textChange(e) {
         this.parent.pivotCommon.eventBase.searchTreeNodes(e, this.fieldTable, true);
-        let promptDiv = this.fieldDialog.element.querySelector('.' + EMPTY_MEMBER_CLASS);
+        let promptDiv;
+        let treeOuterDiv;
+        if (this.parent.isAdaptive) {
+            promptDiv = this.fieldDialog.element.querySelector('.' + EMPTY_MEMBER_CLASS);
+        }
+        else {
+            promptDiv = this.parentElement.querySelector('.' + EMPTY_MEMBER_CLASS);
+            treeOuterDiv = this.parentElement.querySelector('.' + TREE_CONTAINER);
+        }
         let liList = [].slice.call(this.fieldTable.element.querySelectorAll('li'));
         let disabledList = [].slice.call(this.fieldTable.element.querySelectorAll('li.' + ICON_DISABLE));
         if (liList.length === disabledList.length) {
             removeClass([promptDiv], ICON_DISABLE);
+            if (!this.parent.isAdaptive) {
+                addClass([treeOuterDiv], ICON_DISABLE);
+                removeClass([treeOuterDiv], FIELD_LIST_TREE_OUTER_DIV_SEARCH_CLASS);
+            }
         }
         else {
             addClass([promptDiv], ICON_DISABLE);
+            if (!this.parent.isAdaptive) {
+                removeClass([treeOuterDiv], ICON_DISABLE);
+                addClass([treeOuterDiv], FIELD_LIST_TREE_OUTER_DIV_SEARCH_CLASS);
+            }
+        }
+        this.isSearching = disabledList.length > 0 ? true : false;
+        this.nonSearchList = disabledList;
+        if (this.parent.dataType === 'olap') {
+            this.parentIDs = [];
+            for (let i = 0; i < liList.length; i++) {
+                if (liList[i].classList.contains("e-level-1")) {
+                    let id = liList[i].getAttribute('data-uid');
+                    this.parentIDs.push(id);
+                }
+            }
         }
     }
     dragStart(args) {
@@ -29072,6 +29305,10 @@ class TreeViewRenderer {
             this.editorSearch.destroy();
             this.editorSearch = null;
         }
+        if (this.fieldSearch && !this.fieldSearch.isDestroyed) {
+            this.fieldSearch.destroy();
+            this.fieldSearch = null;
+        }
     }
 }
 
@@ -29375,7 +29612,7 @@ class PivotButton {
                                 buttonWrapper.appendChild(buttonElement);
                             }
                             element.appendChild(buttonWrapper);
-                            let pivotButton = new Button({ enableRtl: this.parent.enableRtl, locale: this.parent.locale });
+                            let 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);
@@ -30186,7 +30423,7 @@ class PivotButton {
         return [
             {
                 buttonModel: {
-                    cssClass: 'e-clear-filter-button' + (this.parent.pivotCommon.filterDialog.allowExcelLikeFilter ? '' : ' ' + ICON_DISABLE),
+                    cssClass: 'e-clear-filter-button' + (this.parent.pivotCommon.filterDialog.allowExcelLikeFilter ? '' : ' ' + 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)
                 },
@@ -30194,13 +30431,13 @@ class PivotButton {
             },
             {
                 buttonModel: {
-                    cssClass: OK_BUTTON_CLASS, content: this.parent.localeObj.getConstant('ok'), isPrimary: true
+                    cssClass: 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: CANCEL_BUTTON_CLASS, content: this.parent.localeObj.getConstant('cancel') }
+                buttonModel: { cssClass: CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('cancel') }
             }
         ];
     }
@@ -31406,6 +31643,8 @@ let PivotFieldList = class PivotFieldList extends Component {
                     }
                     requireRefresh = true;
                     break;
+                case 'enableFieldSearching':
+                    this.refresh();
             }
             if (requireRefresh) {
                 this.fieldListRender();
@@ -32049,6 +32288,9 @@ __decorate$4([
 __decorate$4([
     Property(false)
 ], PivotFieldList.prototype, "allowCalculatedField", void 0);
+__decorate$4([
+    Property(false)
+], PivotFieldList.prototype, "enableFieldSearching", void 0);
 __decorate$4([
     Property(false)
 ], PivotFieldList.prototype, "showValuesButton", void 0);
@@ -33111,13 +33353,15 @@ class CalculatedField {
                 click: this.applyFormula.bind(this),
                 buttonModel: {
                     content: this.parent.localeObj.getConstant('ok'),
-                    isPrimary: true
+                    isPrimary: true,
+                    cssClass: this.parent.cssClass
                 }
             },
             {
                 click: this.cancelClick.bind(this),
                 buttonModel: {
-                    content: this.parent.localeObj.getConstant('cancel')
+                    content: this.parent.localeObj.getConstant('cancel'),
+                    cssClass: this.parent.cssClass
                 }
             }
         ];
@@ -33125,7 +33369,7 @@ class CalculatedField {
             let clearButton = {
                 click: this.clearFormula.bind(this),
                 buttonModel: {
-                    cssClass: 'e-calc-clear-btn',
+                    cssClass: 'e-calc-clear-btn' + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                     content: this.parent.localeObj.getConstant('clear'),
                 }
             };
@@ -33554,7 +33798,8 @@ class CalculatedField {
             change: (args) => {
                 this.formatText = args.value;
                 this.formulaText = select('#' + this.parentID + 'droppable', document).value;
-            }
+            },
+            cssClass: this.parent.cssClass
         });
         customerFormatObj.isStringTemplate = true;
         customerFormatObj.appendTo('#' + this.parentID + 'Custom_Format_Element');
@@ -33857,7 +34102,7 @@ class CalculatedField {
             dialogRenderer.parentElement.querySelector('.' + FORMULA) !== null) {
             this.createOlapDropElements();
         }
-        let cancelBtn = new Button({ cssClass: FLAT, isPrimary: true, locale: this.parent.locale, enableRtl: this.parent.enableRtl });
+        let cancelBtn = new Button({ cssClass: FLAT + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), isPrimary: true, locale: this.parent.locale, enableRtl: this.parent.enableRtl });
         cancelBtn.isStringTemplate = true;
         cancelBtn.appendTo('#' + this.parentID + 'cancelBtn');
         if (cancelBtn.element) {
@@ -33865,7 +34110,7 @@ class CalculatedField {
         }
         if (this.parent.
             dialogRenderer.parentElement.querySelector('.' + FORMULA) !== null && this.parent.isAdaptive) {
-            let okBtn = new Button({ cssClass: FLAT + ' ' + OUTLINE_CLASS, isPrimary: true, locale: this.parent.locale, enableRtl: this.parent.enableRtl });
+            let okBtn = new Button({ cssClass: FLAT + ' ' + OUTLINE_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), isPrimary: true, locale: this.parent.locale, enableRtl: this.parent.enableRtl });
             okBtn.isStringTemplate = true;
             okBtn.appendTo('#' + this.parentID + 'okBtn');
             this.inputObj = new MaskedTextBox({
@@ -33874,7 +34119,8 @@ class CalculatedField {
                 change: (args) => {
                     this.fieldText = args.value;
                     this.formulaText = select('#' + this.parentID + 'droppable', document).value;
-                }
+                },
+                cssClass: this.parent.cssClass
             });
             this.inputObj.isStringTemplate = true;
             this.inputObj.appendTo('#' + this.parentID + 'ddlelement');
@@ -33885,7 +34131,8 @@ class CalculatedField {
                     change: (args) => {
                         this.formatText = args.value;
                         this.formulaText = select('#' + this.parentID + 'droppable', document).value;
-                    }
+                    },
+                    cssClass: this.parent.cssClass
                 });
                 formatInputObj.isStringTemplate = true;
                 formatInputObj.appendTo('#' + this.parentID + 'Custom_Format_Element');
@@ -33911,7 +34158,7 @@ class CalculatedField {
             }
         }
         else if (this.parent.isAdaptive) {
-            let addBtn = new Button({ cssClass: FLAT, isPrimary: true, locale: this.parent.locale, enableRtl: this.parent.enableRtl });
+            let addBtn = new Button({ cssClass: FLAT + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), isPrimary: true, locale: this.parent.locale, enableRtl: this.parent.enableRtl });
             addBtn.isStringTemplate = true;
             addBtn.appendTo('#' + this.parentID + 'addBtn');
             if (this.parent.dataType === 'olap') {
@@ -33968,7 +34215,8 @@ class CalculatedField {
                             name: AGRTYPE + key,
                             checked: args.element.querySelector('[data-type').getAttribute('data-type') === type[i],
                             change: this.onChange.bind(this),
-                            locale: this.parent.locale, enableRtl: this.parent.enableRtl
+                            locale: this.parent.locale, enableRtl: this.parent.enableRtl,
+                            cssClass: this.parent.cssClass
                         });
                         radiobutton.isStringTemplate = true;
                         radiobutton.appendTo('#' + this.parentID + 'radio' + key + type[i]);
@@ -34005,7 +34253,8 @@ class CalculatedField {
             }
             let checkbox = new CheckBox({
                 label: this.parent.engineModule.fieldList[key].caption + ' (' + this.parent.localeObj.getConstant(type) + ')',
-                locale: this.parent.locale, enableRtl: this.parent.enableRtl
+                locale: this.parent.locale, enableRtl: this.parent.enableRtl,
+                cssClass: this.parent.cssClass
             });
             checkbox.isStringTemplate = true;
             checkbox.appendTo('#' + this.parentID + '_' + index);
@@ -34100,14 +34349,16 @@ class CalculatedField {
         this.dialog.refresh();
         this.inputObj = new MaskedTextBox({
             placeholder: this.parent.localeObj.getConstant('fieldName'),
-            locale: this.parent.locale, enableRtl: this.parent.enableRtl
+            locale: this.parent.locale, enableRtl: this.parent.enableRtl,
+            cssClass: this.parent.cssClass
         });
         this.inputObj.isStringTemplate = true;
         this.inputObj.appendTo('#' + this.parentID + 'ddlelement');
         if (this.parent.dataType === 'pivot') {
             let customerFormatObj = new MaskedTextBox({
                 placeholder: this.parent.localeObj.getConstant('numberFormatString'),
-                locale: this.parent.locale, enableRtl: this.parent.enableRtl
+                locale: this.parent.locale, enableRtl: this.parent.enableRtl,
+                cssClass: this.parent.cssClass
             });
             customerFormatObj.isStringTemplate = true;
             customerFormatObj.appendTo('#' + this.parentID + 'Custom_Format_Element');
@@ -34148,14 +34399,14 @@ class CalculatedField {
                 {
                     click: isRemove ? this.removeCalcField.bind(this, node) : this.replaceFormula.bind(this, calcInfo),
                     buttonModel: {
-                        cssClass: OK_BUTTON_CLASS + ' ' + FLAT_CLASS,
+                        cssClass: OK_BUTTON_CLASS + ' ' + FLAT_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                         content: isRemove ? this.parent.localeObj.getConstant('yes') : this.parent.localeObj.getConstant('ok'), isPrimary: true
                     }
                 },
                 {
                     click: this.removeErrorDialog.bind(this),
                     buttonModel: {
-                        cssClass: CANCEL_BUTTON_CLASS,
+                        cssClass: CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                         content: isRemove ? this.parent.localeObj.getConstant('no') : this.parent.localeObj.getConstant('cancel'), isPrimary: true
                     }
                 }
@@ -34299,7 +34550,8 @@ class FieldList {
             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;
@@ -34965,7 +35217,7 @@ class GroupingBar {
         }
         element.prepend(createElement('div', { id: this.parent.element.id + '_AllFields' }));
         let toolbarObj = new Toolbar$1({
-            cssClass: ALL_FIELDS_PANEL_CLASS,
+            cssClass: ALL_FIELDS_PANEL_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
             enableRtl: this.parent.enableRtl,
             items: [{ template: '<div class=' + GROUP_ALL_FIELDS_CLASS + '></div>' }],
             allowKeyboard: false,
@@ -35064,8 +35316,8 @@ class ConditionalFormatting {
             {
                 click: this.addButtonClick.bind(this),
                 buttonModel: {
-                    cssClass: this.parent.isAdaptive ? (FORMAT_ROUND_BUTTON + ' ' + FORMAT_CONDITION_BUTTON) :
-                        FORMAT_CONDITION_BUTTON,
+                    cssClass: (this.parent.isAdaptive ? (FORMAT_ROUND_BUTTON + ' ' + FORMAT_CONDITION_BUTTON) :
+                        FORMAT_CONDITION_BUTTON) + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                     iconCss: ICON + ' ' + ADD_ICON_CLASS,
                     content: this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('condition')
                 }
@@ -35074,7 +35326,7 @@ class ConditionalFormatting {
                 click: this.applyButtonClick.bind(this),
                 isFlat: true,
                 buttonModel: {
-                    isPrimary: true, cssClass: FORMAT_APPLY_BUTTON,
+                    isPrimary: true, cssClass: FORMAT_APPLY_BUTTON + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                     content: this.parent.localeObj.getConstant('apply')
                 }
             },
@@ -35082,7 +35334,7 @@ class ConditionalFormatting {
                 click: this.cancelButtonClick.bind(this),
                 isFlat: true,
                 buttonModel: {
-                    cssClass: FORMAT_CANCEL_BUTTON,
+                    cssClass: FORMAT_CANCEL_BUTTON + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                     content: this.parent.localeObj.getConstant('cancel')
                 }
             }
@@ -35449,7 +35701,7 @@ class ConditionalFormatting {
         addClass([this.backgroundColor[i].element.nextElementSibling.querySelector('.e-selected-color')], ICON);
         let toggleBtn = new Button({
             iconCss: ICON + ' ' + FORMAT_DELETE_ICON,
-            cssClass: FLAT, locale: this.parent.locale, enableRtl: this.parent.enableRtl
+            cssClass: FLAT + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), locale: this.parent.locale, enableRtl: this.parent.enableRtl
         });
         toggleBtn.isStringTemplate = true;
         toggleBtn.appendTo('#' + this.parentID + 'removeButton' + i);
@@ -35670,6 +35922,7 @@ class Toolbar$2 {
             locale: this.parent.locale,
             items: this.getItems(),
             allowKeyboard: false,
+            cssClass: this.parent.cssClass,
             width: !this.parent.gridSettings.allowAutoResizing ? (this.parent.grid ? (this.parent.getGridWidthAsNumber() - 2) : (this.parent.getWidthAsNumber() - 2)) : 'auto'
         });
         this.toolbar.isStringTemplate = true;
@@ -35759,7 +36012,7 @@ class Toolbar$2 {
                     let toDisable = this.parent.displayOption.view === 'Chart';
                     items.push({
                         prefixIcon: TOOLBAR_GRID + ' ' + ICON, tooltipText: this.parent.localeObj.getConstant('grid'),
-                        id: this.parent.element.id + 'grid', cssClass: toDisable ? MENU_DISABLE : '',
+                        id: this.parent.element.id + 'grid', cssClass: (toDisable ? MENU_DISABLE : '') + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                         click: this.menuItemClick.bind(this)
                     });
                     break;
@@ -35767,7 +36020,7 @@ class Toolbar$2 {
                     let validTypes = (this.parent.displayOption.view === 'Table');
                     items.push({
                         template: '<ul id="' + this.parent.element.id + 'chart_menu"></ul>',
-                        id: this.parent.element.id + 'chartmenu', cssClass: validTypes ? MENU_DISABLE : ''
+                        id: this.parent.element.id + 'chartmenu', cssClass: (validTypes ? MENU_DISABLE : '') + (this.parent.cssClass ? (' ' + this.parent.cssClass) : '')
                     });
                     break;
                 case 'MDX':
@@ -35875,7 +36128,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();
@@ -36132,7 +36385,7 @@ class Toolbar$2 {
                     return;
                 }
                 let saveArgs = {
-                    report: _this.parent.getPersistData(),
+                    report: _this.getCurrentReport(),
                     reportName: reportInput.value
                 };
                 let actionInfo = {
@@ -36168,7 +36421,7 @@ class Toolbar$2 {
                 }
                 _this.parent.trigger(newReport);
                 let saveArgs = {
-                    report: _this.parent.getPersistData(),
+                    report: _this.getCurrentReport(),
                     reportName: reportInput.value
                 };
                 let actionInfo = {
@@ -36259,14 +36512,14 @@ class Toolbar$2 {
                 {
                     buttonModel: {
                         content: this.parent.localeObj.getConstant('yes'), isPrimary: true,
-                        cssClass: OK_BUTTON_CLASS
+                        cssClass: OK_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : '')
                     },
                     click: this.okButtonClick.bind(this)
                 },
                 {
                     buttonModel: {
                         content: this.parent.localeObj.getConstant('no'),
-                        cssClass: CANCEL_BUTTON_CLASS
+                        cssClass: CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : '')
                     },
                     click: this.cancelButtonClick.bind(this)
                 }
@@ -36311,7 +36564,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 = {
@@ -36336,7 +36589,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);
@@ -36347,7 +36600,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);
@@ -36644,6 +36897,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) {
@@ -36674,7 +36936,7 @@ class Toolbar$2 {
             this.parent.element.appendChild(inputCheckbox);
             let checkbox = new CheckBox({
                 label: this.parent.localeObj.getConstant('multipleAxes'),
-                cssClass: 'e-multipleAxes',
+                cssClass: 'e-multipleAxes' + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                 checked: this.parent.chartSettings.enableMultipleAxis,
                 change: (args) => {
                     document.getElementById(this.parent.element.id + '_' + 'multipleAxes').click();
@@ -36706,7 +36968,7 @@ class Toolbar$2 {
             let checkbox = new CheckBox({
                 label: this.parent.localeObj.getConstant('showLegend'),
                 checked: this.getLableState(this.parent.chartSettings.chartSeries.type),
-                cssClass: 'e-showLegend',
+                cssClass: 'e-showLegend' + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
                 change: (args) => {
                     document.getElementById(this.parent.element.id + '_' + 'showLegend').click();
                 },
@@ -37078,11 +37340,11 @@ class Toolbar$2 {
             buttons: [
                 {
                     click: () => { this.chartTypeDialogUpdate(); },
-                    buttonModel: { cssClass: OK_BUTTON_CLASS, content: this.parent.localeObj.getConstant('ok'), isPrimary: true },
+                    buttonModel: { cssClass: OK_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('ok'), isPrimary: true },
                 },
                 {
                     click: () => { this.removeDialog(); },
-                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS, content: this.parent.localeObj.getConstant('cancel') }
+                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('cancel') }
                 }
             ],
             closeOnEscape: true,
@@ -37223,7 +37485,7 @@ class Toolbar$2 {
     beforeOpen() {
         let checkbox = new CheckBox({
             label: this.parent.localeObj.getConstant('multipleAxes'),
-            cssClass: 'e-dialog-multiple-axis',
+            cssClass: 'e-dialog-multiple-axis' + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
             checked: this.parent.chartSettings.enableMultipleAxis ? this.parent.chartSettings.enableMultipleAxis : false,
             change: (args) => {
                 getInstance(select('#' + this.parent.element.id + '_AxisModeOption'), DropDownList).enabled = args.checked;
@@ -37235,7 +37497,7 @@ class Toolbar$2 {
             label: this.parent.localeObj.getConstant('showLegend'),
             checked: this.getLableState(this.parent.chartSettings.chartSeries.type),
             change: () => { this.chartLableState = true; },
-            cssClass: 'e-dialog-show-legend',
+            cssClass: 'e-dialog-show-legend' + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''),
             enableRtl: this.parent.enableRtl,
             locale: this.parent.locale
         });
@@ -37368,13 +37630,13 @@ class NumberFormatting {
             buttons: [
                 {
                     click: this.updateFormatting.bind(this),
-                    buttonModel: { cssClass: OK_BUTTON_CLASS, content: this.parent.localeObj.getConstant('apply'), isPrimary: true }
+                    buttonModel: { cssClass: OK_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('apply'), isPrimary: true }
                 },
                 {
                     click: () => {
                         this.dialog.hide();
                     },
-                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS, content: this.parent.localeObj.getConstant('cancel') }
+                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('cancel') }
                 }
             ],
             closeOnEscape: true,
@@ -38037,13 +38299,13 @@ class Grouping {
             buttons: [
                 {
                     click: this.updateGroupSettings.bind(this),
-                    buttonModel: { cssClass: OK_BUTTON_CLASS, content: this.parent.localeObj.getConstant('ok'), isPrimary: true }
+                    buttonModel: { cssClass: OK_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('ok'), isPrimary: true }
                 },
                 {
                     click: () => {
                         this.groupDialog.hide();
                     },
-                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS, content: this.parent.localeObj.getConstant('cancel') }
+                    buttonModel: { cssClass: CANCEL_BUTTON_CLASS + (this.parent.cssClass ? (' ' + this.parent.cssClass) : ''), content: this.parent.localeObj.getConstant('cancel') }
                 }
             ],
             overlayClick: () => {
@@ -38111,7 +38373,8 @@ class Grouping {
                         placeholder: this.parent.localeObj.getConstant('captionName'),
                         enableRtl: this.parent.enableRtl,
                         locale: this.parent.locale,
-                        value: caption, width: '100%'
+                        value: caption, width: '100%',
+                        cssClass: this.parent.cssClass
                     });
                     captionInputObj1.isStringTemplate = true;
                     captionInputObj1.appendTo(captionInputField1);
@@ -38119,7 +38382,8 @@ class Grouping {
                         placeholder: this.parent.localeObj.getConstant('groupName'),
                         enableRtl: this.parent.enableRtl,
                         locale: this.parent.locale,
-                        width: '100%'
+                        width: '100%',
+                        cssClass: this.parent.cssClass
                     });
                     inputObj1.isStringTemplate = true;
                     inputObj1.appendTo(inputField1);
@@ -38267,7 +38531,8 @@ class Grouping {
                             format: '###',
                             value: startAt === undefined ? undefined : parseInt(startAt, 10),
                             enabled: !(startAt === undefined),
-                            width: '100%'
+                            width: '100%',
+                            cssClass: this.parent.cssClass
                         });
                         startAtInputObj.isStringTemplate = true;
                         startAtInputObj.appendTo(startAtInputField1);
@@ -38279,7 +38544,8 @@ class Grouping {
                             format: '###',
                             value: endAt === undefined ? undefined : parseInt(endAt, 10),
                             enabled: !(endAt === undefined),
-                            width: '100%'
+                            width: '100%',
+                            cssClass: this.parent.cssClass
                         });
                         endAtInputObj.isStringTemplate = true;
                         endAtInputObj.appendTo(endAtInputField1);
@@ -38291,7 +38557,8 @@ class Grouping {
                             format: '###',
                             min: 1,
                             value: selectedInterval,
-                            width: '100%'
+                            width: '100%',
+                            cssClass: this.parent.cssClass
                         });
                         intervalObj.isStringTemplate = true;
                         intervalObj.appendTo(intervalInputField1);
@@ -38301,6 +38568,7 @@ class Grouping {
                         checked: !(startAt === undefined),
                         enableRtl: this.parent.enableRtl,
                         locale: this.parent.locale,
+                        cssClass: this.parent.cssClass,
                         change: (args) => {
                             let startAtObj = (type === 'date' ?
                                 getInstance(select('#' + this.parentElement.id + 'group_start_input'), DateTimePicker) :
@@ -38316,6 +38584,7 @@ class Grouping {
                         checked: !(endAt === undefined),
                         enableRtl: this.parent.enableRtl,
                         locale: this.parent.locale,
+                        cssClass: this.parent.cssClass,
                         change: (args) => {
                             let endAtObj = (type === 'date' ?
                                 getInstance(select('#' + this.parentElement.id + 'group_end_input'), DateTimePicker) :