Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

printTable

This commit is contained in:
Jan Steemann 2013-03-29 01:53:16 +01:00
parent 82cbde7886
commit 0807016cf5
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
html/admin/js/bootstrap/module-internal.js
View File

@ -1136,18 +1136,29 @@
var pad = '...'; var pad = '...';
var descriptions, matrix, col, what, j, value; var descriptions, matrix, col, what, j, value;
if (columns === undefined) {
what = list[0];
}
else if (Array.isArray(columns)) {
what = { };
columns.forEach(function (col) {
what[col] = null;
});
}
else {
what = columns;
}
j = 0;
descriptions = [ ]; descriptions = [ ];
matrix = [ [ ] ]; matrix = [ [ ] ];
what = (columns === undefined ? list[0] : columns);
j = 0;
for (col in what) { for (col in what) {
if (what.hasOwnProperty(col)) { if (what.hasOwnProperty(col)) {
var fixedLength = null; var fixedLength = null;
if (columns && columns.hasOwnProperty(col) && columns[col] > 0) { if (columns && columns.hasOwnProperty(col) && columns[col] > 0) {
fixedLength = columns[col] >= pad.length ? columns[col] : pad.length; fixedLength = columns[col] >= pad.length ? columns[col] : pad.length;
} }
descriptions.push({ id: col, name: col, fixedLength: fixedLength, length: fixedLength || 0 }); descriptions.push({ id: col, name: col, fixedLength: fixedLength, length: fixedLength || col.length });
matrix[0][j++] = col; matrix[0][j++] = col;
} }
} }

19
js/common/bootstrap/module-internal.js
View File

@ -1136,18 +1136,29 @@
var pad = '...'; var pad = '...';
var descriptions, matrix, col, what, j, value; var descriptions, matrix, col, what, j, value;
if (columns === undefined) {
what = list[0];
}
else if (Array.isArray(columns)) {
what = { };
columns.forEach(function (col) {
what[col] = null;
});
}
else {
what = columns;
}
j = 0;
descriptions = [ ]; descriptions = [ ];
matrix = [ [ ] ]; matrix = [ [ ] ];
what = (columns === undefined ? list[0] : columns);
j = 0;
for (col in what) { for (col in what) {
if (what.hasOwnProperty(col)) { if (what.hasOwnProperty(col)) {
var fixedLength = null; var fixedLength = null;
if (columns && columns.hasOwnProperty(col) && columns[col] > 0) { if (columns && columns.hasOwnProperty(col) && columns[col] > 0) {
fixedLength = columns[col] >= pad.length ? columns[col] : pad.length; fixedLength = columns[col] >= pad.length ? columns[col] : pad.length;
} }
descriptions.push({ id: col, name: col, fixedLength: fixedLength, length: fixedLength || 0 }); descriptions.push({ id: col, name: col, fixedLength: fixedLength, length: fixedLength || col.length });
matrix[0][j++] = col; matrix[0][j++] = col;
} }
} }