@@ -56,23 +56,23 @@ export class PivotRowDimensionsStrategy implements IPivotDimensionStrategy {
5656 . processHierarchy ( hierarchyFields , newData [ i ] ?? [ ] , pivotKeys , 0 ) ;
5757 PivotUtil . processSiblingProperties ( newData [ i ] , siblingData , pivotKeys ) ;
5858
59- PivotUtil . processSubGroups ( row , prevRowDims . slice ( 0 ) , siblingData , pivotKeys ) ;
60- if ( PivotUtil . getDimensionDepth ( prevDim ) > PivotUtil . getDimensionDepth ( row ) && siblingData . length > 1 ) {
61- newData [ i ] [ row . memberName + '_' + pivotKeys . records ] = siblingData ;
62- i ++ ;
63- } else {
64- newData . splice ( i , 1 , ...siblingData ) ;
65- i += siblingData . length - 1 ;
66- }
59+ PivotUtil . processSubGroups ( row , prevRowDims . slice ( 0 ) , siblingData , pivotKeys ) ;
60+ if ( PivotUtil . getDimensionDepth ( prevDim ) > PivotUtil . getDimensionDepth ( row ) && siblingData . length > 1 ) {
61+ newData [ i ] [ row . memberName + '_' + pivotKeys . records ] = siblingData ;
62+ i ++ ;
63+ } else {
64+ newData . splice ( i , 1 , ...siblingData ) ;
65+ i += siblingData . length - 1 ;
6766 }
68- data = newData ;
69- prevDim = row ;
70- prevRowDims . push ( row ) ;
7167 }
68+ data = newData ;
69+ prevDim = row ;
70+ prevRowDims . push ( row ) ;
7271 }
73- return data ;
7472 }
73+ return data ;
7574 }
75+ }
7676
7777export class PivotColumnDimensionsStrategy implements IPivotDimensionStrategy {
7878 private static _instance : PivotRowDimensionsStrategy = null ;
@@ -175,7 +175,7 @@ export class DimensionValuesFilteringStrategy extends FilteringStrategy {
175175 }
176176
177177 protected getFieldValue ( rec : any , fieldName : string , isDate : boolean = false , isTime : boolean = false ,
178- grid ?: PivotGridType ) : any {
178+ grid ?: PivotGridType ) : any {
179179 const config = grid . pivotConfiguration ;
180180 const allDimensions = config . rows . concat ( config . columns ) . concat ( config . filters ) . filter ( x => x !== null ) ;
181181 const enabledDimensions = allDimensions . filter ( x => x && x . enabled ) ;
@@ -191,13 +191,13 @@ export class DefaultPivotSortingStrategy extends DefaultSortingStrategy {
191191 return this . _instance || ( this . _instance = new this ( ) ) ;
192192 }
193193 public sort ( data : any [ ] ,
194- fieldName : string ,
195- dir : SortingDirection ,
196- ignoreCase : boolean ,
197- valueResolver : ( obj : any , key : string , isDate ?: boolean ) => any ,
198- isDate ?: boolean ,
199- isTime ?: boolean ,
200- grid ?: PivotGridType ) {
194+ fieldName : string ,
195+ dir : SortingDirection ,
196+ ignoreCase : boolean ,
197+ valueResolver : ( obj : any , key : string , isDate ?: boolean ) => any ,
198+ isDate ?: boolean ,
199+ isTime ?: boolean ,
200+ grid ?: PivotGridType ) {
201201 const key = fieldName ;
202202 const config = grid . pivotConfiguration ;
203203 const allDimensions = config . rows . concat ( config . columns ) . concat ( config . filters ) . filter ( x => x !== null ) ;
0 commit comments