@syncfusion/ej2-pivotview 19.4.43 → 19.4.52

package/dist/global/index.d.ts

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

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-pivotview@*",
-  "_id": "@syncfusion/ej2-pivotview@19.4.42",
+  "_id": "@syncfusion/ej2-pivotview@19.4.50",
   "_inBundle": false,
-  "_integrity": "sha512-zqgJ6FIg3l3S9avCSMts3EKnvSyYBwgjC8eKbpwx6j0Fuw/t7c311UbT6tOgxT2Nenq5Zj2lhWmFtKWdA8Vg8Q==",
+  "_integrity": "sha512-sHeeY2dWobsRAKiI73ORWmoeheiPWIXh271bOot55Dw0GKl5OChJZSCZsU/X++L7lcn91Nlk7wTRnDwzwAA/QA==",
   "_location": "/@syncfusion/ej2-pivotview",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-pivotview",
     "/@syncfusion/ej2-vue-pivotview"
   ],
-  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-pivotview/-/ej2-pivotview-19.4.42.tgz",
-  "_shasum": "8cca2eb9992a61c1e519c06e22d977a24d37038c",
+  "_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-pivotview/-/ej2-pivotview-19.4.50.tgz",
+  "_shasum": "c33c3fca7fe2a0a550e24fb4f8bbb7a402d5d705",
   "_spec": "@syncfusion/ej2-pivotview@*",
   "_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
   "author": {
@@ -35,23 +35,23 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~19.4.42",
-    "@syncfusion/ej2-buttons": "~19.4.42",
-    "@syncfusion/ej2-calendars": "~19.4.42",
-    "@syncfusion/ej2-charts": "~19.4.43",
-    "@syncfusion/ej2-compression": "~19.4.38",
-    "@syncfusion/ej2-data": "~19.4.42",
-    "@syncfusion/ej2-dropdowns": "~19.4.42",
-    "@syncfusion/ej2-excel-export": "~19.4.38",
-    "@syncfusion/ej2-file-utils": "~19.4.38",
-    "@syncfusion/ej2-grids": "~19.4.43",
-    "@syncfusion/ej2-inputs": "~19.4.43",
-    "@syncfusion/ej2-lists": "~19.4.38",
-    "@syncfusion/ej2-navigations": "~19.4.41",
-    "@syncfusion/ej2-pdf-export": "~19.4.43",
-    "@syncfusion/ej2-popups": "~19.4.41",
-    "@syncfusion/ej2-splitbuttons": "~19.4.40",
-    "@syncfusion/ej2-svg-base": "~19.4.42"
+    "@syncfusion/ej2-base": "~19.4.52",
+    "@syncfusion/ej2-buttons": "~19.4.52",
+    "@syncfusion/ej2-calendars": "~19.4.52",
+    "@syncfusion/ej2-charts": "~19.4.52",
+    "@syncfusion/ej2-compression": "~19.4.52",
+    "@syncfusion/ej2-data": "~19.4.52",
+    "@syncfusion/ej2-dropdowns": "~19.4.52",
+    "@syncfusion/ej2-excel-export": "~19.4.52",
+    "@syncfusion/ej2-file-utils": "~19.4.52",
+    "@syncfusion/ej2-grids": "~19.4.52",
+    "@syncfusion/ej2-inputs": "~19.4.52",
+    "@syncfusion/ej2-lists": "~19.4.52",
+    "@syncfusion/ej2-navigations": "~19.4.52",
+    "@syncfusion/ej2-pdf-export": "~19.4.52",
+    "@syncfusion/ej2-popups": "~19.4.52",
+    "@syncfusion/ej2-splitbuttons": "~19.4.52",
+    "@syncfusion/ej2-svg-base": "~19.4.52"
   },
   "deprecated": false,
   "description": "The pivot grid, or pivot table, is used to visualize large sets of relational data in a cross-tabular format, similar to an Excel pivot table.",
@@ -78,6 +78,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "19.4.43",
+  "version": "19.4.52",
   "sideEffects": false
 }

package/src/base/engine.js

@@ -3448,10 +3448,11 @@ var PivotEngine = /** @class */ (function () {
                         (level > this.measureIndex && row.axis === 'row' && row.valueSort.axis)) {
                         var vln = 0;
                         var isValueIndexFound = false;
+                        var rowUniqueName = row.valueSort.uniqueName ? row.valueSort.uniqueName.toString().split(this.valueSortSettings.headerDelimiter) : [];
                         for (var cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
                             if (!isValueIndexFound) {
                                 for (vln = 0; vln < vlt; vln++) {
-                                    if (row.valueSort.uniqueName && row.valueSort.uniqueName.toString().indexOf(this.values[vln].name) > -1) {
+                                    if (rowUniqueName.indexOf(this.values[vln].name) > -1) {
                                         isValueIndexFound = true;
                                         isValueCellUpdated = true;
                                         break;
@@ -3484,9 +3485,10 @@ var PivotEngine = /** @class */ (function () {
                 }
                 else {
                     for (var cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
+                        var columnUniqueName = columns[cln].valueSort.uniqueName ? columns[cln].valueSort.uniqueName.toString().split(this.valueSortSettings.headerDelimiter) : [];
                         for (var vln = 0; vln < vlt; vln++) {
                             if (!this.valueAxis && !this.isLastHeaderHasMeasures) {
-                                if (columns[cln].valueSort.uniqueName && columns[cln].valueSort.uniqueName.toString().indexOf(this.values[vln].name) > -1) {
+                                if (columnUniqueName.indexOf(this.values[vln].name) > -1) {
                                     this.updateRowData(rows, columns, tnum, data, vln, rln, cln, dln, actCnt, rTotal, cTotal);
                                     dln = data[tnum].length;
                                 }

package/src/common/actions/dataSource-update.d.ts

@@ -28,7 +28,7 @@ export declare class DataSourceUpdate {
      * @returns {void}
      * @hidden
      */
-    updateDataSource(fieldName: string, droppedClass: string, droppedPosition: number): void;
+    updateDataSource(fieldName: string, droppedClass: string, droppedPosition: number): boolean;
     /**
      * Updates the dataSource by removing the given field from the dataSource.
      * @param  {string} fieldName - Defines dropped field name to remove dataSource.

package/src/common/actions/dataSource-update.js

@@ -28,6 +28,7 @@ var DataSourceUpdate = /** @class */ (function () {
         var dataSourceItem;
         var draggedClass;
         var draggedPosition = -1;
+        var nodeDropped = true;
         var row = this.parent.dataSourceSettings.rows;
         var column = this.parent.dataSourceSettings.columns;
         var value = this.parent.dataSourceSettings.values;
@@ -154,7 +155,11 @@ var DataSourceUpdate = /** @class */ (function () {
                     });
                 }
             }
+            else {
+                nodeDropped = false;
+            }
         });
+        return nodeDropped;
     };
     /**
      * Updates the dataSource by removing the given field from the dataSource.

package/src/common/actions/node-state-modified.js

@@ -108,7 +108,7 @@ var NodeStateModified = /** @class */ (function () {
                 this.parent.engineModule.updateFieldlistData(fieldName);
             }
         }
-        this.parent.dataSourceUpdate.updateDataSource(fieldName, droppedClass, droppedPosition);
+        nodeDropped = this.parent.dataSourceUpdate.updateDataSource(fieldName, droppedClass, droppedPosition);
         return nodeDropped;
     };
     NodeStateModified.prototype.getButtonPosition = function (target, droppedClass) {

package/src/common/grouping-bar/grouping-bar.js

@@ -464,7 +464,7 @@ var GroupingBar = /** @class */ (function () {
     };
     GroupingBar.prototype.dropIndicatorUpdate = function (e) {
         if ((this.parent.isDragging && e.target.classList.contains(cls.DROPPABLE_CLASS) && e.type === 'mouseover') ||
-            e.type === 'mouseleave') {
+            (!this.parent.isDragging || (!e.target.classList.contains(cls.DROPPABLE_CLASS) && e.type === 'mouseleave'))) {
             removeClass([].slice.call(this.parent.element.querySelectorAll('.' + cls.DROP_INDICATOR_CLASS)), cls.INDICATOR_HOVER_CLASS);
             removeClass([].slice.call(this.parent.element.querySelectorAll('.' + cls.DROP_INDICATOR_CLASS + '-last')), cls.INDICATOR_HOVER_CLASS);
         }

package/src/common/popups/toolbar.js

@@ -1036,6 +1036,7 @@ var Toolbar = /** @class */ (function () {
         }
     };
     Toolbar.prototype.multipleAxesCheckbox = function (args) {
+        var _this_1 = this;
         if (this.parent.element.id + '_' + 'multipleAxes' === args.element.id) {
             var inputCheckbox = createElement('input', {
                 id: this.parent.element.id + '_' + 'checkBox'
@@ -1046,6 +1047,9 @@ var Toolbar = /** @class */ (function () {
                 label: this.parent.localeObj.getConstant('multipleAxes'),
                 cssClass: 'e-multipleAxes',
                 checked: this.parent.chartSettings.enableMultipleAxis,
+                change: function (args) {
+                    document.getElementById(_this_1.parent.element.id + '_' + 'multipleAxes').click();
+                },
                 enableRtl: this.parent.enableRtl,
                 locale: this.parent.locale
             });
@@ -1074,6 +1078,9 @@ var Toolbar = /** @class */ (function () {
                 label: this.parent.localeObj.getConstant('showLegend'),
                 checked: this.getLableState(this.parent.chartSettings.chartSeries.type),
                 cssClass: 'e-showLegend',
+                change: function (args) {
+                    document.getElementById(_this_1.parent.element.id + '_' + 'showLegend').click();
+                },
                 enableRtl: this.parent.enableRtl,
                 locale: this.parent.locale
             });

package/src/pivotchart/base/pivotchart.js

@@ -1623,7 +1623,7 @@ var PivotChart = /** @class */ (function () {
         if (this.parent && this.parent.isDestroyed) {
             return;
         }
-        if (this.engineModule) {
+        if (this.engineModule && !this.parent.destroyEngine) {
             this.engineModule.fieldList = {};
             this.engineModule = {};
         }

package/src/pivotfieldlist/base/field-list.d.ts

@@ -111,6 +111,8 @@ export declare class PivotFieldList extends Component<HTMLElement> implements IN
     private remoteData;
     /** @hidden */
     actionObj: PivotActionCompleteEventArgs;
+    /** @hidden */
+    destroyEngine: boolean;
     /**
      * Allows the following pivot report information such as rows, columns, values, filters, etc., that are used to render the pivot table and field list.
      * * `catalog`: Allows to set the database name of SSAS cube as string type that used to retrieve the data from the specified connection string. **Note: It is applicable only for OLAP data source.**

package/src/pivotfieldlist/base/field-list.js

@@ -68,6 +68,8 @@ var PivotFieldList = /** @class */ (function (_super) {
         _this.remoteData = [];
         /** @hidden */
         _this.actionObj = {};
+        /** @hidden */
+        _this.destroyEngine = false;
         return _this;
     }
     /**
@@ -1158,7 +1160,7 @@ var PivotFieldList = /** @class */ (function (_super) {
      */
     PivotFieldList.prototype.destroy = function () {
         this.unWireEvent();
-        if (this.engineModule) {
+        if (this.engineModule && !this.destroyEngine) {
             this.engineModule.fieldList = {};
             this.engineModule.rMembers = null;
             this.engineModule.cMembers = null;
@@ -1166,7 +1168,7 @@ var PivotFieldList = /** @class */ (function (_super) {
             this.engineModule.indexMatrix = null;
             this.engineModule = {};
         }
-        if (this.olapEngineModule) {
+        if (this.olapEngineModule && !this.destroyEngine) {
             this.olapEngineModule.fieldList = {};
             this.olapEngineModule = {};
         }

package/src/pivotfieldlist/renderer/axis-table-renderer.js

@@ -110,7 +110,7 @@ var AxisTableRenderer = /** @class */ (function () {
                 addClass([element[element.length - 1].querySelector('.' + cls.DROP_INDICATOR_CLASS + '-last')], cls.INDICATOR_HOVER_CLASS);
             }
         }
-        else if (e.type === 'mouseleave') {
+        else if (!this.parent.isDragging || (!e.target.classList.contains(cls.DROPPABLE_CLASS) && e.type === 'mouseleave')) {
             removeClass([].slice.call(parentElement.querySelectorAll('.' + cls.DROP_INDICATOR_CLASS)), cls.INDICATOR_HOVER_CLASS);
             removeClass([].slice.call(parentElement.querySelectorAll('.' + cls.DROP_INDICATOR_CLASS + '-last')), cls.INDICATOR_HOVER_CLASS);
         }

package/src/pivotfieldlist/renderer/tree-renderer.js

@@ -456,6 +456,9 @@ var TreeViewRenderer = /** @class */ (function () {
     };
     TreeViewRenderer.prototype.nodeStateChange = function (args) {
         var _this = this;
+        if (!args.isInteracted) {
+            return;
+        }
         var node = closest(args.node, '.' + cls.TEXT_CONTENT_CLASS);
         if (!isNullOrUndefined(node)) {
             var li_1 = closest(node, 'li');
@@ -487,7 +490,7 @@ var TreeViewRenderer = /** @class */ (function () {
                         _this.updateNodeStateChange(id_1, args, selectedNode_1);
                     }
                     else {
-                        _this.updateCheckState(selectedNode_1);
+                        _this.updateCheckState(selectedNode_1, args.action);
                     }
                 });
             }
@@ -514,7 +517,7 @@ var TreeViewRenderer = /** @class */ (function () {
                         _this.updateNodeStateChange(id_1, args, selectedNode_1);
                     }
                     else {
-                        _this.updateCheckState(selectedNode_1);
+                        _this.updateCheckState(selectedNode_1, args.action);
                     }
                 });
             }
@@ -571,19 +574,17 @@ var TreeViewRenderer = /** @class */ (function () {
                 break;
         }
     };
-    TreeViewRenderer.prototype.updateCheckState = function (selectedNode) {
+    TreeViewRenderer.prototype.updateCheckState = function (selectedNode, action) {
         var chkState = this.fieldTable.element.querySelectorAll('.e-checkbox-wrapper');
         var innerText = this.fieldTable.element.querySelectorAll('.e-list-text');
         var checkClass = this.fieldTable.element.querySelectorAll('.e-frame');
         for (var i = 0; i < chkState.length; i++) {
             if (selectedNode.caption === innerText[i].textContent) {
-                if (chkState[i].getAttribute('aria-checked') === 'false') {
-                    chkState[i].setAttribute('aria-checked', 'false');
-                    checkClass[i].classList.add(cls.NODE_CHECK_CLASS);
+                if (action === 'check') {
+                    this.fieldTable.uncheckAll([selectedNode['id']]);
                 }
                 else {
-                    chkState[i].setAttribute('aria-checked', 'true');
-                    checkClass[i].classList.remove(cls.NODE_CHECK_CLASS);
+                    this.fieldTable.checkAll([selectedNode['id']]);
                 }
             }
         }
@@ -634,6 +635,9 @@ var TreeViewRenderer = /** @class */ (function () {
     };
     TreeViewRenderer.prototype.addNode = function (args) {
         var _this = this;
+        if (!args.isInteracted) {
+            return;
+        }
         /* eslint-disable */
         var fieldList = this.parent.pivotFieldList;
         var selectedNode = fieldList[args.data[0].id.toString()];
@@ -641,17 +645,18 @@ var TreeViewRenderer = /** @class */ (function () {
         var fieldInfo = PivotUtil.getFieldInfo(selectedNode.id.toString(), this.parent);
         var control = this.parent.isPopupView ? this.parent.pivotGridModule : this.parent;
         if (args.action === 'check') {
+            var axis = ['filters', 'columns', 'rows', 'values'];
             var eventdrop = {
                 fieldName: fieldInfo.fieldName, dropField: fieldInfo.fieldItem,
                 dataSourceSettings: PivotUtil.getClonedDataSourceSettings(this.parent.dataSourceSettings),
-                dropAxis: 'rows', draggedAxis: 'fieldlist', cancel: false
+                dropAxis: axis[this.parent.dialogRenderer.adaptiveElement.selectedItem], draggedAxis: 'fieldlist', cancel: false
             };
             control.trigger(events.fieldDrop, eventdrop, function (observedArgs) {
                 if (!observedArgs.cancel) {
                     _this.selectedNodes.push(selectedNode.id.toString());
                 }
                 else {
-                    _this.updateCheckState(selectedNode);
+                    _this.updateCheckState(selectedNode, args.action);
                 }
             });
         }
@@ -672,7 +677,7 @@ var TreeViewRenderer = /** @class */ (function () {
                     }
                 }
                 else {
-                    _this.updateCheckState(selectedNode);
+                    _this.updateCheckState(selectedNode, args.action);
                 }
             });
         }

package/src/pivotview/actions/excel-export.js

@@ -124,7 +124,6 @@ var ExcelExport = /** @class */ (function () {
                                 this.engine.tupRowInfo[pivotCell.rowOrdinal].measureName :
                                 pivotCell.actualText;
                             var styles = (pivotCell.axis == 'row') ? { hAlign: 'Left', bold: true, wrapText: true } : { numberFormat: formatList[field], bold: false, wrapText: true };
-                            var pivotCells = currentPivotValues[rCnt][cCnt];
                             var headerStyle = { bold: true, vAlign: 'Center', wrapText: true, indent: cCnt === 0 ? pivotCell.level * 10 : 0 };
                             if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
                                 var cellValue = pivotCell.axis === 'value' ? pivotCell.value : pivotCell.formattedText;
@@ -174,8 +173,8 @@ var ExcelExport = /** @class */ (function () {
                                             }
                                         }
                                     }
-                                    if (pivotCell.style || lastCell.style.backgroundColor || lastCell.style.fontColor || lastCell.style.fontName || lastCell.style.fontSize) {
-                                        lastCell.style.backgroundColor = lastCell.style.backgroundColor ? lastCell.style.backgroundColor : pivotCell.style.backgroundColor;
+                                    if (pivotCell.style || lastCell.style.backColor || lastCell.style.backgroundColor || lastCell.style.fontColor || lastCell.style.fontName || lastCell.style.fontSize) {
+                                        lastCell.style.backColor = lastCell.style.backgroundColor ? lastCell.style.backgroundColor : pivotCell.style.backgroundColor;
                                         lastCell.style.fontColor = lastCell.style.fontColor ? lastCell.style.fontColor : pivotCell.style.color;
                                         lastCell.style.fontName = lastCell.style.fontName ? lastCell.style.fontName : pivotCell.style.fontFamily;
                                         lastCell.style.fontSize = lastCell.style.fontSize ? Number(lastCell.style.fontSize) : Number(pivotCell.style.fontSize.split('px')[0]);
@@ -186,14 +185,14 @@ var ExcelExport = /** @class */ (function () {
                                     if (pivotCell.axis === 'column') {
                                         excelHeaderQueryCellInfoArgs = {
                                             style: headerStyle,
-                                            cell: pivotCells,
+                                            cell: pivotCell,
                                         };
                                         this.parent.trigger(events.excelHeaderQueryCellInfo, excelHeaderQueryCellInfoArgs);
                                     }
                                     else {
                                         excelQueryCellInfoArgs = {
                                             style: styles,
-                                            cell: pivotCells,
+                                            cell: pivotCell,
                                             column: undefined,
                                             data: pivotValues,
                                             value: cellValue

package/src/pivotview/base/pivotview.d.ts

@@ -1359,6 +1359,8 @@ export declare class PivotView extends Component<HTMLElement> implements INotify
      * @event
      */
     actionFailure: EmitType<PivotActionFailureEventArgs>;
+    /** @hidden */
+    destroyEngine: boolean;
     /**
      * Constructor for creating the widget
      * @param  {PivotViewModel} options - options.

package/src/pivotview/base/pivotview.js

@@ -315,6 +315,8 @@ var PivotView = /** @class */ (function (_super) {
         _this_1.isServerWaitingPopup = false;
         /** @hidden */
         _this_1.actionObj = {};
+        /** @hidden */
+        _this_1.destroyEngine = false;
         _this_1.pivotView = _this_1;
         setValue('mergePersistData', _this_1.mergePersistPivotData, _this_1);
         return _this_1;
@@ -891,13 +893,10 @@ var PivotView = /** @class */ (function (_super) {
         this.headerCellInfo = this.gridSettings.headerCellInfo ? this.gridSettings.headerCellInfo.bind(this) : undefined;
         this.resizing = this.gridSettings.resizing ? this.gridSettings.resizing.bind(this) : undefined;
         this.resizeStop = this.gridSettings.resizeStop ? this.gridSettings.resizeStop.bind(this) : undefined;
-        this.pdfHeaderQueryCellInfo = this.gridSettings.pdfHeaderQueryCellInfo ?
-            this.gridSettings.pdfHeaderQueryCellInfo.bind(this) : undefined;
-        this.pdfQueryCellInfo = this.gridSettings.pdfQueryCellInfo ? this.gridSettings.pdfQueryCellInfo.bind(this) : undefined;
-        this.excelHeaderQueryCellInfo = this.gridSettings.excelHeaderQueryCellInfo ?
-            this.gridSettings.excelHeaderQueryCellInfo.bind(this) : undefined;
-        this.excelQueryCellInfo = this.gridSettings.excelQueryCellInfo ?
-            this.gridSettings.excelQueryCellInfo.bind(this) : undefined;
+        this.pdfHeaderQueryCellInfo = this.gridSettings.pdfHeaderQueryCellInfo ? this.gridSettings.pdfHeaderQueryCellInfo : undefined;
+        this.pdfQueryCellInfo = this.gridSettings.pdfQueryCellInfo ? this.gridSettings.pdfQueryCellInfo : undefined;
+        this.excelHeaderQueryCellInfo = this.gridSettings.excelHeaderQueryCellInfo ? this.gridSettings.excelHeaderQueryCellInfo : undefined;
+        this.excelQueryCellInfo = this.gridSettings.excelQueryCellInfo ? this.gridSettings.excelQueryCellInfo : undefined;
         this.columnDragStart = this.gridSettings.columnDragStart ? this.gridSettings.columnDragStart.bind(this) : undefined;
         this.columnDrag = this.gridSettings.columnDrag ? this.gridSettings.columnDrag.bind(this) : undefined;
         this.columnDrop = this.gridSettings.columnDrop ? this.gridSettings.columnDrop.bind(this) : undefined;
@@ -1267,6 +1266,10 @@ var PivotView = /** @class */ (function (_super) {
         var keyEntity = ['dataSourceSettings', 'pivotValues', 'gridSettings', 'chartSettings', 'displayOption'];
         /* eslint-disable */
         var columnRender = this.gridSettings['columnRender'];
+        var excelQueryCellInfo = this.gridSettings['excelQueryCellInfo'];
+        var excelHeaderQueryCellInfo = this.gridSettings['excelHeaderQueryCellInfo'];
+        var pdfQueryCellInfo = this.gridSettings['pdfQueryCellInfo'];
+        var pdfHeaderQueryCellInfo = this.gridSettings['pdfHeaderQueryCellInfo'];
         var chartLoadEvent = this.chartSettings['load'];
         var chartLoadedEvent = this.chartSettings['loaded'];
         var chartTextRenderEvent = this.chartSettings['textRender'];
@@ -1276,6 +1279,10 @@ var PivotView = /** @class */ (function (_super) {
         var chartPointClickEvent = this.chartSettings['pointClick'];
         var chartTooltipRenderEvent = this.chartSettings['tooltipRender'];
         this.gridSettings['columnRender'] = undefined;
+        this.gridSettings['excelQueryCellInfo'] = undefined;
+        this.gridSettings['excelHeaderQueryCellInfo'] = undefined;
+        this.gridSettings['pdfQueryCellInfo'] = undefined;
+        this.gridSettings['pdfHeaderQueryCellInfo'] = undefined;
         this.chartSettings['tooltipRender'] = undefined;
         this.chartSettings['load'] = undefined;
         this.chartSettings['loaded'] = undefined;
@@ -1286,6 +1293,10 @@ var PivotView = /** @class */ (function (_super) {
         this.chartSettings['pointClick'] = undefined;
         var persistData = this.addOnPersist(keyEntity);
         this.gridSettings['columnRender'] = columnRender;
+        this.gridSettings['excelQueryCellInfo'] = excelQueryCellInfo;
+        this.gridSettings['excelHeaderQueryCellInfo'] = excelHeaderQueryCellInfo;
+        this.gridSettings['pdfQueryCellInfo'] = pdfQueryCellInfo;
+        this.gridSettings['pdfHeaderQueryCellInfo'] = pdfHeaderQueryCellInfo;
         this.chartSettings['load'] = chartLoadEvent;
         this.chartSettings['loaded'] = chartLoadedEvent;
         this.chartSettings['textRender'] = chartTextRenderEvent;
@@ -1466,24 +1477,37 @@ var PivotView = /** @class */ (function (_super) {
                             this.displayOption.primary : newProp.displayOption.view);
                         if (this.showGroupingBar || this.showFieldList) {
                             if (this.showFieldList && this.pivotFieldListModule) {
+                                this.pivotFieldListModule.destroyEngine = true;
                                 this.pivotFieldListModule.destroy();
+                                this.pivotFieldListModule.destroyEngine = false;
                             }
-                            if (this.showGroupingBar && this.groupingBarModule) {
-                                this.groupingBarModule.destroy();
-                            }
+                            /**
+                             * Below lines are affected the grouping bar render between table and chart.
+                             * In "Init subcomponent" function, grouping bar rendered properly for table and chart view.
+                             * So, The below lines are commanded out.
+                             */
+                            // if (this.showGroupingBar && this.groupingBarModule) {
+                            //     this.groupingBarModule.destroy();
+                            // }
                             this.notify(events.initSubComponent, this);
                         }
                         if (!this.grid && newProp.displayOption.view !== 'Chart') {
                             this.renderEmptyGrid();
                             if (newProp.displayOption.view === 'Table') {
                                 if (this.pivotChartModule) {
+                                    this.destroyEngine = true;
                                     this.pivotChartModule.destroy();
+                                    this.destroyEngine = false;
                                     this.chart = undefined;
                                     this.pivotChartModule = undefined;
                                 }
                             }
                         }
                         else if (!this.pivotChartModule && this.displayOption.view !== 'Table') {
+                            if (this.grid) {
+                                this.grid.destroy();
+                                this.grid = undefined;
+                            }
                             this.pivotChartModule = new PivotChart();
                         }
                     }
@@ -2489,12 +2513,12 @@ var PivotView = /** @class */ (function (_super) {
         var hasField = false;
         if (cell && this.dataType === 'olap') {
             var measureName = cell.actualText;
-            if (!isNullOrUndefined(measureName) && !this.olapEngineModule.fieldList[measureName]) {
+            if (!isNullOrUndefined(measureName) && this.olapEngineModule.fieldList && !this.olapEngineModule.fieldList[measureName]) {
                 var tupleInfo = this.olapEngineModule.tupRowInfo;
                 measureName = cell.rowOrdinal > -1 && tupleInfo.length > 0 && tupleInfo[cell.rowOrdinal] &&
                     !isNullOrUndefined(tupleInfo[cell.rowOrdinal].measureName) ? tupleInfo[cell.rowOrdinal].measureName : measureName;
             }
-            if (this.olapEngineModule.fieldList[measureName]) {
+            if (this.olapEngineModule.fieldList && this.olapEngineModule.fieldList[measureName]) {
                 var field = this.olapEngineModule.fieldList[measureName];
                 aggregateType = field.isCalculatedField ? field.type : field.aggregateType;
                 caption = (this.olapEngineModule.dataFields[measureName] &&
@@ -2504,7 +2528,7 @@ var PivotView = /** @class */ (function (_super) {
             }
         }
         else {
-            if (cell && this.engineModule.fieldList[cell.actualText]) {
+            if (cell && this.engineModule.fieldList && this.engineModule.fieldList[cell.actualText]) {
                 var field = this.engineModule.fieldList[cell.actualText];
                 aggregateType = field.aggregateType;
                 if ((aggregateType !== 'DistinctCount') && (field.type !== 'number' || field.type === 'include' ||