From 0a5aba42651b3413d6a2e608d2196b5c3692611e Mon Sep 17 00:00:00 2001 From: Bing Sun Date: Mon, 11 May 2020 11:12:22 +0800 Subject: [PATCH] Table: column_options --- src/components/Table.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/Table.js b/src/components/Table.js index e5b9959..e5f289b 100644 --- a/src/components/Table.js +++ b/src/components/Table.js @@ -1,5 +1,5 @@ /* - columns_options: {} + column_options: {} serial: true/false, model: model */ @@ -17,8 +17,8 @@ export default initial_vnode => { })) // merge column options 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) } @@ -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})) || [] // merge column options 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) }