|
@@ -1,5 +1,5 @@ |
|
|
/* |
|
|
/* |
|
|
columns_options: {} |
|
|
|
|
|
|
|
|
column_options: {} |
|
|
serial: true/false, |
|
|
serial: true/false, |
|
|
model: model |
|
|
model: model |
|
|
*/ |
|
|
*/ |
|
@@ -17,8 +17,8 @@ export default initial_vnode => { |
|
|
})) |
|
|
})) |
|
|
// merge column options |
|
|
// merge column options |
|
|
columns = columns.map( |
|
|
columns = columns.map( |
|
|
column => initial_vnode.attrs.columns_options && column.label in initial_vnode.attrs.columns_options |
|
|
|
|
|
? {...initial_vnode.attrs.columns_options[column.label], ...column} : column |
|
|
|
|
|
|
|
|
column => initial_vnode.attrs.column_options && column.label in initial_vnode.attrs.column_options |
|
|
|
|
|
? {...initial_vnode.attrs.column_options[column.label], ...column} : column |
|
|
).filter(column => !('display' in column) || column.display != false) |
|
|
).filter(column => !('display' in column) || column.display != false) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
@@ -70,8 +70,8 @@ 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})) || [] |
|
|
columns = model.data(offset, limit) && model.data(offset, limit).length && Object.keys(model.data(offset, limit)[0]).map(key => ({label: key})) || [] |
|
|
// merge column options |
|
|
// merge column options |
|
|
columns = columns.map( |
|
|
columns = columns.map( |
|
|
column => initial_vnode.attrs.columns_options && initial_vnode.attrs.columns_options[column.label] |
|
|
|
|
|
? {...initial_vnode.attrs.columns_options[column.label], ...column} : column |
|
|
|
|
|
|
|
|
column => initial_vnode.attrs.column_options && initial_vnode.attrs.column_options[column.label] |
|
|
|
|
|
? {...initial_vnode.attrs.column_options[column.label], ...column} : column |
|
|
).filter(column => !('display' in column) || column.display != false) |
|
|
).filter(column => !('display' in column) || column.display != false) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|