|
@@ -576,7 +576,8 @@
|
|
|
searchable: true,
|
|
searchable: true,
|
|
|
searchFormatter: true,
|
|
searchFormatter: true,
|
|
|
cardVisible: true,
|
|
cardVisible: true,
|
|
|
- escape : false
|
|
|
|
|
|
|
+ escape: false,
|
|
|
|
|
+ showSelectTitle: false
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
BootstrapTable.EVENTS = {
|
|
BootstrapTable.EVENTS = {
|
|
@@ -840,7 +841,8 @@
|
|
|
align = sprintf('text-align: %s; ', column.align);
|
|
align = sprintf('text-align: %s; ', column.align);
|
|
|
style = sprintf('vertical-align: %s; ', column.valign);
|
|
style = sprintf('vertical-align: %s; ', column.valign);
|
|
|
style += sprintf('width: %s; ', (column.checkbox || column.radio) && !width ?
|
|
style += sprintf('width: %s; ', (column.checkbox || column.radio) && !width ?
|
|
|
- '36px' : (width ? width + unitWidth : undefined));
|
|
|
|
|
|
|
+ (!column.showSelectTitle ? '36px' : undefined) :
|
|
|
|
|
+ (width ? width + unitWidth : undefined));
|
|
|
|
|
|
|
|
if (typeof column.fieldIndex !== 'undefined') {
|
|
if (typeof column.fieldIndex !== 'undefined') {
|
|
|
that.header.fields[column.fieldIndex] = column.field;
|
|
that.header.fields[column.fieldIndex] = column.field;
|
|
@@ -880,7 +882,9 @@
|
|
|
|
|
|
|
|
text = that.options.escape ? escapeHTML(column.title) : column.title;
|
|
text = that.options.escape ? escapeHTML(column.title) : column.title;
|
|
|
|
|
|
|
|
|
|
+ var title = text;
|
|
|
if (column.checkbox) {
|
|
if (column.checkbox) {
|
|
|
|
|
+ text = '';
|
|
|
if (!that.options.singleSelect && that.options.checkboxHeader) {
|
|
if (!that.options.singleSelect && that.options.checkboxHeader) {
|
|
|
text = '<input name="btSelectAll" type="checkbox" />';
|
|
text = '<input name="btSelectAll" type="checkbox" />';
|
|
|
}
|
|
}
|
|
@@ -891,6 +895,9 @@
|
|
|
that.header.stateField = column.field;
|
|
that.header.stateField = column.field;
|
|
|
that.options.singleSelect = true;
|
|
that.options.singleSelect = true;
|
|
|
}
|
|
}
|
|
|
|
|
+ if (!text && column.showSelectTitle) {
|
|
|
|
|
+ text += title;
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
html.push(text);
|
|
html.push(text);
|
|
|
html.push('</div>');
|
|
html.push('</div>');
|