@syncfusion/ej2-pivotview 19.4.52 → 19.4.55

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

@@ -230,6 +230,49 @@ class PivotUtil {
             return collection;
         }
     }
+    static cloneOlapFieldSettings(collection) {
+        if (collection) {
+            let clonedCollection = [];
+            for (let set of collection) {
+                clonedCollection.push(this.getDefinedObj({
+                    caption: set.caption,
+                    hasChildren: set.hasChildren,
+                    id: set.id,
+                    isSelected: set.isSelected,
+                    name: set.name,
+                    spriteCssClass: set.spriteCssClass,
+                    tag: set.tag,
+                    type: set.type,
+                    pid: set.pid,
+                    expanded: set.expanded,
+                    defaultHierarchy: set.defaultHierarchy,
+                    hasAllMember: set.hasAllMember,
+                    allMember: set.allMember,
+                    isChecked: set.isChecked,
+                    filterMembers: set.filterMembers,
+                    childMembers: set.childMembers,
+                    searchMembers: set.searchMembers,
+                    htmlAttributes: set.htmlAttributes,
+                    currrentMembers: set.currrentMembers,
+                    isHierarchy: set.isHierarchy,
+                    isNamedSets: set.isNamedSets,
+                    formatString: set.formatString,
+                    actualFilter: set.actualFilter,
+                    levels: set.levels,
+                    levelCount: set.levelCount,
+                    memberType: set.memberType,
+                    fieldType: set.fieldType,
+                    parentHierarchy: set.parentHierarchy
+                    /* eslint-disable @typescript-eslint/no-explicit-any */
+                }));
+                /* eslint-enable @typescript-eslint/no-explicit-any */
+            }
+            return clonedCollection;
+        }
+        else {
+            return collection;
+        }
+    }
     static cloneFilterSettings(collection) {
         if (collection) {
             let clonedCollection = [];
@@ -8666,7 +8709,7 @@ class Render {
         if (isNaN(parHeight)) {
             parHeight = parHeight > this.parent.minHeight ? parHeight : this.parent.minHeight;
         }
-        if (this.parent.currentView !== 'Chart') {
+        if ((this.parent.showToolbar && this.parent.currentView !== 'Chart') || (!this.parent.showToolbar && this.parent.displayOption.view !== 'Chart')) {
             if (this.gridSettings.height === 'auto' && parHeight && this.parent.element.querySelector('.' + GRID_HEADER)) {
                 let rowColHeight = this.parent.element.querySelector('.' + GRID_HEADER).offsetHeight;
                 let gBarHeight = rowColHeight + (this.parent.element.querySelector('.' + GRID_GROUPING_BAR_CLASS) ?
@@ -10101,7 +10144,7 @@ class DataSourceUpdate {
                                     break;
                                 case 'values':
                                     droppedPosition !== -1 ? this.parent.dataSourceSettings.values.splice(droppedPosition, 0, dataSourceItem) : this.parent.dataSourceSettings.values.push(dataSourceItem);
-                                    if (this.parent.dataType === 'olap' && !this.parent.engineModule.isMeasureAvail) {
+                                    if (this.parent.dataType === 'olap' && !this.parent.engineModule.isMeasureAvail && !(this.parent.dataSourceSettings.values.length > 1)) {
                                         let measureField = {
                                             name: '[Measures]', caption: 'Measures', showRemoveIcon: true, allowDragAndDrop: true
                                         };
@@ -15190,13 +15233,6 @@ class PivotChart {
             }
             this.parent.element.querySelector('.' + PIVOTCHART).style.width = width + 'px';
         }
-        this.parent.chart.height = ['Pie', 'Funnel', 'Pyramid', 'Doughnut', 'Radar', 'Polar'].indexOf(this.parent.chartSettings.chartSeries.type) < 0 &&
-            this.parent.chartSettings.enableScrollOnMultiAxis && this.parent.chartSettings.enableMultipleAxis &&
-            this.parent.dataSourceSettings.values.length > 0 ? Number(this.parent.chart.height) > (this.parent.dataSourceSettings.values.length * 235) + 100 ? /* eslint-disable-line */
-            isNaN(Number(this.getChartHeight())) ? this.getChartHeight().toString() : (Number(this.getChartHeight()) - 5).toString() :
-            (!isNaN(Number(this.getChartHeight())) || this.parent.dataSourceSettings.values.length > 1) ?
-                ((this.parent.dataSourceSettings.values.length * 235) + 100).toString() :
-                this.getChartHeight().toString() : this.getChartHeight().toString();
         this.updateView();
         this.parent.notify(contentReady, {});
         this.parent.trigger(chartLoaded, args);
@@ -24641,6 +24677,13 @@ let PivotView = class PivotView extends Component {
             if (this.chart && ((this.showToolbar && this.currentView === 'Chart') || !this.showToolbar)) {
                 this.chart.width = (this.showToolbar && this.grid) ? this.getGridWidthAsNumber().toString() :
                     (this.displayOption.view === 'Both' && this.grid) ? this.getGridWidthAsNumber().toString() : this.getWidthAsNumber().toString();
+                this.chart.height = ['Pie', 'Funnel', 'Pyramid', 'Doughnut', 'Radar', 'Polar'].indexOf(this.chartSettings.chartSeries.type) < 0 &&
+                    this.chartSettings.enableScrollOnMultiAxis && this.chartSettings.enableMultipleAxis &&
+                    this.dataSourceSettings.values.length > 0 ? Number(this.chart.height) > (this.dataSourceSettings.values.length * 235) + 100 ? /* eslint-disable-line */
+                    isNaN(Number(this.pivotChartModule.getChartHeight())) ? this.pivotChartModule.getChartHeight().toString() : (Number(this.pivotChartModule.getChartHeight()) - 5).toString() :
+                    (!isNaN(Number(this.pivotChartModule.getChartHeight())) || this.dataSourceSettings.values.length > 1) ?
+                        ((this.dataSourceSettings.values.length * 235) + 100).toString() :
+                        this.pivotChartModule.getChartHeight().toString() : this.pivotChartModule.getChartHeight().toString();
                 if (this.displayOption.view === 'Chart' && this.showGroupingBar && this.groupingBarModule &&
                     this.element.querySelector('.' + CHART_GROUPING_BAR_CLASS)) {
                     this.groupingBarModule.refreshUI();
@@ -27139,6 +27182,9 @@ class DialogRenderer {
     onCheckChange(args) {
         if (args.checked) {
             this.parent.clonedDataSource = extend({}, this.parent.dataSourceSettings, null, true);
+            if (this.parent.dataType === 'olap') {
+                this.parent.clonedFieldListData = PivotUtil.cloneOlapFieldSettings(this.parent.olapEngineModule.fieldListData);
+            }
             this.parent.clonedFieldList = extend({}, this.parent.pivotFieldList, null, true);
         }
         this.parent.allowDeferLayoutUpdate = !this.parent.allowDeferLayoutUpdate;
@@ -27168,6 +27214,9 @@ class DialogRenderer {
         let parent = this.parent;
         parent.axisFieldModule.render();
         parent.clonedDataSource = extend({}, parent.dataSourceSettings, null, true);
+        if (this.parent.dataType === 'olap') {
+            this.parent.clonedFieldListData = PivotUtil.cloneOlapFieldSettings(this.parent.olapEngineModule.fieldListData);
+        }
         parent.clonedFieldList = extend({}, parent.pivotFieldList, null, true);
     }
     cancelButtonClick() {
@@ -27469,6 +27518,7 @@ class DialogRenderer {
         let activeindex = this.adaptiveElement.selectedItem;
         this.parent.treeViewModule.render(activeindex);
     }
+    /**  @hidden */
     onShowFieldList() {
         this.parent.actionObj.actionName = showFieldList;
         if (this.parent.actionBeginMethod()) {
@@ -27481,6 +27531,9 @@ class DialogRenderer {
                     this.parent.axisFieldModule.render();
                 }
                 this.parent.clonedDataSource = extend({}, this.parent.dataSourceSettings, null, true);
+                if (this.parent.dataType === 'olap') {
+                    this.parent.clonedFieldListData = PivotUtil.cloneOlapFieldSettings(this.parent.olapEngineModule.fieldListData);
+                }
                 this.parent.clonedFieldList = extend({}, this.parent.pivotFieldList, null, true);
             }
             addClass([this.parent.element.querySelector('.' + TOGGLE_FIELD_LIST_CLASS)], ICON_HIDDEN);
@@ -27506,9 +27559,13 @@ class DialogRenderer {
                 }, true);
             }
             if (Object.keys(this.parent.clonedFieldList).length > 0) {
-                this.parent.dataType === 'olap' ? this.parent.olapEngineModule.fieldList = /* eslint-disable-line */
-                    extend({}, this.parent.clonedFieldList, null, true) :
+                if (this.parent.dataType === 'olap' && this.parent.clonedFieldListData && Object.keys(this.parent.clonedFieldListData).length > 0) {
+                    this.parent.olapEngineModule.fieldListData = this.parent.clonedFieldListData;
+                    this.parent.olapEngineModule.fieldList = extend({}, this.parent.clonedFieldList, null, true);
+                }
+                else {
                     this.parent.engineModule.fieldList = extend({}, this.parent.clonedFieldList, null, true);
+                }
             }
             if (this.parent.isPopupView && this.parent.pivotGridModule) {
                 this.parent.pivotGridModule.notify(uiUpdate, this);
@@ -28142,7 +28199,7 @@ class TreeViewRenderer {
                     this.parent.dataSourceSettings.values.splice(dropPosition, 0, newField) :
                     this.parent.dataSourceSettings.values.push(newField);
                 if (this.parent.dataType === 'olap' && this.parent.olapEngineModule &&
-                    !(this.parent.olapEngineModule).isMeasureAvail) {
+                    !(this.parent.olapEngineModule).isMeasureAvail && !(this.parent.dataSourceSettings.values.length > 1)) {
                     let measureField = {
                         name: '[Measures]', caption: 'Measures', baseField: undefined, baseItem: undefined
                     };
@@ -31020,6 +31077,9 @@ let PivotFieldList = class PivotFieldList extends Component {
         this.pivotCommon.control = this;
         if (this.allowDeferLayoutUpdate) {
             this.clonedDataSource = extend({}, this.dataSourceSettings, null, true);
+            if (this.dataType === 'olap') {
+                this.clonedFieldListData = PivotUtil.cloneOlapFieldSettings(this.olapEngineModule.fieldListData);
+            }
             this.clonedFieldList = extend({}, this.pivotFieldList, null, true);
         }
     }
@@ -31199,6 +31259,9 @@ let PivotFieldList = class PivotFieldList extends Component {
             if (pivot.isRequiredUpdate) {
                 if (pivot.allowDeferLayoutUpdate) {
                     pivot.clonedDataSource = extend({}, pivot.dataSourceSettings, null, true);
+                    if (this.dataType === 'olap') {
+                        this.clonedFieldListData = PivotUtil.cloneOlapFieldSettings(this.olapEngineModule.fieldListData);
+                    }
                     pivot.clonedFieldList = extend({}, pivot.pivotFieldList, null, true);
                 }
                 pivot.updateView(pivot.pivotGridModule);
@@ -31284,6 +31347,9 @@ let PivotFieldList = class PivotFieldList extends Component {
             this.axisFieldModule.render();
             if (!this.isPopupView && this.allowDeferLayoutUpdate) {
                 this.clonedDataSource = extend({}, this.dataSourceSettings, null, true);
+                if (this.dataType === 'olap') {
+                    this.clonedFieldListData = PivotUtil.cloneOlapFieldSettings(this.olapEngineModule.fieldListData);
+                }
                 this.clonedFieldList = extend({}, this.pivotFieldList, null, true);
             }
         }
@@ -31461,6 +31527,9 @@ let PivotFieldList = class PivotFieldList extends Component {
         if (this.clonedFieldList) {
             this.clonedFieldList = null;
         }
+        if (this.clonedFieldListData) {
+            this.clonedFieldListData = null;
+        }
         if (this.localeObj) {
             this.localeObj = null;
         }
@@ -35415,7 +35484,7 @@ class Toolbar$2 {
                     break;
                 case (this.parent.element.id + 'fieldlist'):
                     if (this.parent.pivotFieldListModule && this.parent.pivotFieldListModule.dialogRenderer) {
-                        this.parent.pivotFieldListModule.dialogRenderer.fieldListDialog.show();
+                        this.parent.pivotFieldListModule.dialogRenderer.onShowFieldList();
                     }
                     break;
                 case (this.parent.element.id + 'formatting'):