ywana-core8 0.0.211 → 0.0.215

package/dist/index.cjs

@@ -1338,9 +1338,10 @@ var DataTable = function DataTable(props) {
     var id = _ref.id,
         label = _ref.label,
         type = _ref.type,
+        item = _ref.item,
         sortable = _ref.sortable;
 
-    var _ref2 = type === TYPES.ENTITY ? [1, 3] : [2, 1],
+    var _ref2 = type === TYPES.ENTITY ? [1, Object.keys(item).length] : [2, 1],
         rowspan = _ref2[0],
         colspan = _ref2[1];
 
@@ -1363,10 +1364,11 @@ var DataTable = function DataTable(props) {
     var type = _ref3.type;
     return type === TYPES.ENTITY;
   }).map(function (column) {
-    var _column$item = column.item,
-        item = _column$item === void 0 ? [] : _column$item;
-    console.log("subheader", column, item);
-    return item.map(function (field) {
+    var item = column.item;
+    var fields = item ? Object.values(item) : [];
+    return fields.filter(function (field) {
+      return field.column === true;
+    }).map(function (field) {
       return /*#__PURE__*/React__default["default"].createElement("th", null, field.label);
     });
   }))), /*#__PURE__*/React__default["default"].createElement("tbody", null, multiSort(rows, sortDir).map(function (row) {
@@ -1562,36 +1564,39 @@ var DataTableCell = function DataTableCell(_ref4) {
             options: options
           });
 
-        case TYPES.ENTITY:
-          return /*#__PURE__*/React__default["default"].createElement(EntityCellViewer, {
-            id: id,
-            value: cell
-          });
-
         default:
           return cell;
       }
     }
   };
 
-  return /*#__PURE__*/React__default["default"].createElement("td", {
+  return column.type === TYPES.ENTITY ? /*#__PURE__*/React__default["default"].createElement(EntityCellViewer, {
+    id: id,
+    item: item,
+    value: cell
+  }) : /*#__PURE__*/React__default["default"].createElement("td", {
     key: column.id,
     className: column.id
   }, render(column.type));
 };
+/**
+ * Entity Cell Viewer
+ * @param {*} param0 
+ * @returns 
+ */
+
 
 var EntityCellViewer = function EntityCellViewer(_ref5) {
   var id = _ref5.id,
+      item = _ref5.item,
       value = _ref5.value;
-  console.log(id, value);
-  var subcells = value ? Object.values(value) : [1, 2, 3];
-  return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "entity-cell-viewer"
-  }, subcells.filter(function (v) {
-    return !v;
-  }).map(function (v) {
-    return /*#__PURE__*/React__default["default"].createElement("div", null, v);
-  }));
+  console.log(id, item, value);
+  var fields = Object.values(item).filter(function (field) {
+    return field.column === true;
+  });
+  return fields.map(function (field) {
+    return /*#__PURE__*/React__default["default"].createElement("td", null, value[field.id]);
+  });
 };
 /**
  * Boolean Cell Viewer