@syncfusion/ej2-pivotview 19.4.42 → 19.4.50

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

@@ -4123,10 +4123,11 @@ class PivotEngine {
                         (level > this.measureIndex && row.axis === 'row' && row.valueSort.axis)) {
                         let vln = 0;
                         let isValueIndexFound = false;
+                        let rowUniqueName = row.valueSort.uniqueName ? row.valueSort.uniqueName.toString().split(this.valueSortSettings.headerDelimiter) : [];
                         for (let 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;
@@ -4159,9 +4160,10 @@ class PivotEngine {
                 }
                 else {
                     for (let cln = 0, dln = 1, clt = columns.length; cln < clt; ++cln) {
+                        let columnUniqueName = columns[cln].valueSort.uniqueName ? columns[cln].valueSort.uniqueName.toString().split(this.valueSortSettings.headerDelimiter) : [];
                         for (let 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;
                                 }
@@ -9939,7 +9941,7 @@ class NodeStateModified {
                 this.parent.engineModule.updateFieldlistData(fieldName);
             }
         }
-        this.parent.dataSourceUpdate.updateDataSource(fieldName, droppedClass, droppedPosition);
+        nodeDropped = this.parent.dataSourceUpdate.updateDataSource(fieldName, droppedClass, droppedPosition);
         return nodeDropped;
     }
     getButtonPosition(target, droppedClass) {
@@ -9986,6 +9988,7 @@ class DataSourceUpdate {
         let dataSourceItem;
         let draggedClass;
         let draggedPosition = -1;
+        let nodeDropped = true;
         let row = this.parent.dataSourceSettings.rows;
         let column = this.parent.dataSourceSettings.columns;
         let value = this.parent.dataSourceSettings.values;
@@ -10112,7 +10115,11 @@ class DataSourceUpdate {
                     });
                 }
             }
+            else {
+                nodeDropped = false;
+            }
         });
+        return nodeDropped;
     }
     /**
      * Updates the dataSource by removing the given field from the dataSource.
@@ -12863,7 +12870,7 @@ class VirtualScroll$1 {
                 let ele = this.parent.isAdaptive ? mCont : mCont.parentElement.parentElement.querySelector('.' + MOVABLESCROLL_DIV);
                 EventHandler.add(ele, 'scroll touchmove pointermove', this.onHorizondalScroll(mHdr, mCont, fCont), this);
                 EventHandler.add(mCont.parentElement, 'scroll wheel touchmove pointermove keyup keydown', this.onVerticalScroll(fCont, mCont), this);
-                EventHandler.add(mCont.parentElement.parentElement, 'mouseup touchend', this.common(mHdr, mCont, fCont), this);
+                EventHandler.add(mCont, 'mouseup touchend scroll', this.common(mHdr, mCont, fCont), this);
                 EventHandler.add(mScrollBar, 'scroll', this.onCustomScrollbarScroll(mCont, mHdr), this);
                 EventHandler.add(mCont, 'scroll', this.onCustomScrollbarScroll(mScrollBar, mHdr), this);
                 EventHandler.add(mHdr, 'scroll', this.onCustomScrollbarScroll(mScrollBar, mCont), this);
@@ -15609,7 +15616,7 @@ class PivotChart {
         if (this.parent && this.parent.isDestroyed) {
             return;
         }
-        if (this.engineModule) {
+        if (this.engineModule && !this.parent.destroyEngine) {
             this.engineModule.fieldList = {};
             this.engineModule = {};
         }
@@ -21853,6 +21860,8 @@ let PivotView = class PivotView extends Component {
         this.isServerWaitingPopup = false;
         /** @hidden */
         this.actionObj = {};
+        /** @hidden */
+        this.destroyEngine = false;
         this.pivotView = this;
         setValue('mergePersistData', this.mergePersistPivotData, this);
     }
@@ -22801,6 +22810,10 @@ let PivotView = class PivotView extends Component {
         let keyEntity = ['dataSourceSettings', 'pivotValues', 'gridSettings', 'chartSettings', 'displayOption'];
         /* eslint-disable */
         let columnRender = this.gridSettings['columnRender'];
+        let excelQueryCellInfo$$1 = this.gridSettings['excelQueryCellInfo'];
+        let excelHeaderQueryCellInfo$$1 = this.gridSettings['excelHeaderQueryCellInfo'];
+        let pdfQueryCellInfo$$1 = this.gridSettings['pdfQueryCellInfo'];
+        let pdfHeaderQueryCellInfo$$1 = this.gridSettings['pdfHeaderQueryCellInfo'];
         let chartLoadEvent = this.chartSettings['load'];
         let chartLoadedEvent = this.chartSettings['loaded'];
         let chartTextRenderEvent = this.chartSettings['textRender'];
@@ -22810,6 +22823,10 @@ let PivotView = class PivotView extends Component {
         let chartPointClickEvent = this.chartSettings['pointClick'];
         let 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;
@@ -22820,6 +22837,10 @@ let PivotView = class PivotView extends Component {
         this.chartSettings['pointClick'] = undefined;
         let persistData = this.addOnPersist(keyEntity);
         this.gridSettings['columnRender'] = columnRender;
+        this.gridSettings['excelQueryCellInfo'] = excelQueryCellInfo$$1;
+        this.gridSettings['excelHeaderQueryCellInfo'] = excelHeaderQueryCellInfo$$1;
+        this.gridSettings['pdfQueryCellInfo'] = pdfQueryCellInfo$$1;
+        this.gridSettings['pdfHeaderQueryCellInfo'] = pdfHeaderQueryCellInfo$$1;
         this.chartSettings['load'] = chartLoadEvent;
         this.chartSettings['loaded'] = chartLoadedEvent;
         this.chartSettings['textRender'] = chartTextRenderEvent;
@@ -22999,24 +23020,37 @@ let PivotView = class PivotView extends Component {
                             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(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();
                         }
                     }
@@ -24014,12 +24048,12 @@ let PivotView = class PivotView extends Component {
         let hasField = false;
         if (cell && this.dataType === 'olap') {
             let measureName = cell.actualText;
-            if (!isNullOrUndefined(measureName) && !this.olapEngineModule.fieldList[measureName]) {
+            if (!isNullOrUndefined(measureName) && this.olapEngineModule.fieldList && !this.olapEngineModule.fieldList[measureName]) {
                 let 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]) {
                 let field = this.olapEngineModule.fieldList[measureName];
                 aggregateType = field.isCalculatedField ? field.type : field.aggregateType;
                 caption = (this.olapEngineModule.dataFields[measureName] &&
@@ -24029,7 +24063,7 @@ let PivotView = class PivotView extends Component {
             }
         }
         else {
-            if (cell && this.engineModule.fieldList[cell.actualText]) {
+            if (cell && this.engineModule.fieldList && this.engineModule.fieldList[cell.actualText]) {
                 let field = this.engineModule.fieldList[cell.actualText];
                 aggregateType = field.aggregateType;
                 if ((aggregateType !== 'DistinctCount') && (field.type !== 'number' || field.type === 'include' ||
@@ -26331,6 +26365,13 @@ class ExcelExport$1 {
                     for (let cCnt = 0; cCnt < colLen; cCnt++) {
                         if (pivotValues[rCnt][cCnt]) {
                             let pivotCell = pivotValues[rCnt][cCnt];
+                            let field = (this.parent.dataSourceSettings.valueAxis === 'row' &&
+                                this.parent.dataType === 'olap' && pivotCell.rowOrdinal &&
+                                this.engine.tupRowInfo[pivotCell.rowOrdinal]) ?
+                                this.engine.tupRowInfo[pivotCell.rowOrdinal].measureName :
+                                pivotCell.actualText;
+                            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 isgetValuesHeader = ((this.parent.dataSourceSettings.rows.length === 0 && this.parent.dataSourceSettings.valueAxis === 'row')
@@ -26350,33 +26391,21 @@ class ExcelExport$1 {
                                         index: cCnt + 1, value: cellValue,
                                         colSpan: pivotCell.colSpan, rowSpan: (pivotCell.rowSpan === -1 ? 1 : pivotCell.rowSpan),
                                     });
+                                    let lastCell = cells[cells.length - 1];
                                     if (pivotCell.axis === 'value') {
                                         if (isNaN(pivotCell.value) || pivotCell.formattedText === '' ||
                                             pivotCell.formattedText === undefined || isNullOrUndefined(pivotCell.value)) {
-                                            cells[cells.length - 1].value = type === 'Excel' ? null : '';
-                                        }
-                                        let field = (this.parent.dataSourceSettings.valueAxis === 'row' &&
-                                            this.parent.dataType === 'olap' && pivotCell.rowOrdinal &&
-                                            this.engine.tupRowInfo[pivotCell.rowOrdinal]) ?
-                                            this.engine.tupRowInfo[pivotCell.rowOrdinal].measureName :
-                                            pivotCell.actualText;
-                                        cells[cells.length - 1].style = !isNullOrUndefined(cells[cells.length - 1].value) ? { numberFormat: formatList[field], bold: false, wrapText: true } : { bold: false, wrapText: true };
-                                        if (pivotCell.style) {
-                                            cells[cells.length - 1].style.backColor = pivotCell.style.backgroundColor;
-                                            cells[cells.length - 1].style.fontColor = pivotCell.style.color;
-                                            cells[cells.length - 1].style.fontName = pivotCell.style.fontFamily;
-                                            cells[cells.length - 1].style.fontSize = Number(pivotCell.style.fontSize.split('px')[0]);
+                                            lastCell.value = type === 'Excel' ? null : '';
                                         }
+                                        lastCell.style = !isNullOrUndefined(lastCell.value) ? styles : { bold: false, wrapText: true };
                                     }
                                     else {
-                                        cells[cells.length - 1].style = {
-                                            bold: true, vAlign: 'Center', wrapText: true, indent: cCnt === 0 ? pivotCell.level * 10 : 0
-                                        };
+                                        lastCell.style = headerStyle;
                                         if (pivotCell.axis === 'row' && cCnt === 0) {
-                                            cells[cells.length - 1].style.hAlign = 'Left';
+                                            lastCell.style = styles;
                                             if (this.parent.dataType === 'olap') {
                                                 let indent = this.parent.renderModule.indentCollection[rCnt];
-                                                cells[cells.length - 1].style.indent = indent * 2;
+                                                lastCell.style.indent = indent * 2;
                                                 maxLevel = maxLevel > indent ? maxLevel : indent;
                                             }
                                             else {
@@ -26386,19 +26415,55 @@ class ExcelExport$1 {
                                                 let levelPosition = levelName.split(this.parent.dataSourceSettings.valueSortSettings.headerDelimiter).length -
                                                     (memberPos ? memberPos - 1 : memberPos);
                                                 let level = levelPosition ? (levelPosition - 1) : 0;
-                                                cells[cells.length - 1].style.indent = level * 2;
+                                                lastCell.style.indent = level * 2;
                                                 maxLevel = level > maxLevel ? level : maxLevel;
                                             }
                                         }
                                     }
-                                    cells[cells.length - 1].style.borders = { color: '#000000', lineStyle: 'Thin' };
+                                    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]);
+                                    }
+                                    lastCell.style.borders = { color: '#000000', lineStyle: 'Thin' };
+                                    let excelHeaderQueryCellInfoArgs;
+                                    let excelQueryCellInfoArgs;
+                                    if (pivotCell.axis === 'column') {
+                                        excelHeaderQueryCellInfoArgs = {
+                                            style: headerStyle,
+                                            cell: pivotCell,
+                                        };
+                                        this.parent.trigger(excelHeaderQueryCellInfo, excelHeaderQueryCellInfoArgs);
+                                    }
+                                    else {
+                                        excelQueryCellInfoArgs = {
+                                            style: styles,
+                                            cell: pivotCell,
+                                            column: undefined,
+                                            data: pivotValues,
+                                            value: cellValue
+                                        };
+                                        this.parent.trigger(excelQueryCellInfo, excelQueryCellInfoArgs);
+                                    }
+                                    lastCell.value = (pivotCell.axis == 'column') ? excelHeaderQueryCellInfoArgs.cell.formattedText : excelQueryCellInfoArgs.value;
+                                    lastCell.style = (pivotCell.axis == 'column') ? excelHeaderQueryCellInfoArgs.style : excelQueryCellInfoArgs.style;
                                 }
                             }
                             cCnt = cCnt + (pivotCell.colSpan ? (pivotCell.colSpan - 1) : 0);
                         }
                         else {
+                            let pivotCell = { formattedText: "" };
+                            let excelHeaderQueryCellInfoArgs;
+                            if (pivotCell) {
+                                excelHeaderQueryCellInfoArgs = {
+                                    style: undefined,
+                                    cell: pivotCell,
+                                };
+                                this.parent.trigger(excelHeaderQueryCellInfo, excelHeaderQueryCellInfoArgs);
+                            }
                             cells.push({
-                                index: cCnt + 1, value: '', colSpan: 1, rowSpan: 1,
+                                index: cCnt + 1, colSpan: 1, rowSpan: 1, value: pivotCell.formattedText, style: excelHeaderQueryCellInfoArgs.style
                             });
                         }
                     }
@@ -26665,12 +26730,12 @@ class PDFExport {
                             let isValueCell = false;
                             if (pivotValues[rCnt][cCnt]) {
                                 let pivotCell = pivotValues[rCnt][cCnt];
+                                let cellValue = pivotCell.formattedText;
+                                cellValue = (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'value') : cellValue;
+                                cellValue = pivotCell.type === 'grand sum' ? (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'grandTotal') :
+                                    this.parent.localeObj.getConstant('grandTotal') : (pivotCell.type === 'sum' ?
+                                    cellValue.toString().replace('Total', this.parent.localeObj.getConstant('total')) : cellValue);
                                 if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
-                                    let cellValue = pivotCell.formattedText;
-                                    cellValue = (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'value') : cellValue;
-                                    cellValue = pivotCell.type === 'grand sum' ? (this.parent.dataSourceSettings.rows.length === 0 || this.parent.dataSourceSettings.columns.length === 0) ? this.parent.getValuesHeader(pivotCell, 'grandTotal') :
-                                        this.parent.localeObj.getConstant('grandTotal') : (pivotCell.type === 'sum' ?
-                                        cellValue.toString().replace('Total', this.parent.localeObj.getConstant('total')) : cellValue);
                                     if (!(pivotCell.level === -1 && !pivotCell.rowSpan)) {
                                         pdfGridRow.cells.getCell(localCnt).columnSpan = pivotCell.colSpan ?
                                             (pageSize - localCnt < pivotCell.colSpan ? pageSize - localCnt : pivotCell.colSpan) : 1;
@@ -26693,11 +26758,31 @@ class PDFExport {
                                     pdfGridRow = this.applyStyle(pdfGridRow, pivotCell, localCnt);
                                 }
                                 let args = {
-                                    style: (pivotCell && pivotCell.isSum) ? { bold: true } : undefined,
+                                    style: (pivotCell.axis == "column") ? { bold: false } : ((pivotCell && pivotCell.isSum) || (pivotCell.axis == "row")) ? { bold: true } : undefined,
                                     pivotCell: pivotCell,
                                     cell: pdfGridRow.cells.getCell(localCnt)
                                 };
                                 this.parent.trigger(onPdfCellRender, args);
+                                if (pivotCell.axis == "column") {
+                                    args = {
+                                        style: args.style,
+                                        cell: args.cell,
+                                        gridCell: args.pivotCell
+                                    };
+                                    this.parent.trigger(pdfHeaderQueryCellInfo, args);
+                                    pdfGridRow.cells.getCell(localCnt).value = args.gridCell.formattedText ? args.gridCell.formattedText : cellValue;
+                                }
+                                else {
+                                    args = {
+                                        style: args.style,
+                                        cell: args.cell,
+                                        column: undefined,
+                                        data: args.pivotCell,
+                                        value: cellValue,
+                                    };
+                                    this.parent.trigger(pdfQueryCellInfo, args);
+                                    pdfGridRow.cells.getCell(localCnt).value = args.value ? args.value : cellValue;
+                                }
                                 if (args.style) {
                                     this.processCellStyle(pdfGridRow.cells.getCell(localCnt), args);
                                 }
@@ -26709,6 +26794,15 @@ class PDFExport {
                                     cell: pdfGridRow.cells.getCell(localCnt)
                                 };
                                 this.parent.trigger(onPdfCellRender, args);
+                                let pivotCell = { formattedText: "" };
+                                if (pivotCell.axis == "column") {
+                                    args = {
+                                        style: args.style,
+                                        cell: args.cell,
+                                        gridCell: args.pivotCell
+                                    };
+                                    this.parent.trigger(pdfHeaderQueryCellInfo, args);
+                                }
                                 if (args.style) {
                                     this.processCellStyle(pdfGridRow.cells.getCell(localCnt), args);
                                 }
@@ -27944,6 +28038,9 @@ class TreeViewRenderer {
         return buttonElement;
     }
     nodeStateChange(args) {
+        if (!args.isInteracted) {
+            return;
+        }
         let node = closest(args.node, '.' + TEXT_CONTENT_CLASS);
         if (!isNullOrUndefined(node)) {
             let li = closest(node, 'li');
@@ -27975,7 +28072,7 @@ class TreeViewRenderer {
                         this.updateNodeStateChange(id, args, selectedNode);
                     }
                     else {
-                        this.updateCheckState(selectedNode);
+                        this.updateCheckState(selectedNode, args.action);
                     }
                 });
             }
@@ -28002,7 +28099,7 @@ class TreeViewRenderer {
                         this.updateNodeStateChange(id, args, selectedNode);
                     }
                     else {
-                        this.updateCheckState(selectedNode);
+                        this.updateCheckState(selectedNode, args.action);
                     }
                 });
             }
@@ -28059,19 +28156,17 @@ class TreeViewRenderer {
                 break;
         }
     }
-    updateCheckState(selectedNode) {
+    updateCheckState(selectedNode, action) {
         let chkState = this.fieldTable.element.querySelectorAll('.e-checkbox-wrapper');
         let innerText = this.fieldTable.element.querySelectorAll('.e-list-text');
         let checkClass = this.fieldTable.element.querySelectorAll('.e-frame');
         for (let 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(NODE_CHECK_CLASS);
+                if (action === 'check') {
+                    this.fieldTable.uncheckAll([selectedNode['id']]);
                 }
                 else {
-                    chkState[i].setAttribute('aria-checked', 'true');
-                    checkClass[i].classList.remove(NODE_CHECK_CLASS);
+                    this.fieldTable.checkAll([selectedNode['id']]);
                 }
             }
         }
@@ -28120,6 +28215,9 @@ class TreeViewRenderer {
         }
     }
     addNode(args) {
+        if (!args.isInteracted) {
+            return;
+        }
         /* eslint-disable */
         let fieldList = this.parent.pivotFieldList;
         let selectedNode = fieldList[args.data[0].id.toString()];
@@ -28127,17 +28225,18 @@ class TreeViewRenderer {
         let fieldInfo = PivotUtil.getFieldInfo(selectedNode.id.toString(), this.parent);
         let control = this.parent.isPopupView ? this.parent.pivotGridModule : this.parent;
         if (args.action === 'check') {
+            let axis = ['filters', 'columns', 'rows', 'values'];
             let 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(fieldDrop, eventdrop, (observedArgs) => {
                 if (!observedArgs.cancel) {
                     this.selectedNodes.push(selectedNode.id.toString());
                 }
                 else {
-                    this.updateCheckState(selectedNode);
+                    this.updateCheckState(selectedNode, args.action);
                 }
             });
         }
@@ -28158,7 +28257,7 @@ class TreeViewRenderer {
                     }
                 }
                 else {
-                    this.updateCheckState(selectedNode);
+                    this.updateCheckState(selectedNode, args.action);
                 }
             });
         }
@@ -28551,7 +28650,7 @@ class AxisTableRenderer {
                 addClass([element[element.length - 1].querySelector('.' + DROP_INDICATOR_CLASS + '-last')], INDICATOR_HOVER_CLASS);
             }
         }
-        else if (e.type === 'mouseleave') {
+        else if (!this.parent.isDragging || (!e.target.classList.contains(DROPPABLE_CLASS) && e.type === 'mouseleave')) {
             removeClass([].slice.call(parentElement.querySelectorAll('.' + DROP_INDICATOR_CLASS)), INDICATOR_HOVER_CLASS);
             removeClass([].slice.call(parentElement.querySelectorAll('.' + DROP_INDICATOR_CLASS + '-last')), INDICATOR_HOVER_CLASS);
         }
@@ -30209,6 +30308,8 @@ let PivotFieldList = class PivotFieldList extends Component {
         this.remoteData = [];
         /** @hidden */
         this.actionObj = {};
+        /** @hidden */
+        this.destroyEngine = false;
     }
     /**
      * To provide the array of modules needed for control rendering
@@ -31290,7 +31391,7 @@ let PivotFieldList = class PivotFieldList extends Component {
      */
     destroy() {
         this.unWireEvent();
-        if (this.engineModule) {
+        if (this.engineModule && !this.destroyEngine) {
             this.engineModule.fieldList = {};
             this.engineModule.rMembers = null;
             this.engineModule.cMembers = null;
@@ -31298,7 +31399,7 @@ let PivotFieldList = class PivotFieldList extends Component {
             this.engineModule.indexMatrix = null;
             this.engineModule = {};
         }
-        if (this.olapEngineModule) {
+        if (this.olapEngineModule && !this.destroyEngine) {
             this.olapEngineModule.fieldList = {};
             this.olapEngineModule = {};
         }
@@ -34256,7 +34357,7 @@ class GroupingBar {
     }
     dropIndicatorUpdate(e) {
         if ((this.parent.isDragging && e.target.classList.contains(DROPPABLE_CLASS) && e.type === 'mouseover') ||
-            e.type === 'mouseleave') {
+            (!this.parent.isDragging || (!e.target.classList.contains(DROPPABLE_CLASS) && e.type === 'mouseleave'))) {
             removeClass([].slice.call(this.parent.element.querySelectorAll('.' + DROP_INDICATOR_CLASS)), INDICATOR_HOVER_CLASS);
             removeClass([].slice.call(this.parent.element.querySelectorAll('.' + DROP_INDICATOR_CLASS + '-last')), INDICATOR_HOVER_CLASS);
         }
@@ -35276,10 +35377,10 @@ class Toolbar$2 {
         }
     }
     actionClick(args) {
-        let actionName = (args.item.id == "PivotViewnew") ? addNewReport : (args.item.id == "PivotViewsave") ? saveCurrentReport : (args.item.id == "PivotViewsaveas") ? saveAsCurrentReport
-            : (args.item.id == "PivotViewrename") ? renameCurrentReport : (args.item.id == "PivotViewremove") ? removeCurrentReport : (args.item.id == "PivotViewload") ? loadReports
-                : (args.item.id == "PivotViewformatting") ? openConditionalFormatting : (args.item.id == "PivotViewnumberFormatting") ? openNumberFormatting
-                    : (args.item.id == "PivotViewmdxQuery") ? MdxQuery : (args.item.id == "PivotViewfieldlist") ? showFieldList : '';
+        let actionName = (args.item.id == this.parent.element.id + 'new') ? addNewReport : (args.item.id == this.parent.element.id + 'save') ? saveCurrentReport : (args.item.id == this.parent.element.id + 'saveas') ? saveAsCurrentReport
+            : (args.item.id == this.parent.element.id + 'rename') ? renameCurrentReport : (args.item.id == this.parent.element.id + 'remove') ? removeCurrentReport : (args.item.id == this.parent.element.id + 'load') ? loadReports
+                : (args.item.id == this.parent.element.id + 'formatting') ? openConditionalFormatting : (args.item.id == this.parent.element.id + 'numberFormatting') ? openNumberFormatting
+                    : (args.item.id == this.parent.element.id + 'mdxQuery') ? MdxQuery : (args.item.id == this.parent.element.id + 'fieldlist') ? showFieldList : '';
         this.parent.actionObj.actionName = actionName;
         if (this.parent.actionBeginMethod()) {
             return;
@@ -35979,6 +36080,9 @@ class Toolbar$2 {
                 label: this.parent.localeObj.getConstant('multipleAxes'),
                 cssClass: 'e-multipleAxes',
                 checked: this.parent.chartSettings.enableMultipleAxis,
+                change: (args) => {
+                    document.getElementById(this.parent.element.id + '_' + 'multipleAxes').click();
+                },
                 enableRtl: this.parent.enableRtl,
                 locale: this.parent.locale
             });
@@ -36007,6 +36111,9 @@ class Toolbar$2 {
                 label: this.parent.localeObj.getConstant('showLegend'),
                 checked: this.getLableState(this.parent.chartSettings.chartSeries.type),
                 cssClass: 'e-showLegend',
+                change: (args) => {
+                    document.getElementById(this.parent.element.id + '_' + 'showLegend').click();
+                },
                 enableRtl: this.parent.enableRtl,
                 locale: this.parent.locale
             });
@@ -36115,14 +36222,14 @@ class Toolbar$2 {
     menuItemClick(args) {
         let exportArgs = {};
         let type;
-        let actionName = (args.item.id == "PivotViewgrid") ? tableView : (args.item.id == "PivotView_Column") ? chartView : (args.item.id == "PivotView_Bar") ? chartView : (args.item.id == "PivotView_Line") ? chartView
-            : (args.item.id == "PivotView_Area") ? chartView : (args.item.id == "PivotView_Scatter") ? chartView : (args.item.id == "PivotView_Polar") ? chartView : (args.item.id == "PivotView_ChartMoreOption") ? chartView
-                : (args.item.id == "PivotView_multipleAxes") ? multipleAxis : (args.item.id == "PivotView_showLegend") ? showLegend : (args.item.id == "PivotViewpdf") ? pdfExport : (args.item.id == "PivotViewpng") ? pngExport
-                    : (args.item.id == "PivotViewexcel") ? excelExport : (args.item.id == "PivotViewcsv") ? csvExport : (args.item.id == "PivotViewjpeg") ? jpegExport : (args.item.id == "PivotViewsvg") ? svgExport
-                        : (args.item.id == "PivotViewnotsubtotal") ? hideSubTotals : (args.item.id == "PivotViewsubtotalrow") ? subTotalsRow : (args.item.id == "PivotViewsubtotalcolumn") ? subTotalsColumn
-                            : (args.item.id == "PivotViewsubtotal") ? showSubTotals : (args.item.id == "PivotViewnotgrandtotal") ? hideGrandTotals : (args.item.id == "PivotViewgrandtotalrow") ? grandTotalsRow
-                                : (args.item.id == "PivotViewgrandtotalcolumn") ? grandTotalsColumn : (args.item.id == "PivotViewgrandtotal") ? showGrandTotals
-                                    : (args.item.id == "PivotViewnumberFormattingMenu") ? numberFormattingMenu : (args.item.id == "PivotViewconditionalFormattingMenu") ? conditionalFormattingMenu : '';
+        let actionName = (args.item.id == this.parent.element.id + 'grid') ? tableView : (args.item.id == this.parent.element.id + '_' + "Column") ? chartView : (args.item.id == this.parent.element.id + '_' + "Bar") ? chartView : (args.item.id == this.parent.element.id + '_' + "Line") ? chartView
+            : (args.item.id == this.parent.element.id + '_' + "Area") ? chartView : (args.item.id == this.parent.element.id + '_' + "Scatter") ? chartView : (args.item.id == this.parent.element.id + '_' + "Polar") ? chartView : (args.item.id == this.parent.element.id + '_' + "ChartMoreOption") ? chartView
+                : (args.item.id == this.parent.element.id + '_' + "multipleAxes") ? multipleAxis : (args.item.id == this.parent.element.id + '_' + "showLegend") ? showLegend : (args.item.id == this.parent.element.id + "pdf") ? pdfExport : (args.item.id == this.parent.element.id + "png") ? pngExport
+                    : (args.item.id == this.parent.element.id + "excel") ? excelExport : (args.item.id == this.parent.element.id + "csv") ? csvExport : (args.item.id == this.parent.element.id + "jpeg") ? jpegExport : (args.item.id == this.parent.element.id + "svg") ? svgExport
+                        : (args.item.id == this.parent.element.id + "notsubtotal") ? hideSubTotals : (args.item.id == this.parent.element.id + "subtotalrow") ? subTotalsRow : (args.item.id == this.parent.element.id + "subtotalcolumn") ? subTotalsColumn
+                            : (args.item.id == this.parent.element.id + "subtotal") ? showSubTotals : (args.item.id == this.parent.element.id + "notgrandtotal") ? hideGrandTotals : (args.item.id == this.parent.element.id + "grandtotalrow") ? grandTotalsRow
+                                : (args.item.id == this.parent.element.id + "grandtotalcolumn") ? grandTotalsColumn : (args.item.id == this.parent.element.id + "grandtotal") ? showGrandTotals
+                                    : (args.item.id == this.parent.element.id + "numberFormattingMenu") ? numberFormattingMenu : (args.item.id == this.parent.element.id + "conditionalFormattingMenu") ? conditionalFormattingMenu : '';
         this.parent.actionObj.actionName = actionName;
         if (this.parent.actionBeginMethod()) {
             return;