|
|
@@ -70,7 +70,7 @@ export default initial_vnode => { |
|
|
|
columns = model.data(offset, limit) && model.data(offset, limit).length && Object.keys(model.data(offset, limit)[0]).map(key => ({label: key})) || [] |
|
|
|
// merge column options |
|
|
|
columns = columns.map( |
|
|
|
column => column.label in initial_vnode.attrs.columns_options |
|
|
|
column => initial_vnode.attrs.columns_options && initial_vnode.attrs.columns_options[column.label] |
|
|
|
? {...initial_vnode.attrs.columns_options[column.label], ...column} : column |
|
|
|
).filter(column => !('display' in column) || column.display != false) |
|
|
|
} |
|
|
|