Line 11: |
Line 11: |
| _cell_color = { | | _cell_color = { |
| }, | | }, |
− | _cell = [[| class="${classes}" colspan="${colspan}" rowspan="${rowspan}" style="text-align: ${text_align}; background-color: ${bg_color}; padding:3px;" |${values.value}]], | + | _cell = [[| class="${classes}" colspan="${colspan}" rowspan="${rowspan}" style="text-align:${text_align};background-color:${bg_color}" |${values.value}]], |
| + | _cell_simple = [[|${values.value}]], |
| _empty_cell = [[|]], | | _empty_cell = [[|]], |
| _column_cell_templates = { | | _column_cell_templates = { |
Line 243: |
Line 244: |
| row_values[column].classes = "highlighted " .. (row_values[column].classes or "") | | row_values[column].classes = "highlighted " .. (row_values[column].classes or "") |
| end | | end |
− | if self._column_cell_templates[column] then | + | if row_values[column].simple then |
− | table.insert(self._rows, format(self._column_cell_templates[column], row_values[column])) | + | table.insert(self._rows, format(self._cell_simple, row_values[column])) |
| else | | else |
− | local attrs = {} | + | table.insert(self._rows, format(self._column_cell_templates[column] or self._cell, row_values[column])) |
− | if row_values[column]['classes'] then
| |
− | table.insert(attrs, string.format('class="%s"', row_values[column]['classes']))
| |
− | end
| |
− | if row_values[column]['colspan'] then
| |
− | table.insert(attrs, string.format('colspan="%s"', row_values[column]['colspan']))
| |
− | end
| |
− | if row_values[column]['rowspan'] then
| |
− | table.insert(attrs, string.format('rowspan="%s"', row_values[column]['rowspan']))
| |
− | end
| |
− | local styles = {}
| |
− | if row_values[column]['text_align'] then
| |
− | table.insert(styles, string.format('text-align:%s', row_values[column]['text_align']))
| |
− | end
| |
− | if row_values[column]['bg_color'] then
| |
− | table.insert(styles, string.format('background-color:%s', row_values[column]['bg_color']))
| |
− | end
| |
− | table.insert(self._rows, format(string.format('| %s style="%s" | ${values.value}', table.concat(attrs, ' '), table.concat(styles, ';')), row_values[column]))
| |
| end | | end |
| end | | end |
Line 289: |
Line 273: |
| for _, column in ipairs(self._columns) do | | for _, column in ipairs(self._columns) do |
| if row_values[column] then | | if row_values[column] then |
− | table.insert(self._rows, format(self._column_cell_templates[column] or self._cell, row_values[column])) | + | if row_values[column].simple then |
| + | table.insert(self._rows, format(self._cell_simple, row_values[column])) |
| + | else |
| + | table.insert(self._rows, format(self._column_cell_templates[column] or self._cell, row_values[column])) |
| + | end |
| end | | end |
| end | | end |