|
@@ -380,7 +380,7 @@
|
|
|
rowAttributes: function (row, index) {
|
|
rowAttributes: function (row, index) {
|
|
|
return {};
|
|
return {};
|
|
|
},
|
|
},
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
footerStyle: function (row, index) {
|
|
footerStyle: function (row, index) {
|
|
|
return {};
|
|
return {};
|
|
|
},
|
|
},
|
|
@@ -2155,31 +2155,31 @@
|
|
|
csses = [],
|
|
csses = [],
|
|
|
style = {},
|
|
style = {},
|
|
|
class_ = sprintf(' class="%s"', column['class']);
|
|
class_ = sprintf(' class="%s"', column['class']);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (!column.visible) {
|
|
if (!column.visible) {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (that.options.cardView && (!column.cardVisible)) {
|
|
if (that.options.cardView && (!column.cardVisible)) {
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
falign = sprintf('text-align: %s; ', column.falign ? column.falign : column.align);
|
|
falign = sprintf('text-align: %s; ', column.falign ? column.falign : column.align);
|
|
|
valign = sprintf('vertical-align: %s; ', column.valign);
|
|
valign = sprintf('vertical-align: %s; ', column.valign);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
style = calculateObjectValue(null, that.options.footerStyle);
|
|
style = calculateObjectValue(null, that.options.footerStyle);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (style && style.css) {
|
|
if (style && style.css) {
|
|
|
for (key in style.css) {
|
|
for (key in style.css) {
|
|
|
csses.push(key + ': ' + style.css[key]);
|
|
csses.push(key + ': ' + style.css[key]);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
html.push('<td', class_, sprintf(' style="%s"', falign + valign + csses.concat().join('; ')), '>');
|
|
html.push('<td', class_, sprintf(' style="%s"', falign + valign + csses.concat().join('; ')), '>');
|
|
|
html.push('<div class="th-inner">');
|
|
html.push('<div class="th-inner">');
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
html.push(calculateObjectValue(column, column.footerFormatter, [data], ' ') || ' ');
|
|
html.push(calculateObjectValue(column, column.footerFormatter, [data], ' ') || ' ');
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
html.push('</div>');
|
|
html.push('</div>');
|
|
|
html.push('<div class="fht-cell"></div>');
|
|
html.push('<div class="fht-cell"></div>');
|
|
|
html.push('</div>');
|
|
html.push('</div>');
|