ywana-core8 0.0.201 → 0.0.205

package/dist/index.umd.js

@@ -1334,8 +1334,17 @@
     }, /*#__PURE__*/React__default["default"].createElement("table", null, /*#__PURE__*/React__default["default"].createElement("thead", null, /*#__PURE__*/React__default["default"].createElement("tr", null, columns.map(function (_ref) {
       var id = _ref.id,
           label = _ref.label,
+          type = _ref.type,
           sortable = _ref.sortable;
-      return /*#__PURE__*/React__default["default"].createElement("th", null, id === "checked" ? /*#__PURE__*/React__default["default"].createElement(CheckBox, {
+
+      var _ref2 = type === TYPES.ENTITY ? [1, 3] : [2, 1],
+          rowspan = _ref2[0],
+          colspan = _ref2[1];
+
+      return /*#__PURE__*/React__default["default"].createElement("th", {
+        rowSpan: rowspan,
+        colSpan: colspan
+      }, id === "checked" ? /*#__PURE__*/React__default["default"].createElement(CheckBox, {
         onChange: checkAll
       }) : /*#__PURE__*/React__default["default"].createElement(Text, {
         key: "th_" + id
@@ -1344,7 +1353,13 @@
         size: "small",
         clickable: true
       }) : null);
-    }), /*#__PURE__*/React__default["default"].createElement("th", null))), /*#__PURE__*/React__default["default"].createElement("tbody", null, multiSort(rows, sortDir).map(function (row) {
+    }), /*#__PURE__*/React__default["default"].createElement("th", null)), /*#__PURE__*/React__default["default"].createElement("tr", null, "x", columns.filter(function (_ref3) {
+      var type = _ref3.type;
+      return type === TYPES.ENTITY;
+    }).map(function (_ref4) {
+      var label = _ref4.label;
+      return [/*#__PURE__*/React__default["default"].createElement("th", null, label), /*#__PURE__*/React__default["default"].createElement("th", null, label), /*#__PURE__*/React__default["default"].createElement("th", null, label)];
+    }))), /*#__PURE__*/React__default["default"].createElement("tbody", null, multiSort(rows, sortDir).map(function (row) {
       return /*#__PURE__*/React__default["default"].createElement(DataTableRow, {
         key: row.id,
         row: row,
@@ -1400,11 +1415,11 @@
    */
 
 
-  var DataTableCell = function DataTableCell(_ref2) {
-    var row = _ref2.row,
-        column = _ref2.column,
-        cell = _ref2.cell,
-        editable = _ref2.editable;
+  var DataTableCell = function DataTableCell(_ref5) {
+    var row = _ref5.row,
+        column = _ref5.column,
+        cell = _ref5.cell,
+        editable = _ref5.editable;
 
     var render = function render(type) {
       var id = column.id,
@@ -1555,14 +1570,16 @@
     }, render(column.type));
   };
 
-  var EntityCellViewer = function EntityCellViewer(_ref3) {
-    var id = _ref3.id,
-        value = _ref3.value;
+  var EntityCellViewer = function EntityCellViewer(_ref6) {
+    var id = _ref6.id,
+        value = _ref6.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.map(function (v) {
+    }, subcells.filter(function (v) {
+      return !v;
+    }).map(function (v) {
       return /*#__PURE__*/React__default["default"].createElement("div", null, v);
     }));
   };
@@ -1571,9 +1588,9 @@
    */
 
 
-  var BooleanCellViewer = function BooleanCellViewer(_ref4) {
-    var _ref4$value = _ref4.value,
-        value = _ref4$value === void 0 ? false : _ref4$value;
+  var BooleanCellViewer = function BooleanCellViewer(_ref7) {
+    var _ref7$value = _ref7.value,
+        value = _ref7$value === void 0 ? false : _ref7$value;
     var icon = value === true ? "check_box" : "check_box_outline_blank";
     return /*#__PURE__*/React__default["default"].createElement(Icon, {
       icon: icon
@@ -1584,10 +1601,10 @@
    */
 
 
-  var StringCellViewer = function StringCellViewer(_ref5) {
-    var value = _ref5.value,
-        format = _ref5.format,
-        options = _ref5.options;
+  var StringCellViewer = function StringCellViewer(_ref8) {
+    var value = _ref8.value,
+        format = _ref8.format,
+        options = _ref8.options;
     var option = options ? options.find(function (o) {
       return o.value === value;
     }) : null;
@@ -1608,12 +1625,12 @@
    */
 
 
-  var StringCellEditor = function StringCellEditor(_ref6) {
-    var id = _ref6.id,
-        _ref6$value = _ref6.value,
-        value = _ref6$value === void 0 ? '' : _ref6$value,
-        options = _ref6.options,
-        onChange = _ref6.onChange;
+  var StringCellEditor = function StringCellEditor(_ref9) {
+    var id = _ref9.id,
+        _ref9$value = _ref9.value,
+        value = _ref9$value === void 0 ? '' : _ref9$value,
+        options = _ref9.options,
+        onChange = _ref9.onChange;
 
     function change(id, value) {
       if (onChange) onChange(id, value);