|
|
@@ -17,7 +17,7 @@ export default initial_vnode => { |
|
|
|
})) |
|
|
|
// merge column options |
|
|
|
columns = columns.map( |
|
|
|
column => column.label in initial_vnode.attrs.columns_options |
|
|
|
column => initial_vnode.attrs.columns_options && column.label in initial_vnode.attrs.columns_options |
|
|
|
? {...initial_vnode.attrs.columns_options[column.label], ...column} : column |
|
|
|
).filter(column => !('display' in column) || column.display != false) |
|
|
|
} |
|
|
@@ -85,7 +85,9 @@ export default initial_vnode => { |
|
|
|
} |
|
|
|
|
|
|
|
return [ |
|
|
|
m('table', [ |
|
|
|
m('table', { |
|
|
|
style: vnode.attrs.show ? undefined : {display: 'none'}, |
|
|
|
}, [ |
|
|
|
// always show table header |
|
|
|
m('thead', m('tr', [ |
|
|
|
vnode.attrs.serial ? m('th.centered', '序号') : undefined, |
|
|
@@ -105,7 +107,7 @@ export default initial_vnode => { |
|
|
|
]))) : m('', 'Empty') |
|
|
|
]), |
|
|
|
// page navigation |
|
|
|
pages.length > 1 ? |
|
|
|
pages.length > 1 && vnode.attrs.show ? |
|
|
|
m('.centered', |
|
|
|
m('.pagination.centered', pages.map((page, i) => page.show ? m('a', { |
|
|
|
class: page.active ? 'active' : '', |
|
|
|