@syncfusion/ej2-pivotview 19.3.57 → 19.4.42

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

@@ -159,7 +159,7 @@ var PivotButton = /** @class */ (function () {
                                         attrs: { 'tabindex': '-1', 'aria-disabled': 'false', 'title': this.parent.localeObj.getConstant('editCalculatedField') },
                                         className: cls.ICON + ' ' + cls.CALC_EDIT
                                     });
-                                    if (this.parent.allowCalculatedField && this.parent.calculatedFieldModule && field[i].showEditIcon) {
+                                    if (this.parent.allowCalculatedField && this.parent.calculatedFieldModule && (field[i].showEditIcon || field[i].showEditIcon === undefined)) {
                                         removeClass([calcElement], cls.ICON_DISABLE);
                                     }
                                     else {
@@ -172,7 +172,7 @@ var PivotButton = /** @class */ (function () {
                                     className: cls.ICON + ' ' + cls.REMOVE_CLASS
                                 });
                                 if (this.parent.getModuleName() === 'pivotview') {
-                                    if ((this.parent.groupingBarSettings.showRemoveIcon && field[i].showRemoveIcon)) {
+                                    if ((this.parent.groupingBarSettings.showRemoveIcon && (field[i].showRemoveIcon || field[i].showRemoveIcon === undefined))) {
                                         removeClass([removeElement], cls.ICON_DISABLE);
                                     }
                                     else {
@@ -180,7 +180,7 @@ var PivotButton = /** @class */ (function () {
                                     }
                                 }
                                 else {
-                                    if (field[i].showRemoveIcon) {
+                                    if (field[i].showRemoveIcon || field[i].showRemoveIcon === undefined) {
                                         removeClass([removeElement], cls.ICON_DISABLE);
                                     }
                                     else {
@@ -212,13 +212,13 @@ var PivotButton = /** @class */ (function () {
                 }
                 if (axis === 'values') {
                     var _loop_1 = function (element) {
-                        if (element.classList.contains(cls.GROUP_CHART_VALUE) && this_1.parent.chartModule) {
+                        if (element.classList.contains(cls.GROUP_CHART_VALUE) && this_1.parent.pivotChartModule) {
                             var valueData = field.map(function (item) { return { text: item.caption ? item.caption : item.name, value: item.name }; });
                             var parent_1 = this_1.parent;
                             if (this_1.valueFiedDropDownList && element.querySelector('.' + cls.GROUP_CHART_VALUE_DROPDOWN_DIV)) {
                                 this_1.valueFiedDropDownList.dataSource = valueData;
                                 this_1.valueFiedDropDownList.value = !parent_1.chartSettings.enableMultipleAxis ?
-                                    parent_1.chartModule.currentMeasure : valueData[0].value;
+                                    parent_1.pivotChartModule.currentMeasure : valueData[0].value;
                             }
                             else {
                                 var ddlDiv = createElement('div', { className: cls.GROUP_CHART_VALUE_DROPDOWN_DIV });
@@ -228,7 +228,7 @@ var PivotButton = /** @class */ (function () {
                                     enableRtl: this_1.parent.enableRtl,
                                     locale: this_1.parent.locale,
                                     value: !parent_1.chartSettings.enableMultipleAxis ?
-                                        parent_1.chartModule.currentMeasure : valueData[0].value,
+                                        parent_1.pivotChartModule.currentMeasure : valueData[0].value,
                                     width: 200,
                                     fields: { value: 'value', text: 'text' },
                                     cssClass: cls.GROUP_CHART_VALUE_DROPDOWN,
@@ -253,14 +253,14 @@ var PivotButton = /** @class */ (function () {
                     var availColindex = undefined;
                     for (var _g = 0, _h = this.parentElement.querySelectorAll('.e-group-' + axis); _g < _h.length; _g++) {
                         var element = _h[_g];
-                        if (element.classList.contains(cls.GROUP_CHART_COLUMN) && this.parent.chartModule) {
-                            var currentMeasure = this.parent.chartModule.currentMeasure;
+                        if (element.classList.contains(cls.GROUP_CHART_COLUMN) && this.parent.pivotChartModule) {
+                            var currentMeasure = this.parent.pivotChartModule.currentMeasure;
                             var delimiter = this.parent.chartSettings.columnDelimiter ? this.parent.chartSettings.columnDelimiter : '-';
                             var columnHeader = (this.parent.chartSettings.columnHeader && this.parent.chartSettings.columnHeader !== '') ?
                                 this.parent.chartSettings.columnHeader.split(delimiter).join(' - ') : '';
                             var engineModule = this.parent.dataType === 'olap' ? this.parent.olapEngineModule : this.parent.engineModule;
                             var pivotValues = engineModule.pivotValues;
-                            var totColIndex = this.parent.chartModule.getColumnTotalIndex(pivotValues);
+                            var totColIndex = this.parent.pivotChartModule.getColumnTotalIndex(pivotValues);
                             var rKeys = Object.keys(pivotValues);
                             var columnData = [];
                             var firstValueRow = false;
@@ -372,7 +372,7 @@ var PivotButton = /** @class */ (function () {
             },
             className: cls.PIVOT_BUTTON_CONTENT_CLASS + ' ' +
                 (this.parent.getModuleName() === 'pivotview' ?
-                    this.parent.groupingBarSettings.allowDragAndDrop && field[i].allowDragAndDrop ? '' : cls.DRAG_DISABLE_CLASS : ''),
+                    this.parent.groupingBarSettings.allowDragAndDrop && (field[i].allowDragAndDrop || field[i].allowDragAndDrop === undefined) ? '' : cls.DRAG_DISABLE_CLASS : ''),
             innerHTML: axis === 'filters' ? (this.parent.dataType === 'olap' && engineModule.fieldList[field[i].name].type === 'CalculatedField') ?
                 text : (text + ' (' + filterMem + ')') : (this.parent.dataType === 'olap' ?
                 text : (!this.parent.dataSourceSettings.showAggregationOnValueField || axis !== 'values' || aggregation === 'CalculatedField' ?
@@ -438,43 +438,54 @@ var PivotButton = /** @class */ (function () {
     };
     PivotButton.prototype.openCalculatedFieldDialog = function (args) {
         var fieldName = args.target.parentElement.id;
-        if (this.parent.getModuleName() === 'pivotview') {
-            if (this.parent.isAdaptive && (this.parent.showFieldList &&
-                this.parent.pivotFieldListModule &&
-                !this.parent.pivotFieldListModule.isDestroyed)) {
-                this.parent.pivotFieldListModule.element
-                    .querySelector('.' + cls.TOGGLE_FIELD_LIST_CLASS).click();
-                this.parent.pivotFieldListModule.dialogRenderer.adaptiveElement.select(4);
-                /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-                this.parent.pivotFieldListModule.calculatedFieldModule
-                    .updateAdaptiveCalculatedField(true, fieldName);
-            }
-            else {
-                if (!this.parent.isAdaptive) {
-                    this.parent.calculatedFieldModule.buttonCall = true;
-                }
-                this.parent.notify(events.initCalculatedField, { edit: true, fieldName: fieldName });
-            }
+        var fieldInfo = PivotUtil.getFieldInfo(fieldName, this.parent);
+        this.parent.actionObj.actionName = events.editCalculatedField;
+        this.parent.actionObj.fieldInfo = fieldInfo;
+        if (this.parent.actionBeginMethod()) {
+            return;
         }
-        else if (this.parent.getModuleName() === 'pivotfieldlist') {
-            if (this.parent.isAdaptive) {
-                this.parent.dialogRenderer.adaptiveElement.select(4);
-                /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
-                this.parent.calculatedFieldModule
-                    .updateAdaptiveCalculatedField(true, fieldName);
-                this.parent.calculatedFieldModule.buttonCall = true;
-            }
-            else {
-                if (this.parent.dialogRenderer.fieldListDialog) {
-                    this.parent.dialogRenderer.fieldListDialog.hide();
-                    addClass([this.parent.element.querySelector('.' + cls.TOGGLE_FIELD_LIST_CLASS)], cls.ICON_HIDDEN);
+        try {
+            if (this.parent.getModuleName() === 'pivotview') {
+                if (this.parent.isAdaptive && (this.parent.showFieldList &&
+                    this.parent.pivotFieldListModule &&
+                    !this.parent.pivotFieldListModule.isDestroyed)) {
+                    this.parent.pivotFieldListModule.element
+                        .querySelector('.' + cls.TOGGLE_FIELD_LIST_CLASS).click();
+                    this.parent.pivotFieldListModule.dialogRenderer.adaptiveElement.select(4);
+                    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+                    this.parent.pivotFieldListModule.calculatedFieldModule
+                        .updateAdaptiveCalculatedField(true, fieldName);
                 }
-                this.parent.notify(events.initCalculatedField, { edit: true, fieldName: fieldName });
-                if (this.parent.calculatedFieldModule) {
+                else {
+                    if (!this.parent.isAdaptive) {
+                        this.parent.calculatedFieldModule.buttonCall = true;
+                    }
+                    this.parent.notify(events.initCalculatedField, { edit: true, fieldName: fieldName });
+                }
+            }
+            else if (this.parent.getModuleName() === 'pivotfieldlist') {
+                if (this.parent.isAdaptive) {
+                    this.parent.dialogRenderer.adaptiveElement.select(4);
+                    /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
+                    this.parent.calculatedFieldModule
+                        .updateAdaptiveCalculatedField(true, fieldName);
                     this.parent.calculatedFieldModule.buttonCall = true;
                 }
+                else {
+                    if (this.parent.dialogRenderer.fieldListDialog) {
+                        this.parent.dialogRenderer.fieldListDialog.hide();
+                        addClass([this.parent.element.querySelector('.' + cls.TOGGLE_FIELD_LIST_CLASS)], cls.ICON_HIDDEN);
+                    }
+                    this.parent.notify(events.initCalculatedField, { edit: true, fieldName: fieldName });
+                    if (this.parent.calculatedFieldModule) {
+                        this.parent.calculatedFieldModule.buttonCall = true;
+                    }
+                }
             }
         }
+        catch (execption) {
+            this.parent.actionFailureMethod(execption);
+        }
     };
     PivotButton.prototype.createDraggable = function (field, target) {
         this.draggable = new Draggable(target, {
@@ -498,7 +509,7 @@ var PivotButton = /** @class */ (function () {
             attrs: {
                 'tabindex': '-1', 'aria-disabled': 'false', 'title': this.parent.localeObj.getConstant('drag')
             },
-            className: cls.ICON + ' ' + cls.DRAG_CLASS + ' ' + (field.allowDragAndDrop ? '' : cls.DRAG_DISABLE_CLASS)
+            className: cls.ICON + ' ' + cls.DRAG_CLASS + ' ' + ((field.allowDragAndDrop || field.allowDragAndDrop === undefined) ? '' : cls.DRAG_DISABLE_CLASS)
         });
         dragWrapper.appendChild(dragElement);
         if (this.parent.getModuleName() === 'pivotfieldlist') {
@@ -864,38 +875,52 @@ var PivotButton = /** @class */ (function () {
             !(args.target.classList.contains(cls.DRAG_CLASS)) &&
             (buttonElement && fieldInfo.fieldItem && (fieldInfo.fieldItem.showSortIcon ||
                 isNullOrUndefined(fieldInfo.fieldItem.showSortIcon)))) {
-            if ((this.parent instanceof PivotFieldList || this.parent.groupingBarSettings.showSortIcon) &&
-                this.parent.dataSourceSettings.enableSorting &&
-                !(this.parent.dataType === 'olap' && ((this.parent.getModuleName() === 'pivotfieldlist' &&
-                    this.parent.pivotGridModule !== undefined &&
-                    this.parent.pivotGridModule.enableVirtualization) ||
-                    (this.parent.getModuleName() === 'pivotview' && this.parent.enableVirtualization)))) {
-                if (((this.parent.getModuleName() === 'pivotview' && this.parent.enableValueSorting) ||
-                    (this.parent.getModuleName() === 'pivotfieldlist' && this.parent.pivotGridModule !== undefined &&
-                        this.parent.pivotGridModule.enableValueSorting))) {
-                    if (this.parent.enableValueSorting || this.parent.pivotGridModule.enableValueSorting) { /* eslint-disable-line */
-                        if (args.target.classList.contains('e-pivot-button')) {
-                            if (args.target.parentElement.getAttribute('data-tag').split(':')[0] === 'rows') {
-                                this.parent.setProperties({ dataSourceSettings: { valueSortSettings: { headerText: '' } } }, true);
+            this.parent.actionObj.actionName = events.sortField;
+            this.parent.actionObj.fieldInfo = fieldInfo;
+            if (this.parent.actionBeginMethod()) {
+                return;
+            }
+            try {
+                if ((this.parent instanceof PivotFieldList || this.parent.groupingBarSettings.showSortIcon) &&
+                    this.parent.dataSourceSettings.enableSorting &&
+                    !(this.parent.dataType === 'olap' && ((this.parent.getModuleName() === 'pivotfieldlist' &&
+                        this.parent.pivotGridModule !== undefined &&
+                        this.parent.pivotGridModule.enableVirtualization) ||
+                        (this.parent.getModuleName() === 'pivotview' && this.parent.enableVirtualization)))) {
+                    if (((this.parent.getModuleName() === 'pivotview' && this.parent.enableValueSorting) ||
+                        (this.parent.getModuleName() === 'pivotfieldlist' && this.parent.pivotGridModule !== undefined &&
+                            this.parent.pivotGridModule.enableValueSorting))) {
+                        if (this.parent.enableValueSorting || this.parent.pivotGridModule.enableValueSorting) { /* eslint-disable-line */
+                            if (args.target.classList.contains('e-pivot-button')) {
+                                if (args.target.parentElement.getAttribute('data-tag').split(':')[0] === 'rows') {
+                                    this.parent.setProperties({ dataSourceSettings: { valueSortSettings: { headerText: undefined } } }, true);
+                                }
                             }
-                        }
-                        else {
-                            if (args.target.parentElement.parentElement.getAttribute('data-tag').split(':')[0] === 'rows') {
-                                this.parent.setProperties({ dataSourceSettings: { valueSortSettings: { headerText: '' } } }, true);
+                            else {
+                                if (args.target.parentElement.parentElement.getAttribute('data-tag').split(':')[0] === 'rows') {
+                                    this.parent.setProperties({ dataSourceSettings: { valueSortSettings: { headerText: undefined } } }, true);
+                                }
                             }
                         }
                     }
+                    this.parent.pivotCommon.eventBase.updateSorting(args);
+                    if (!this.parent.allowDeferLayoutUpdate || this.parent.getModuleName() !== 'pivotfieldlist') {
+                        var actionInfo = {
+                            sortInfo: this.parent.lastSortInfo
+                        };
+                        this.parent.actionObj.actionInfo = actionInfo;
+                        this.updateDataSource(true);
+                    }
+                    /* eslint-disable */
+                    var thisObj = this;
+                    /* eslint-enable */
+                    if (thisObj.parent instanceof PivotFieldList) {
+                        thisObj.axisField.render();
+                    }
                 }
-                this.parent.pivotCommon.eventBase.updateSorting(args);
-                if (!this.parent.allowDeferLayoutUpdate || this.parent.getModuleName() !== 'pivotfieldlist') {
-                    this.updateDataSource(true);
-                }
-                /* eslint-disable */
-                var thisObj = this;
-                /* eslint-enable */
-                if (thisObj.parent instanceof PivotFieldList) {
-                    thisObj.axisField.render();
-                }
+            }
+            catch (execption) {
+                this.parent.actionFailureMethod(execption);
             }
         }
     };
@@ -927,26 +952,37 @@ var PivotButton = /** @class */ (function () {
     PivotButton.prototype.updateFiltering = function (args) {
         /* eslint-disable */
         var pivotObj = this.parent.pivotGridModule ? this.parent.pivotGridModule : this.parent;
-        if (pivotObj.getModuleName() === 'pivotfieldlist') {
-            showSpinner(pivotObj.fieldListSpinnerElement);
-        }
-        else {
-            pivotObj.showWaitingPopup();
-        }
-        pivotObj.mouseEventArgs = args;
-        pivotObj.filterTargetID = this.parent.pivotCommon.moduleName !== 'pivotfieldlist' ?
-            this.parent.element : document.getElementById(this.parent.pivotCommon.parentID + '_Wrapper');
         var fieldName = args.target.parentElement.id;
-        if (pivotObj.dataSourceSettings.mode === 'Server') {
-            if (this.parent.engineModule.fieldList[fieldName].members && Object.keys(this.parent.engineModule.fieldList[fieldName].members).length > 0) {
-                this.updateFilterEvents();
+        var fieldInfo = PivotUtil.getFieldInfo(fieldName, this.parent);
+        this.parent.actionObj.actionName = events.filterField;
+        this.parent.actionObj.fieldInfo = fieldInfo;
+        if (this.parent.actionBeginMethod()) {
+            return;
+        }
+        try {
+            if (pivotObj.getModuleName() === 'pivotfieldlist') {
+                showSpinner(pivotObj.fieldListSpinnerElement);
             }
             else {
-                pivotObj.getEngine('fetchFieldMembers', null, null, null, null, null, fieldName);
+                pivotObj.showWaitingPopup();
+            }
+            pivotObj.mouseEventArgs = args;
+            pivotObj.filterTargetID = this.parent.pivotCommon.moduleName !== 'pivotfieldlist' ?
+                this.parent.element : document.getElementById(this.parent.pivotCommon.parentID + '_Wrapper');
+            if (pivotObj.dataSourceSettings.mode === 'Server') {
+                if (this.parent.engineModule.fieldList[fieldName].members && Object.keys(this.parent.engineModule.fieldList[fieldName].members).length > 0) {
+                    this.updateFilterEvents();
+                }
+                else {
+                    pivotObj.getEngine('fetchFieldMembers', null, null, null, null, null, fieldName);
+                }
+            }
+            else {
+                this.updateFilterEvents();
             }
         }
-        else {
-            this.updateFilterEvents();
+        catch (execption) {
+            this.parent.actionFailureMethod(execption);
         }
         /* eslint-enable */
     };
@@ -959,11 +995,6 @@ var PivotButton = /** @class */ (function () {
         var target = pivotObj.mouseEventArgs.target;
         this.fieldName = target.parentElement.id;
         if (this.parent.pivotCommon.filterDialog.dialogPopUp) {
-            this.dialogPopUp = this.parent.pivotCommon.filterDialog.dialogPopUp;
-            this.parent.pivotCommon.filterDialog.dialogPopUp.close = this.removeFilterDialog.bind(this);
-            // this.memberTreeView = this.parent.pivotCommon.filterDialog.memberTreeView;
-            // this.parent.pivotCommon.filterDialog.memberTreeView.nodeChecked = this.nodeStateModified.bind(this);
-            // this.parent.pivotCommon.filterDialog.allMemberSelect.nodeChecked = this.nodeStateModified.bind(this);
             this.bindDialogEvents();
         }
         if (pivotObj.getModuleName() === 'pivotfieldlist') {
@@ -977,8 +1008,8 @@ var PivotButton = /** @class */ (function () {
         if (this.parent.pivotCommon.filterDialog.allowExcelLikeFilter && this.parent.pivotCommon.filterDialog.tabObj) {
             this.index = this.parent.pivotCommon.filterDialog.tabObj.selectedItem;
             this.updateDialogButtonEvents();
-            this.dialogPopUp.buttons = this.buttonModel();
-            this.dialogPopUp.dataBind();
+            this.parent.pivotCommon.filterDialog.dialogPopUp.buttons = this.buttonModel();
+            this.parent.pivotCommon.filterDialog.dialogPopUp.dataBind();
             this.parent.pivotCommon.filterDialog.tabObj.selected = this.tabSelect.bind(this);
         }
         else if (this.parent.dataSourceSettings.allowMemberFilter) {
@@ -1003,7 +1034,7 @@ var PivotButton = /** @class */ (function () {
                 click: (this.index === 0 ? this.updateFilterState.bind(this, this.fieldName) : this.updateCustomFilter.bind(this))
             },
             {
-                click: this.parent.pivotCommon.filterDialog.closeFilterDialog.bind(this),
+                click: this.parent.pivotCommon.filterDialog.closeFilterDialog.bind(this.parent.pivotCommon.filterDialog),
                 buttonModel: { cssClass: cls.CANCEL_BUTTON_CLASS, content: this.parent.localeObj.getConstant('cancel') }
             }
         ];
@@ -1011,25 +1042,25 @@ var PivotButton = /** @class */ (function () {
     PivotButton.prototype.tabSelect = function (e) {
         this.index = e.selectedIndex;
         this.updateDialogButtonEvents();
-        removeClass([].slice.call(this.dialogPopUp.element.querySelectorAll('.e-selected-tab')), 'e-selected-tab');
+        removeClass([].slice.call(this.parent.pivotCommon.filterDialog.dialogPopUp.element.querySelectorAll('.e-selected-tab')), 'e-selected-tab');
         if (e.selectedIndex > 0) {
-            addClass([this.dialogPopUp.element.querySelector('.e-filter-div-content' + '.' + (e.selectedIndex === 1 && this.parent.dataSourceSettings.allowLabelFilter ? 'e-label-filter' : 'e-value-filter'))], 'e-selected-tab');
+            addClass([this.parent.pivotCommon.filterDialog.dialogPopUp.element.querySelector('.e-filter-div-content' + '.' + (e.selectedIndex === 1 && this.parent.dataSourceSettings.allowLabelFilter ? 'e-label-filter' : 'e-value-filter'))], 'e-selected-tab');
         }
         if (e.selectedIndex === 0) {
             this.parent.pivotCommon.filterDialog.updateCheckedState();
         }
         else {
-            this.dialogPopUp.buttons[0].buttonModel.disabled = false;
-            this.dialogPopUp.element.querySelector('.' + cls.OK_BUTTON_CLASS).removeAttribute('disabled');
+            this.parent.pivotCommon.filterDialog.dialogPopUp.buttons[0].buttonModel.disabled = false;
+            this.parent.pivotCommon.filterDialog.dialogPopUp.element.querySelector('.' + cls.OK_BUTTON_CLASS).removeAttribute('disabled');
         }
     };
     PivotButton.prototype.updateDialogButtonEvents = function () {
-        this.dialogPopUp.buttons = this.buttonModel();
-        this.dialogPopUp.dataBind();
+        this.parent.pivotCommon.filterDialog.dialogPopUp.buttons = this.buttonModel();
+        this.parent.pivotCommon.filterDialog.dialogPopUp.dataBind();
     };
     PivotButton.prototype.updateCustomFilter = function (args) {
         var _this = this;
-        var dialogElement = this.dialogPopUp.element.querySelector('.e-selected-tab');
+        var dialogElement = this.parent.pivotCommon.filterDialog.dialogPopUp.element.querySelector('.e-selected-tab');
         var fieldName = dialogElement.getAttribute('data-fieldname');
         var levelName = dialogElement.getAttribute('data-selectedField');
         var filterType = dialogElement.getAttribute('data-type');
@@ -1100,39 +1131,18 @@ var PivotButton = /** @class */ (function () {
             if (type !== 'Value') {
                 _this.parent.lastFilterInfo = PivotUtil.getFilterItemByName(fieldName, _this.parent.dataSourceSettings.filterSettings);
             }
-            _this.dialogPopUp.close();
+            _this.parent.pivotCommon.filterDialog.dialogPopUp.close();
             if (!observedArgs.cancel) {
                 _this.refreshPivotButtonState(fieldName, true);
                 _this.updateDataSource(true);
             }
         });
     };
-    PivotButton.prototype.removeFilterDialog = function () {
-        if (this.dialogPopUp && !this.dialogPopUp.isDestroyed) {
-            this.dialogPopUp.destroy();
-            setTimeout(this.setFocus.bind(this));
-        }
-        if (document.getElementById(this.parentElement.id + '_EditorTreeView')) {
-            remove(document.getElementById(this.parentElement.id + '_EditorTreeView'));
-        }
-    };
-    PivotButton.prototype.setFocus = function () {
-        if (this.parentElement) {
-            var pivotButtons = [].slice.call(this.parentElement.querySelectorAll('.e-pivot-button'));
-            for (var _i = 0, pivotButtons_1 = pivotButtons; _i < pivotButtons_1.length; _i++) {
-                var item = pivotButtons_1[_i];
-                if (item.getAttribute('data-uid') === this.fieldName) {
-                    item.focus();
-                    break;
-                }
-            }
-        }
-    };
     PivotButton.prototype.ClearFilter = function (e) {
-        var dialogElement = this.dialogPopUp.element;
+        var dialogElement = this.parent.pivotCommon.filterDialog.dialogPopUp.element;
         var fieldName = dialogElement.getAttribute('data-fieldname');
         var tabElement = dialogElement.querySelector('.e-selected-tab');
-        this.dialogPopUp.close();
+        this.parent.pivotCommon.filterDialog.dialogPopUp.close();
         if (this.parent.dataType === 'olap' && tabElement) {
             var levelName = tabElement.getAttribute('data-selectedField');
             this.removeDataSourceSettings(fieldName, levelName);
@@ -1149,63 +1159,73 @@ var PivotButton = /** @class */ (function () {
         var target = args.target;
         var fieldName = target.parentElement.id;
         var fieldInfo = PivotUtil.getFieldInfo(fieldName, this.parent);
+        this.parent.actionObj.actionName = events.removeField;
+        this.parent.actionObj.fieldInfo = fieldInfo;
+        if (this.parent.actionBeginMethod()) {
+            return;
+        }
         var removeFieldArgs = {
             cancel: false, fieldName: fieldName,
             dataSourceSettings: PivotUtil.getClonedDataSourceSettings(this.parent.dataSourceSettings),
             fieldItem: fieldInfo.fieldItem, axis: fieldInfo.axis
         };
-        var control = this.parent.getModuleName() === 'pivotfieldlist' &&
-            this.parent.isPopupView ? this.parent.pivotGridModule : this.parent;
-        control.trigger(events.fieldRemove, removeFieldArgs, function (observedArgs) {
-            if (!observedArgs.cancel) {
-                if (target.parentElement.getAttribute('isvalue') === 'true') {
-                    _this.parent.setProperties({ dataSourceSettings: { values: [] } }, true);
-                    if (_this.parent.dataType === 'olap') {
-                        _this.parent.pivotCommon.dataSourceUpdate.removeFieldFromReport('[Measures]');
+        try {
+            var control = this.parent.getModuleName() === 'pivotfieldlist' &&
+                this.parent.isPopupView ? this.parent.pivotGridModule : this.parent;
+            control.trigger(events.fieldRemove, removeFieldArgs, function (observedArgs) {
+                if (!observedArgs.cancel) {
+                    if (target.parentElement.getAttribute('isvalue') === 'true') {
+                        _this.parent.setProperties({ dataSourceSettings: { values: [] } }, true);
+                        if (_this.parent.dataType === 'olap') {
+                            _this.parent.pivotCommon.dataSourceUpdate.removeFieldFromReport('[Measures]');
+                        }
                     }
-                }
-                else {
-                    _this.parent.pivotCommon.dataSourceUpdate.removeFieldFromReport(fieldName);
-                    if (_this.parent.dataType === 'pivot' && _this.parent.showValuesButton && _this.parent.dataSourceSettings.values.length > 1 &&
-                        fieldInfo.position < _this.parent.dataSourceSettings.valueIndex && ((_this.parent.dataSourceSettings.valueAxis === 'row' &&
-                        observedArgs.axis === 'rows') || (_this.parent.dataSourceSettings.valueAxis === 'column' && observedArgs.axis === 'columns'))) {
-                        _this.parent.setProperties({ dataSourceSettings: { valueIndex: _this.parent.dataSourceSettings.valueIndex - 1 } }, true);
+                    else {
+                        _this.parent.pivotCommon.dataSourceUpdate.removeFieldFromReport(fieldName);
+                        if (_this.parent.dataType === 'pivot' && _this.parent.showValuesButton && _this.parent.dataSourceSettings.values.length > 1 &&
+                            fieldInfo.position < _this.parent.dataSourceSettings.valueIndex && ((_this.parent.dataSourceSettings.valueAxis === 'row' &&
+                            observedArgs.axis === 'rows') || (_this.parent.dataSourceSettings.valueAxis === 'column' && observedArgs.axis === 'columns'))) {
+                            _this.parent.setProperties({ dataSourceSettings: { valueIndex: _this.parent.dataSourceSettings.valueIndex - 1 } }, true);
+                        }
+                        if (_this.parent.dataType === 'olap' && _this.parent.dataSourceSettings.values.length === 0) {
+                            _this.parent.pivotCommon.dataSourceUpdate.removeFieldFromReport('[Measures]');
+                        }
                     }
-                    if (_this.parent.dataType === 'olap' && _this.parent.dataSourceSettings.values.length === 0) {
-                        _this.parent.pivotCommon.dataSourceUpdate.removeFieldFromReport('[Measures]');
+                    if (_this.parent.getModuleName() === 'pivotfieldlist') {
+                        _this.parent.axisFieldModule.render();
                     }
+                    _this.updateDataSource();
                 }
-                if (_this.parent.getModuleName() === 'pivotfieldlist') {
-                    _this.parent.axisFieldModule.render();
-                }
-                _this.updateDataSource();
-            }
-        });
+            });
+        }
+        catch (execption) {
+            this.parent.actionFailureMethod(execption);
+        }
     };
     /** @hidden */
     PivotButton.prototype.nodeStateModified = function (args) {
         var target = closest(args.node, 'li');
         var fieldName = target.getAttribute('data-fieldname');
         if (target.getAttribute('data-memberId') === 'all') {
-            this.memberTreeView.nodeChecked = null;
+            this.parent.pivotCommon.filterDialog.memberTreeView.nodeChecked = null;
             if (args.action === 'check') {
-                this.memberTreeView.checkAll();
+                this.parent.pivotCommon.filterDialog.memberTreeView.checkAll();
             }
             else {
-                this.memberTreeView.uncheckAll();
+                this.parent.pivotCommon.filterDialog.memberTreeView.uncheckAll();
             }
             if (this.parent.dataType === 'olap' && this.parent.olapEngineModule &&
                 !this.parent.olapEngineModule.fieldList[fieldName].isHierarchy) {
-                this.updateNodeStates(this.memberTreeView.getAllCheckedNodes(), fieldName, args.action);
+                this.updateNodeStates(this.parent.pivotCommon.filterDialog.memberTreeView.getAllCheckedNodes(), fieldName, args.action);
             }
             this.checkedStateAll(args.action);
-            this.memberTreeView.nodeChecked = this.nodeStateModified.bind(this);
+            this.parent.pivotCommon.filterDialog.memberTreeView.nodeChecked = this.nodeStateModified.bind(this);
         }
         else {
             if (this.parent.dataType === 'olap' && this.parent.olapEngineModule &&
                 !this.parent.olapEngineModule.fieldList[fieldName].isHierarchy) {
                 // let st1: number = new Date().getTime();
-                var checkedNodes = this.memberTreeView.getAllCheckedNodes();
+                var checkedNodes = this.parent.pivotCommon.filterDialog.memberTreeView.getAllCheckedNodes();
                 // let st2: number = (new Date().getTime() - st1) / 1000;
                 // console.log('getAllCheckedNodes:' + st2);
                 this.updateNodeStates(checkedNodes, fieldName, args.action);
@@ -1248,8 +1268,8 @@ var PivotButton = /** @class */ (function () {
                 }
                 if (currentMembers[member]) {
                     currentMembers[member].isSelected = false;
-                    if (this.memberTreeView.element.querySelector('li[data-memberId="' + member + '"]')) {
-                        var element = this.memberTreeView.element.querySelector('li[data-memberId="' + member + '"]');
+                    if (this.parent.pivotCommon.filterDialog.memberTreeView.element.querySelector('li[data-memberId="' + member + '"]')) {
+                        var element = this.parent.pivotCommon.filterDialog.memberTreeView.element.querySelector('li[data-memberId="' + member + '"]');
                         if (element && !element.querySelector('ul')) {
                             this.parent.pivotCommon.eventBase.updateChildNodeStates(fieldList.filterMembers, fieldName, member, false);
                         }
@@ -1259,8 +1279,8 @@ var PivotButton = /** @class */ (function () {
             for (var _a = 0, checkedNodes_1 = checkedNodes; _a < checkedNodes_1.length; _a++) {
                 var node = checkedNodes_1[_a];
                 if (currentMembers[node]) {
-                    if (this.memberTreeView.element.querySelector('li[data-memberId="' + node + '"]')) {
-                        var element = this.memberTreeView.element.querySelector('li[data-memberId="' + node + '"]');
+                    if (this.parent.pivotCommon.filterDialog.memberTreeView.element.querySelector('li[data-memberId="' + node + '"]')) {
+                        var element = this.parent.pivotCommon.filterDialog.memberTreeView.element.querySelector('li[data-memberId="' + node + '"]');
                         if (element && !element.querySelector('ul')) {
                             currentMembers[node].isSelected = true;
                             this.parent.pivotCommon.eventBase.updateChildNodeStates(fieldList.filterMembers, fieldName, node, true);
@@ -1298,10 +1318,10 @@ var PivotButton = /** @class */ (function () {
             !engineModule.fieldList[fieldName].isHierarchy) {
             var cMembers = engineModule.fieldList[fieldName].members;
             var sMembers = engineModule.fieldList[fieldName].currrentMembers;
-            filterItem.items = this.memberTreeView.getAllCheckedNodes();
+            filterItem.items = this.parent.pivotCommon.filterDialog.memberTreeView.getAllCheckedNodes();
             filterItem.levelCount = engineModule.fieldList[fieldName].levelCount;
             isNodeUnChecked = (filterItem.items.length ===
-                this.memberTreeView.fields.dataSource.length ? false : true);
+                this.parent.pivotCommon.filterDialog.memberTreeView.fields.dataSource.length ? false : true);
             if (engineModule.fieldList[fieldName].searchMembers.length > 0 && !isNodeUnChecked) {
                 var cNodeLength = Object.keys(cMembers).length;
                 var sNodeLength = Object.keys(sMembers).length;
@@ -1364,13 +1384,18 @@ var PivotButton = /** @class */ (function () {
                 }
                 _this.parent.dataSourceSettings.filterSettings.push(filterItem);
             }
-            _this.dialogPopUp.close();
+            _this.parent.pivotCommon.filterDialog.dialogPopUp.close();
             if (!observedArgs.cancel) {
                 _this.refreshPivotButtonState(fieldName, isNodeUnChecked);
                 if (!isNodeUnChecked) {
                     _this.removeDataSourceSettings(fieldName);
+                    filterItem = {};
                 }
                 _this.parent.lastFilterInfo = filterItem;
+                var actionInfo = {
+                    filterInfo: _this.parent.lastFilterInfo
+                };
+                _this.parent.actionObj.actionInfo = actionInfo;
                 _this.updateDataSource(true);
                 var thisObj = _this;
                 //setTimeout(() => {
@@ -1380,8 +1405,8 @@ var PivotButton = /** @class */ (function () {
                 //});
             }
             var pivotButtons = [].slice.call(_this.parentElement.querySelectorAll('.e-pivot-button'));
-            for (var _i = 0, pivotButtons_2 = pivotButtons; _i < pivotButtons_2.length; _i++) {
-                var item = pivotButtons_2[_i];
+            for (var _i = 0, pivotButtons_1 = pivotButtons; _i < pivotButtons_1.length; _i++) {
+                var item = pivotButtons_1[_i];
                 if (item.getAttribute('data-uid') === fieldName) {
                     item.focus();
                     break;
@@ -1392,8 +1417,8 @@ var PivotButton = /** @class */ (function () {
     PivotButton.prototype.refreshPivotButtonState = function (fieldName, isFiltered) {
         var pivotButtons = [].slice.call(this.parentElement.querySelectorAll('.e-pivot-button'));
         var selectedButton;
-        for (var _i = 0, pivotButtons_3 = pivotButtons; _i < pivotButtons_3.length; _i++) {
-            var item = pivotButtons_3[_i];
+        for (var _i = 0, pivotButtons_2 = pivotButtons; _i < pivotButtons_2.length; _i++) {
+            var item = pivotButtons_2[_i];
             if (item.getAttribute('data-uid') === fieldName) {
                 selectedButton = item.querySelector('.' + cls.FILTER_COMMON_CLASS);
                 break;
@@ -1526,14 +1551,6 @@ var PivotButton = /** @class */ (function () {
             this.columnFieldDropDownList.destroy();
             this.columnFieldDropDownList = null;
         }
-        if (this.memberTreeView && !this.memberTreeView.isDestroyed) {
-            this.memberTreeView.destroy();
-            this.memberTreeView = null;
-        }
-        if (this.dialogPopUp && !this.dialogPopUp.isDestroyed) {
-            this.dialogPopUp.destroy();
-            this.dialogPopUp = null;
-        }
         if (this.draggable && !this.draggable.isDestroyed) {
             this.draggable.destroy();
             this.draggable = null;