@@ -434,22 +434,13 @@ DataController.prototype.resetRawData = function () {
434
434
435
435
} ;
436
436
437
- var applyHeaderStyle = function ( cellObject , isHorizontal , previousHeaders ) {
437
+ var applyHeaderStyle = function ( cellObject , isHorizontal ) {
438
438
if ( ! _ . controller . CONFIG [ "pivotProperties" ] ) return ;
439
439
if ( _ . controller . CONFIG [ "pivotProperties" ] [ "columnHeaderStyle" ] && isHorizontal ) {
440
- cellObject . style =
441
- _ . controller . CONFIG [ "pivotProperties" ] [ "columnHeaderStyle" ] + cellObject . style ;
440
+ cellObject . style = _ . controller . CONFIG [ "pivotProperties" ] [ "columnHeaderStyle" ] ;
442
441
} else if ( _ . controller . CONFIG [ "pivotProperties" ] [ "rowHeaderStyle" ] && ! isHorizontal ) {
443
- cellObject . style =
444
- _ . controller . CONFIG [ "pivotProperties" ] [ "rowHeaderStyle" ] + cellObject . style ;
442
+ cellObject . style = _ . controller . CONFIG [ "pivotProperties" ] [ "rowHeaderStyle" ] ;
445
443
}
446
- if ( typeof previousHeaders === "undefined" )
447
- return ;
448
- var prevStyles = previousHeaders . reduce (
449
- function ( acc , h ) { return acc + ( h . style || "" ) } , ""
450
- ) ;
451
- if ( prevStyles )
452
- cellObject . style += prevStyles ;
453
444
} ;
454
445
455
446
var getMaxLevel = function ( children , level ) {
@@ -498,20 +489,18 @@ DataController.prototype.resetRawData = function () {
498
489
group : cnum ,
499
490
source : c [ i ] ,
500
491
isCaption : true ,
501
- value : c [ i ] . caption || "" ,
502
- style : c [ i ] . style || ""
492
+ value : c [ i ] . caption || ""
503
493
} ;
504
- applyHeaderStyle ( obj , hor , arr ) ;
494
+ applyHeaderStyle ( obj , hor ) ;
505
495
dim1raw ( a , c [ i ] . children , arr . concat ( obj ) , hor , level ? level + 1 : level , maxLevel ) ;
506
496
} else {
507
497
obj = {
508
498
group : groupNum ,
509
499
source : c [ i ] ,
510
500
isCaption : true ,
511
- value : c [ i ] . caption || "" ,
512
- style : c [ i ] . style || ""
501
+ value : c [ i ] . caption || ""
513
502
} ;
514
- applyHeaderStyle ( obj , hor , arr ) ;
503
+ applyHeaderStyle ( obj , hor ) ;
515
504
a . push ( c [ i ] [ "type" ] === "msr" && MEASURES_HIDDEN ? arr : arr . concat ( obj ) ) ;
516
505
groupNum ++ ;
517
506
}
0 commit comments