@@ -321,17 +321,17 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
321
321
private p_id = `igx-pivot-grid-${ NEXT_ID ++ } ` ;
322
322
323
323
324
- /**
325
- * Gets/Sets the default expand state for all rows.
326
- */
327
- @Input ( )
328
- public get defaultExpandState ( ) {
329
- return this . _defaultExpandState ;
330
- }
324
+ /**
325
+ * Gets/Sets the default expand state for all rows.
326
+ */
327
+ @Input ( )
328
+ public get defaultExpandState ( ) {
329
+ return this . _defaultExpandState ;
330
+ }
331
331
332
- public set defaultExpandState ( val : boolean ) {
333
- this . _defaultExpandState = val ;
334
- }
332
+ public set defaultExpandState ( val : boolean ) {
333
+ this . _defaultExpandState = val ;
334
+ }
335
335
336
336
/**
337
337
* @hidden @internal
@@ -604,7 +604,8 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
604
604
this . pivotKeys
605
605
) ;
606
606
const flatData = Array . from ( allValuesHierarchy . values ( ) ) ;
607
- columnValues = flatData . map ( record => this . extractValue ( record [ 'value' ] ) ) ;
607
+ // Note: Once ESF supports tree view, we should revert this back.
608
+ columnValues = flatData . map ( record => record [ 'value' ] ) ;
608
609
done ( columnValues ) ;
609
610
return ;
610
611
}
@@ -987,18 +988,18 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
987
988
groupColumn . hidden = state ;
988
989
this . columnGroupStates . set ( groupColumn . field , state ) ;
989
990
const childrenTotal = this . hasMultipleValues ?
990
- groupColumn . children . filter ( x => x . columnGroup && x . children . filter ( y => ! y . columnGroup ) . length === this . values . length ) :
991
- groupColumn . children . filter ( x => ! x . columnGroup ) ;
992
- const childrenSubgroups = this . hasMultipleValues ?
993
- groupColumn . children . filter ( x => x . columnGroup && x . children . filter ( y => ! y . columnGroup ) . length === 0 ) :
994
- groupColumn . children . filter ( x => x . columnGroup ) ;
995
- childrenTotal . forEach ( group => {
991
+ groupColumn . children . filter ( x => x . columnGroup && x . children . filter ( y => ! y . columnGroup ) . length === this . values . length ) :
992
+ groupColumn . children . filter ( x => ! x . columnGroup ) ;
993
+ const childrenSubgroups = this . hasMultipleValues ?
994
+ groupColumn . children . filter ( x => x . columnGroup && x . children . filter ( y => ! y . columnGroup ) . length === 0 ) :
995
+ groupColumn . children . filter ( x => x . columnGroup ) ;
996
+ childrenTotal . forEach ( group => {
996
997
if ( state ) {
997
998
group . headerTemplate = this . headerTemplate ;
998
999
} else {
999
1000
group . headerTemplate = undefined ;
1000
1001
}
1001
- } ) ;
1002
+ } ) ;
1002
1003
if ( ! groupColumn . hidden && childrenSubgroups . length > 0 ) {
1003
1004
childrenSubgroups . forEach ( group => {
1004
1005
this . resolveToggle ( group , state ) ;
@@ -1216,7 +1217,4 @@ export class IgxPivotGridComponent extends IgxGridBaseDirective implements OnIni
1216
1217
} ) ;
1217
1218
return cols ;
1218
1219
}
1219
- private extractValue ( value ) {
1220
- return value . split ( this . pivotKeys . columnDimensionSeparator ) [ value . split ( this . pivotKeys . columnDimensionSeparator ) . length - 1 ] ;
1221
- }
1222
1220
}
0 commit comments