Skip to content

[WIP] Multi-row head export #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ladel wants to merge 1 commit into from
Closed

[WIP] Multi-row head export #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions js/buttons.flash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,15 @@ var _exportData = function ( dt, config )
return s;
};

var header = config.header ? join( data.header )+newLine : '';
if (config.header) {
var header = [];
for ( var i=0, ien=data.header.length ; i<ien ; i++ ) {
header.push( join( data.header[i] ) );
}
header.join( newLine );
} else {
var header = '';
}
var footer = config.footer ? newLine+join( data.footer ) : '';
var body = [];

Expand Down Expand Up @@ -765,7 +773,9 @@ DataTable.ext.buttons.excelFlash = $.extend( {}, flashButton, {
};

if ( config.header ) {
xml += addRow( data.header );
for ( var i=0, ien=data.header.length ; i<ien ; i++ ) {
xml += addRow( data.header[i] );
}
}

for ( var i=0, ien=data.body.length ; i<ien ; i++ ) {
Expand Down
28 changes: 20 additions & 8 deletions js/buttons.html5.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,15 @@ var _exportData = function ( dt, config )
return s;
};

var header = config.header ? join( data.header )+newLine : '';
if (config.header) {
var header = [];
for ( var i=0, ien=data.header.length ; i<ien ; i++ ) {
header.push( join( data.header[i] ) );
}
header.join( newLine );
} else {
var header = '';
}
var footer = config.footer ? newLine+join( data.footer ) : '';
var body = [];

Expand Down Expand Up @@ -639,7 +647,9 @@ DataTable.ext.buttons.excelHtml5 = {
};

if ( config.header ) {
xml += addRow( data.header );
for ( var i=0, ien=data.header.length ; i<ien ; i++ ) {
xml += addRow( data.header[i] );
}
}

for ( var i=0, ien=data.body.length ; i<ien ; i++ ) {
Expand Down Expand Up @@ -699,12 +709,14 @@ DataTable.ext.buttons.pdfHtml5 = {
var rows = [];

if ( config.header ) {
rows.push( $.map( data.header, function ( d ) {
return {
text: typeof d === 'string' ? d : d+'',
style: 'tableHeader'
};
} ) );
for ( var i=0, ien=data.header.length ; i<ien ; i++ ) {
rows.push( $.map( data.header[i], function ( d ) {
return {
text: typeof d === 'string' ? d : d+'',
style: 'tableHeader'
};
} ) );
}
}

for ( var i=0, ien=data.body.length ; i<ien ; i++ ) {
Expand Down
6 changes: 5 additions & 1 deletion js/buttons.print.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,11 @@ DataTable.ext.buttons.print = {
var html = '<table class="'+dt.table().node().className+'">';

if ( config.header ) {
html += '<thead>'+ addRow( data.header, 'th' ) +'</thead>';
html += '<thead>';
for ( var i=0, ien=data.header.length ; i<ien ; i++ ) {
html += addRow( data.header[i], 'th' );
}
html += '</thead>';
}

html += '<tbody>';
Expand Down
15 changes: 11 additions & 4 deletions js/dataTables.buttons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1523,10 +1523,17 @@ var _exportData = function ( dt, inOpts )
return str;
};

var headCells = dt.table().context[0].aoHeader;
var header = new Array( headCells.length );
for ( var i=0, ien=headCells.length ; i<ien ; i++ ) {
var rowHead = new Array( headCells[i].length );

var header = dt.columns( config.columns ).indexes().map( function (idx, i) {
return config.format.header( dt.column( idx ).header().innerHTML, idx );
} ).toArray();
for ( var j=0 ; j<headCells[i].length ; j++ ) {
rowHead[j] = config.format.header( headCells[i][j].cell.innerText, j, i );
}

header[i] = rowHead;
}

var footer = dt.table().footer() ?
dt.columns( config.columns ).indexes().map( function (idx, i) {
Expand All @@ -1540,7 +1547,7 @@ var _exportData = function ( dt, inOpts )
.cells( rowIndexes, config.columns )
.render( config.orthogonal )
.toArray();
var columns = header.length;
var columns = header[0].length;
var rows = columns > 0 ? cells.length / columns : 0;
var body = new Array( rows );
var cellCounter = 0;
Expand Down