ywana-core8 0.0.210 → 0.0.214

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ywana-core8",
-  "version": "0.0.210",
+  "version": "0.0.214",
   "description": "ywana-core8",
   "author": "Ernesto Roldan Garcia",
   "license": "MIT",

package/src/domain/TablePage.js

@@ -335,7 +335,7 @@ const TableEditor = (props) => {
                             label: field.label,
                             type: field.type,
                             format: field.format,
-                            subcolumns: field.item ? field.item : [],
+                            item: field.item ? field.item : [],
                             onChange: field.id === "checked" ? checkOne : field.editable ? change : null,     /* checked has it´s own handler */
                             options
                         }

package/src/html/table.js

@@ -74,9 +74,9 @@ export const DataTable = (props) => {
             <table>
                 <thead>
                     <tr>
-                        {columns.map(({ id, label, type, sortable }) => {
+                        {columns.map(({ id, label, type, item, sortable }) => {
                             const sort = sortDir[id] ? sortDir[id] : null
-                            const [rowspan, colspan] = type === TYPES.ENTITY ? [1, 3] : [2, 1]
+                            const [rowspan, colspan] = type === TYPES.ENTITY ? [1, Object.keys(item).length] : [2, 1]
                             return (
                                 <th rowSpan={rowspan} colSpan={colspan}>
                                     {id === "checked" ? <CheckBox onChange={checkAll} /> : <Text key={`th_${id}`}>{label}</Text>}
@@ -90,7 +90,13 @@ export const DataTable = (props) => {
                         {
                             columns
                                 .filter(({ type }) => type === TYPES.ENTITY)
-                                .map(({ subcolumns }) => subcolumns.map(subcolumn => <th>{subcolumn.label}</th>))
+                                .map(column => {
+                                    const { item } = column
+                                    const fields = item ? Object.values(item) : []
+                                    return fields
+                                        .filter(field => field.column === true)
+                                        .map(field => <th>{field.label}</th>)
+                                })
                         }
                     </tr>
                 </thead>