@syncfusion/ej2-pivotview 19.3.48 → 19.4.38

package/src/pivotview/model/chartsettings-model.d.ts

@@ -2567,7 +2567,7 @@ export interface PivotAxisModel {
      * * Shift: Shifts the edge labels.
      * * None: No action will be performed.
      * * Hide: Edge label will be hidden.
-     * @default 'None'
+     * @default 'Shift'
      */
     edgeLabelPlacement?: EdgeLabelPlacement;
 

package/src/pivotview/model/chartsettings.d.ts

@@ -2174,7 +2174,7 @@ export declare class PivotAxis extends ChildProperty<PivotAxis> {
      * * Shift: Shifts the edge labels.
      * * None: No action will be performed.
      * * Hide: Edge label will be hidden.
-     * @default 'None'
+     * @default 'Shift'
      */
     edgeLabelPlacement: EdgeLabelPlacement;
     /**

package/src/pivotview/model/chartsettings.js

@@ -1576,7 +1576,7 @@ var PivotAxis = /** @class */ (function (_super) {
         Property(0)
     ], PivotAxis.prototype, "plotOffset", void 0);
     __decorate([
-        Property('None')
+        Property('Shift')
     ], PivotAxis.prototype, "edgeLabelPlacement", void 0);
     __decorate([
         Property('BetweenTicks')

package/src/pivotview/model/datasourcesettings-model.d.ts

@@ -1,4 +1,4 @@
-import { Property, Complex, Collection, ChildProperty, NumberFormatOptions, DateFormatOptions } from '@syncfusion/ej2-base';import { IDataSet, IDataOptions, IFieldOptions, IFilter, ISort, ICalculatedFieldSettings } from '../../base/engine';import { IDrillOptions, IValueSortSettings, IFormatSettings, IConditionalFormatSettings, IGroupSettings } from '../../base/engine';import { SummaryTypes, Sorting, FilterType, Operators, Condition, DateGroup, GroupType, ProviderType, RenderMode } from '../../base/types';import { DataSourceType } from '../../base/types';import { IStyle, ICustomGroups, IAuthenticationInfo } from '../../base/engine';import { DataManager } from '@syncfusion/ej2-data';
+import { Property, Complex, Collection, ChildProperty, NumberFormatOptions, DateFormatOptions } from '@syncfusion/ej2-base';import { IDataSet, IDataOptions, IFieldOptions, IFilter, ISort, ICalculatedFieldSettings } from '../../base/engine';import { IDrillOptions, IValueSortSettings, IFormatSettings, IConditionalFormatSettings, IGroupSettings } from '../../base/engine';import { SummaryTypes, Sorting, FilterType, Operators, Condition, DateGroup, GroupType, ProviderType, RenderMode } from '../../base/types';import { DataSourceType } from '../../base/types';import { IStyle, ICustomGroups, IAuthenticationInfo } from '../../base/engine';import { DataManager } from '@syncfusion/ej2-data';import { GrandTotalsPosition } from '../../common/base/enum';
 
 /**
  * Interface for a class FieldOptions
@@ -821,6 +821,13 @@ export interface DataSourceSettingsModel {
      */
     showGrandTotals?: boolean;
 
+    /**
+     * Allows the grand totals to be displayed at the top or bottom of the pivot table's row and column axes.
+     * > By default, the grand totals are displayed at the bottom of the pivot table's row and column axes.
+     * @default Bottom
+     */
+    grandTotalsPosition?: GrandTotalsPosition;
+
     /**
      * Allows to show or hide grand totals in row axis of the pivot table.
      * @default true

package/src/pivotview/model/datasourcesettings.d.ts

@@ -8,6 +8,7 @@ import { FieldOptionsModel, FilterModel, SortModel, FormatSettingsModel, GroupSe
 import { DrillOptionsModel, ValueSortSettingsModel, CalculatedFieldSettingsModel } from './datasourcesettings-model';
 import { DataManager } from '@syncfusion/ej2-data';
 import { ConditionalFormatSettingsModel, AuthenticationModel } from './datasourcesettings-model';
+import { GrandTotalsPosition } from '../../common/base/enum';
 /**
  * Allows specific fields associated with field information that needs to be displayed in the field axes of pivot table. The following configurations which are applicable are as follows:
  * * `name`: Allows you to set the field name that needs to be displayed in row/column/value/filter axis of pivot table.
@@ -808,6 +809,12 @@ export declare class DataSourceSettings extends ChildProperty<DataSourceSettings
      * @default true
      */
     showGrandTotals: boolean;
+    /**
+     * Allows the grand totals to be displayed at the top or bottom of the pivot table's row and column axes.
+     * > By default, the grand totals are displayed at the bottom of the pivot table's row and column axes.
+     * @default Bottom
+     */
+    grandTotalsPosition: GrandTotalsPosition;
     /**
      * Allows to show or hide grand totals in row axis of the pivot table.
      * @default true

package/src/pivotview/model/datasourcesettings.js

@@ -573,6 +573,9 @@ var DataSourceSettings = /** @class */ (function (_super) {
     __decorate([
         Property(true)
     ], DataSourceSettings.prototype, "showGrandTotals", void 0);
+    __decorate([
+        Property('Bottom')
+    ], DataSourceSettings.prototype, "grandTotalsPosition", void 0);
     __decorate([
         Property(true)
     ], DataSourceSettings.prototype, "showRowGrandTotals", void 0);

package/src/pivotview/renderer/render.d.ts

@@ -48,7 +48,8 @@ export declare class Render {
      */
     constructor(parent: PivotView);
     /** @hidden */
-    render(): void;
+    render(refreshRequired?: boolean): void;
+    private initProperties;
     private refreshHeader;
     /** @hidden */
     bindGrid(parent: PivotView, isEmpty: boolean): void;

package/src/pivotview/renderer/render.js

@@ -32,34 +32,40 @@ var Render = /** @class */ (function () {
         this.resColWidth = (this.parent.showGroupingBar && this.parent.groupingBarModule) ? (this.parent.isAdaptive ? 180 : 250) :
             (this.parent.isAdaptive ? 140 : 200);
         this.engine = this.parent.dataType === 'olap' ? this.parent.olapEngineModule : this.parent.engineModule;
-        this.gridSettings = parent.gridSettings;
+        this.gridSettings = this.parent.gridSettings;
         this.formatList = this.getFormatList();
         this.aggMenu = new AggregateMenu(this.parent);
     }
     /* eslint-disable-next-line */
     /** @hidden */
-    Render.prototype.render = function () {
-        var parent = this.parent;
-        var engine = this.parent.dataType === 'olap' ? this.parent.olapEngineModule : this.parent.engineModule;
+    Render.prototype.render = function (refreshRequired) {
+        if (refreshRequired) {
+            this.initProperties();
+        }
+        this.resColWidth = (this.parent.showGroupingBar && this.parent.groupingBarModule) ? (this.parent.isAdaptive ? 180 : 250) :
+            (this.parent.isAdaptive ? 140 : 200);
+        this.engine = this.parent.dataType === 'olap' ? this.parent.olapEngineModule : this.parent.engineModule;
+        this.gridSettings = this.parent.gridSettings;
+        this.formatList = this.getFormatList();
         this.parent.gridHeaderCellInfo = [];
         this.parent.gridCellCollection = {};
-        this.injectGridModules(parent);
+        this.injectGridModules(this.parent);
         this.rowStartPos = this.getRowStartPos();
         if (this.parent.grid && this.parent.grid.element && this.parent.element.querySelector('.e-grid')) {
             this.parent.notEmpty = true;
-            if (!engine.isEngineUpdated) {
-                engine.headerContent = this.frameDataSource('header');
-                engine.valueContent = this.frameDataSource('value');
+            if (!this.engine.isEngineUpdated) {
+                this.engine.headerContent = this.frameDataSource('header');
+                this.engine.valueContent = this.frameDataSource('value');
             }
             else {
                 if (this.parent.enableValueSorting) {
-                    engine.valueContent = this.frameDataSource('value');
+                    this.engine.valueContent = this.frameDataSource('value');
                 }
-                engine.isEngineUpdated = false;
+                this.engine.isEngineUpdated = false;
             }
             this.parent.grid.setProperties({
                 columns: this.frameStackedHeaders(), dataSource: (this.parent.dataType === 'olap' ? true :
-                    parent.dataSourceSettings.values.length > 0) && !this.engine.isEmptyData ? engine.valueContent :
+                    this.parent.dataSourceSettings.values.length > 0) && !this.engine.isEmptyData ? this.engine.valueContent :
                     this.frameDataSource('value')
             }, true);
             if (this.parent.grid.height === 'auto') {
@@ -99,6 +105,30 @@ var Render = /** @class */ (function () {
         }
         this.parent.grid.on(headerRefreshed, this.refreshHeader, this);
     };
+    Render.prototype.initProperties = function () {
+        this.rowStartPos = undefined;
+        this.maxIndent = undefined;
+        this.resColWidth = undefined;
+        this.isOverflows = undefined;
+        this.indentCollection = {};
+        this.formatList = undefined;
+        this.colPos = 0;
+        this.colGrandPos = undefined;
+        this.rowGrandPos = undefined;
+        this.lastSpan = 0;
+        this.field = undefined;
+        this.fieldCaption = undefined;
+        this.lvlCollection = {};
+        this.hierarchyCollection = {};
+        this.lvlPosCollection = {};
+        this.hierarchyPosCollection = {};
+        this.position = 0;
+        this.measurePos = 0;
+        this.maxMeasurePos = 0;
+        this.hierarchyCount = 0;
+        this.actualText = '';
+        this.timeOutObj = undefined;
+    };
     Render.prototype.refreshHeader = function () {
         if (this.parent.enableVirtualization) {
             var mHdr = this.parent.element.querySelector('.' + cls.MOVABLEHEADER_DIV);
@@ -300,9 +330,9 @@ var Render = /** @class */ (function () {
             this.parent.renderReactTemplates(); /* eslint-disable-line */
         }
         if (this.parent.isInitial) {
+            this.parent.isInitial = false;
             this.parent.refreshData();
         }
-        this.parent.isInitial = false;
         this.parent.notify(events.contentReady, {});
     };
     Render.prototype.setFocusOnLastCell = function () {
@@ -1118,7 +1148,7 @@ var Render = /** @class */ (function () {
                 if (cell.isSum) {
                     tCell.classList.add(cls.SUMMARY);
                 }
-                var isGrandSum = (isNullOrUndefined(cell.isGrandSum) && this.parent.dataSourceSettings.valueAxis === 'column' && this.parent.dataType === 'olap' &&
+                var isGrandSum = (isNullOrUndefined(cell.isGrandSum) && (!isNullOrUndefined(this.parent.olapEngineModule) && this.parent.olapEngineModule.olapValueAxis === 'column') && this.parent.dataType === 'olap' &&
                     ((this.colGrandPos - this.parent.dataSourceSettings.values.length) < Number(tCell.getAttribute('aria-colindex'))));
                 if (cell.isGrandSum || (isGrandSum || this.colGrandPos === Number(tCell.getAttribute('aria-colindex'))) || this.rowGrandPos === Number(tCell.getAttribute('index'))) {
                     tCell.classList.add('e-gtot');
@@ -1261,6 +1291,12 @@ var Render = /** @class */ (function () {
                 }
                 lvlPos++;
             }
+            if (this.parent.dataSourceSettings.grandTotalsPosition === 'Top' && (!isNullOrUndefined(this.parent.olapEngineModule) && this.parent.olapEngineModule.olapValueAxis === 'row') && this.parent.dataType === 'olap' &&
+                (cell.valueSort.levelName.toString()).indexOf(this.parent.localeObj.getConstant('grandTotal') + this.parent.dataSourceSettings.valueSortSettings.headerDelimiter) === 0) {
+                tCell.appendChild(createElement('span', {
+                    className: cls.NEXTSPAN,
+                }));
+            }
             if (cell.memberType === 3 && cell.level === -1 && Object.keys(this.lvlCollection).length > 1) {
                 tCell.appendChild(createElement('span', {
                     className: cls.NEXTSPAN,
@@ -1574,8 +1610,8 @@ var Render = /** @class */ (function () {
         if (this.parent.currentView !== 'Chart') {
             if (this.gridSettings.height === 'auto' && parHeight && this.parent.element.querySelector('.' + cls.GRID_HEADER)) {
                 var rowColHeight = this.parent.element.querySelector('.' + cls.GRID_HEADER).offsetHeight;
-                var gBarHeight = rowColHeight + (this.parent.element.querySelector('.' + cls.GROUPING_BAR_CLASS) ?
-                    this.parent.element.querySelector('.' + cls.GROUPING_BAR_CLASS).offsetHeight : 0);
+                var gBarHeight = rowColHeight + (this.parent.element.querySelector('.' + cls.GRID_GROUPING_BAR_CLASS) ?
+                    this.parent.element.querySelector('.' + cls.GRID_GROUPING_BAR_CLASS).offsetHeight : 0);
                 var toolBarHeight = this.parent.element.querySelector('.' + cls.GRID_TOOLBAR) ? 42 : 0;
                 gridHeight = parHeight - (gBarHeight + toolBarHeight) - 1;
                 gridHeight = gridHeight < 40 ? 40 : gridHeight;
@@ -1787,7 +1823,7 @@ var Render = /** @class */ (function () {
                     return this.parent.localeObj.getConstant('total') + ' ' + this.parent.localeObj.getConstant(this.parent.engineModule.fieldList[cellInfo.value.toString()].aggregateType)
                         + ' ' + this.parent.localeObj.getConstant('of') + ' ' + cellInfo.value.toString();
                 }
-                else if (values.length === 1) {
+                else if (values.length === 1 && this.parent.dataSourceSettings.rows.length === 0) {
                     return this.parent.localeObj.getConstant('total') + ' ' + this.parent.localeObj.getConstant(values[values.length - 1].type)
                         + ' ' + this.parent.localeObj.getConstant('of') + ' ' + (!isNullOrUndefined(values[values.length - 1].caption) ? values[values.length - 1].caption : values[values.length - 1].name);
                 }
@@ -1809,7 +1845,9 @@ var Render = /** @class */ (function () {
     };
     /* eslint-disable */
     Render.prototype.excelColumnEvent = function (args) {
-        (args.cell).value = this.getValidHeader(args, 'column');
+        if (this.parent.dataSourceSettings.columns.length === 0 && this.parent.dataSourceSettings.valueAxis === 'column') {
+            (args.cell).value = this.getValidHeader(args, 'column');
+        }
         if (args.gridCell !== undefined && args.gridCell.column.width === 'auto') {
             this.parent.lastColumn = args.gridCell.column;
             args.gridCell.column.width = args.gridCell.column.minWidth;
@@ -1818,7 +1856,9 @@ var Render = /** @class */ (function () {
         this.parent.trigger(events.excelHeaderQueryCellInfo, args);
     };
     Render.prototype.pdfColumnEvent = function (args) {
-        (args.cell).value = this.getValidHeader(args, 'column');
+        if (this.parent.dataSourceSettings.columns.length === 0 && this.parent.dataSourceSettings.valueAxis === 'column') {
+            (args.cell).value = this.getValidHeader(args, 'column');
+        }
         if (args.gridCell !== undefined && args.gridCell.column.width === 'auto') {
             this.parent.lastColumn = args.gridCell.column;
             args.gridCell.column.width = args.gridCell.column.minWidth;
@@ -1859,7 +1899,9 @@ var Render = /** @class */ (function () {
             }
         }
         args = this.exportContentEvent(args);
-        args.value = args.column.field === '0.formattedText' ? this.getValidHeader(args, 'row') : args.value;
+        if (this.parent.dataSourceSettings.rows.length === 0 && this.parent.dataSourceSettings.valueAxis === 'row') {
+            args.value = args.column.field === '0.formattedText' ? this.getValidHeader(args, 'row') : args.value;
+        }
         this.parent.trigger(events.excelQueryCellInfo, args);
     };
     /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -1883,7 +1925,9 @@ var Render = /** @class */ (function () {
             }
             args.style = { paragraphIndent: level * 10 };
             this.lastSpan = isValueCell ? this.lastSpan : level;
-            args.value = this.getValidHeader(args, 'row');
+            if (this.parent.dataSourceSettings.rows.length === 0 && this.parent.dataSourceSettings.valueAxis === 'row') {
+                args.value = this.getValidHeader(args, 'row');
+            }
         }
         this.parent.trigger(events.pdfQueryCellInfo, args);
     };