es-grid-template 0.0.13 → 0.1.1

package/lib/{table-grid → grid-component}/styles.scss

@@ -5,12 +5,13 @@ $rowHoverBg: #FBDED6 !default;
 $rowSelectedBg: #FEF2EF !default;
 //$tableBorderColor: red !default;
 $tableBorderColor: #e0e0e0 !default;
+//$tableBorderColor: #f0f0f0 !default;
 $border-radius: 6px !default;
 $body-color: #ffffff !default;
 $cell-selected-bg: #E6EFFD !default;
 $cell-index-selected-bg: #0550C5 !default;
 $cell-index-focus-bg: #CEDBEF !default;
-//$rowSelectedHoverBg: 'ui-rc' !default;
+$rowSelectedHoverBg: 'ui-rc' !default;
 
 .react-hot-toast {
   font-size: 1rem;
@@ -46,60 +47,187 @@ $cell-index-focus-bg: #CEDBEF !default;
 }
 
 // -------------- Table -------------
+
 .#{$prefix}-table-wrapper {
-  &.table-none-column-select {
+
+  .#{$prefix}-table-tbody-virtual {
     .#{$prefix}-table-cell {
-      &.#{$prefix}-table-selection-column {
-        padding: 0 !important;
-        overflow: hidden !important;
-        border-inline-end: 0 !important;
-        //flex: 0 0 0 !important;
-        //width: 0 !important;
-      }
+      border-bottom: 1px solid $tableBorderColor;
     }
   }
 
+  .#{$prefix}-table-bordered {
+
+    .#{$prefix}-table-tbody-virtual {
+      .#{$prefix}-table-cell {
+        border-inline-end: 1px solid $tableBorderColor;
+      }
+    }
+
+  }
 
   .#{$prefix}-table-tbody {
     .#{$prefix}-table-row {
       &.#{$prefix}-table-row-selected {
-        >.#{$prefix}-table-cell {
+        > .#{$prefix}-table-cell {
           background: #FEF2EF;
         }
       }
-      >.#{$prefix}-table-cell {
+
+      > .#{$prefix}-table-cell {
         &.#{$prefix}-table-cell-row-hover {
           background: #FBDED6;
         }
+
+        &.ui-rc-cell-command {
+          padding: 3px 8px;
+
+          .ui-rc-cell-command__content {
+            display: flex;
+            gap: 5px;
+            overflow: hidden;
+          }
+        }
+
+
+      }
+    }
+  }
+
+  .#{$prefix}-table-thead {
+
+    > tr {
+      > th,
+      > td {
+        border-bottom: 1px solid $tableBorderColor;
       }
     }
 
+    .ui-rc-table-cell {
+      &.ui-rc-table-cell-fix-left-last {
+        .ui-rc-table-cell-content {
+          //overflow: visible;
+        }
+      }
+    }
   }
 
-  .#{$prefix}-table-tbody-virtual {
+  .#{$prefix}-table-summary {
     .#{$prefix}-table-cell {
+      background-color: #fafafa;
+    }
+
+    > tr > td {
       border-bottom: 1px solid $tableBorderColor;
     }
   }
 
-  .#{$prefix}-table-bordered {
+  .#{$prefix}-table-bordered .#{$prefix}-table-tbody-virtual .#{$prefix}-table-cell.#{$prefix}-table-cell-fix-right-first:before {
+    border-inline-start: 1px solid $tableBorderColor;
+  }
 
-    .#{$prefix}-table-tbody-virtual {
-      .#{$prefix}-table-cell {
-        border-inline-end: 1px solid $tableBorderColor;
+  .#{$prefix}-table {
+
+    &.#{$prefix}-table-bordered {
+      > .#{$prefix}-table-container {
+        border-inline-start: 1px solid $tableBorderColor;
+        border-top: 1px solid $tableBorderColor;
+
+        > .#{$prefix}-table-content,
+        > .#{$prefix}-table-header,
+        > .#{$prefix}-table-body,
+        > .#{$prefix}-table-summary {
+          > table {
+            > thead {
+              > tr:not(:last-child) {
+                > th {
+                  border-bottom: 1px solid #eb4619;
+                }
+              }
+            }
+          }
+        }
+
+
+        > .#{$prefix}-table-content,
+        > .#{$prefix}-table-header,
+        > .#{$prefix}-table-body,
+        > .#{$prefix}-table-summary {
+          > table {
+            > thead,
+            > tbody,
+            > tfoot {
+              > tr {
+                > th,
+                > td {
+                  border-inline-end: 1px solid $tableBorderColor;
+                }
+              }
+            }
+          }
+        }
+
+      }
+
+      > .#{$prefix}-table-title {
+        border: 1px solid $tableBorderColor;
+        border-bottom: 0;
       }
     }
 
+    &.#{$prefix}-table-ping-right:not(.#{$prefix}-table-has-fix-right) .#{$prefix}-table-container::after {
+      box-shadow: inset -10px 0 8px -8px rgba(5, 5, 5, 0.2);
+    }
+
   }
 
-  // ---------------- grid-editable---------------
+  .#{$prefix}-table-ping-left {
+    .#{$prefix}-table-cell-fix-left-first::after,
+    .#{$prefix}-table-cell-fix-left-last::after {
+      box-shadow: inset 10px 0 8px -8px rgba(5, 5, 5, 0.1);
+    }
+  }
+
+  .#{$prefix}-table-ping-right {
+    .#{$prefix}-table-cell-fix-right-first::after,
+    .#{$prefix}-table-cell-fix-right-last::after {
+      box-shadow: inset -10px 0 8px -8px rgba(5, 5, 5, 0.1);
+    }
+  }
+
+
+  .#{$prefix}-table.#{$prefix}-table-bordered {
+    > .#{$prefix}-table-container {
+      > .#{$prefix}-table-header > table > thead > tr,
+      > .#{$prefix}-table-summary > table > tfoot > tr {
+        > .#{$prefix}-table-cell-fix-right-first::before {
+          border-inline-start: 1px solid red;
+          content: "";
+          position: absolute;
+          inset-block: 0;
+          inset-inline-start: -1px;
+        }
+      }
+    }
+  }
+
+
+}
+
+// -------------- Table edit-------------
+
+.#{$prefix}-table-wrapper {
 
   &.grid-editable {
 
-    .#{$prefix}-table.#{$prefix}-table-small .#{$prefix}-table-cell,
-    .#{$prefix}-table.#{$prefix}-table-small .cell-editable,
-    .#{$prefix}-table.#{$prefix}-table-small .#{$prefix}-table-tbody>tr>th,
-    .#{$prefix}-table.#{$prefix}-table-small .#{$prefix}-table-tbody>tr>td {
+    //.#{$prefix}-table.#{$prefix}-table-small .#{$prefix}-table-cell,
+    //.#{$prefix}-table.#{$prefix}-table-small .cell-editable,
+    //.#{$prefix}-table.#{$prefix}-table-small .#{$prefix}-table-tbody>tr>th,
+    //.#{$prefix}-table.#{$prefix}-table-small .#{$prefix}-table-tbody>tr>td {
+    //  padding: 0;
+    //}
+
+    .#{$prefix}-table.#{$prefix}-table-small .rc-ui-cell-editable{
       padding: 0;
     }
 
@@ -198,163 +326,19 @@ $cell-index-focus-bg: #CEDBEF !default;
 
   }
 
-  // ---------------- grid-editable---------------
-
-  .#{$prefix}-table {
-
-   &.#{$prefix}-table-ping-right:not(.#{$prefix}-table-has-fix-right) .#{$prefix}-table-container::after {
-     box-shadow: inset -10px 0 8px -8px rgba(5, 5, 5, 0.2);
-   }
-
-    &.#{$prefix}-table-bordered {
-      > .#{$prefix}-table-container {
-        border-inline-start: 1px solid $tableBorderColor;
-        //border-inline-end: 1px solid $tableBorderColor;
-        border-top: 1px solid $tableBorderColor;
-
-        > .#{$prefix}-table-content,
-        > .#{$prefix}-table-header,
-        > .#{$prefix}-table-body,
-        > .#{$prefix}-table-summary {
-          > table {
-            > thead {
-              > tr:not(:last-child) {
-                > th {
-                  border-bottom: 1px solid $tableBorderColor;
-                }
-              }
-            }
-          }
-        }
-
-
-
-
-        > .#{$prefix}-table-content,
-        > .#{$prefix}-table-header,
-        > .#{$prefix}-table-body,
-        > .#{$prefix}-table-summary {
-          > table {
-            > thead,
-            > tbody,
-            > tfoot {
-              > tr {
-                > th,
-                > td {
-                  border-inline-end: 1px solid $tableBorderColor;
-                }
-              }
-            }
-          }
-        }
-
-      }
-
-      >.#{$prefix}-table-title {
-        border: 1px solid $tableBorderColor;
-        border-bottom: 0;
-      }
-    }
-
-
-    .#{$prefix}-select-single .#{$prefix}-select-selector {
-      border-radius: 0;
-    }
-  }
-
-
-  .#{$prefix}-table-thead >tr>th,
-  .#{$prefix}-table-thead >tr>td {
-    background-color: #ffffff;
-  }
-
-  .#{$prefix}-table-thead {
-
-    > tr {
-      > th,
-      > td {
-        border-bottom: 1px solid $tableBorderColor;
-      }
-    }
-    .ui-rc-table-cell {
-      &.ui-rc-table-cell-fix-left-last {
-        .ui-rc-table-cell-content {
-          overflow: visible;
-        }
-      }
-    }
-  }
-
-  .#{$prefix}-table-summary {
-    .#{$prefix}-table-cell {
-      background-color: #fafafa;
-    }
-
-    > tr > td {
-      border-bottom: 1px solid $tableBorderColor;
-    }
-  }
-
-  .#{$prefix}-table-bordered .#{$prefix}-table-tbody-virtual .#{$prefix}-table-cell.#{$prefix}-table-cell-fix-right-first:before {
-    border-inline-start: 1px solid $tableBorderColor;
-  }
-
-  .#{$prefix}-table.#{$prefix}-table-bordered {
-    > .#{$prefix}-table-container {
-      > .#{$prefix}-table-header > table > thead > tr,
-      > .#{$prefix}-table-summary > table > tfoot > tr {
-        > .#{$prefix}-table-cell-fix-right-first::before {
-          border-inline-start: 1px solid $tableBorderColor;
-          content: "";
-          position: absolute;
-          inset-block: 0;
-          inset-inline-start: -1px;
-        }
-      }
-    }
-  }
-
-
-  .#{$prefix}-table.#{$prefix}-table-bordered {
-    > .#{$prefix}-table-container {
-      > .#{$prefix}-table-header > table > thead > tr,
-      > .#{$prefix}-table-summary > table > tfoot > tr {
-        > .#{$prefix}-table-cell-fix-right-first::after {
-          border-inline-end: 0;
-        }
-      }
-    }
-  }
-
-  .#{$prefix}-table-ping-left {
-    .#{$prefix}-table-cell-fix-left-first::after,
-    .#{$prefix}-table-cell-fix-left-last::after {
-      box-shadow: inset 10px 0 8px -8px rgba(5, 5, 5, 0.2);
-    }
-  }
-
-  .#{$prefix}-table-ping-right {
-    .#{$prefix}-table-cell-fix-right-first::after,
-    .#{$prefix}-table-cell-fix-right-last::after {
-      box-shadow: inset -10px 0 8px -8px rgba(5, 5, 5, 0.2);
-    }
-  }
-
-  .#{$prefix}-spin-nested-loading >div>.#{$prefix}-spin {
-    max-height: 100%;
-  }
-
-
 }
+// ---------------- Table edit end---------------
+
 
 // -------------- Checkbox ----------
 
 .#{$prefix}-checkbox-indeterminate {
   &:hover {
     .#{$prefix}-checkbox-inner {
-      border-color: $primary !important; ;
+      border-color: $primary !important;;
     }
   }
+
   .#{$prefix}-checkbox-inner {
     &:after {
       background-color: $primary;
@@ -370,6 +354,7 @@ $cell-index-focus-bg: #CEDBEF !default;
         border-color: $primary;
       }
     }
+
     .#{$prefix}-checkbox-inner {
       background-color: $primary;
       border-color: $primary;
@@ -387,6 +372,7 @@ $cell-index-focus-bg: #CEDBEF !default;
   .#{$prefix}-checkbox-inner {
     border-color: $primary;
   }
+
   .#{$prefix}-checkbox-checked:not(.#{$prefix}-checkbox-disabled) {
     .#{$prefix}-checkbox-inner {
       background-color: $primary;
@@ -462,6 +448,7 @@ $cell-index-focus-bg: #CEDBEF !default;
     bottom: 0;
     left: 0;
   }
+
   &::after {
     content: "";
     position: absolute;
@@ -471,19 +458,25 @@ $cell-index-focus-bg: #CEDBEF !default;
     visibility: visible;
     right: 0;
   }
+
   border-bottom: 1px solid $tableBorderColor;
+
   .#{$prefix}-pagination-item-active {
     border-color: $primary;
+
     &:hover {
       border-color: $primary;
+
       a {
         color: $primary;
       }
     }
+
     a {
       color: $primary;
     }
   }
+
   .#{$prefix}-pagination-jump-prev, .#{$prefix}-pagination-jump-next {
     .#{$prefix}-pagination-item-container {
       .#{$prefix}-pagination-item-link-icon {
@@ -493,27 +486,25 @@ $cell-index-focus-bg: #CEDBEF !default;
   }
 }
 
-.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-content >table >tbody>tr>td >.#{$prefix}-table-expanded-row-fixed {
-  //border-inline-end: 1px solid $tableBorderColor;
-  border-inline-end: 1px solid $tableBorderColor;
-}
-
-.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-content >table >tbody>tr>td >.#{$prefix}-table-expanded-row-fixed::after {
-  //border-inline-end: 1px solid $tableBorderColor;
-  border-inline-end: 0 solid $tableBorderColor;
-}
-
-
-.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered.#{$prefix}-table-small >.#{$prefix}-table-container >.#{$prefix}-table-body >table>tbody>tr>td >.#{$prefix}-table-expanded-row-fixed {
-  margin-top: 0;
-  margin-bottom: 0;
-  border-inline-end: 1px solid $tableBorderColor;
-}
-
-.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered.#{$prefix}-table-small >.#{$prefix}-table-container >.#{$prefix}-table-body >table>tbody>tr>td >.#{$prefix}-table-expanded-row-fixed::after {
-  border-inline-end: 0 solid $tableBorderColor;
-}
-
+//.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-content >table >tbody>tr>td >.#{$prefix}-table-expanded-row-fixed {
+//  border-inline-end: 1px solid $tableBorderColor;
+//}
+//
+//.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered >.#{$prefix}-table-container >.#{$prefix}-table-content >table >tbody>tr>td >.#{$prefix}-table-expanded-row-fixed::after {
+//  //border-inline-end: 1px solid $tableBorderColor;
+//  border-inline-end: 0 solid $tableBorderColor;
+//}
+//
+//
+//.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered.#{$prefix}-table-small >.#{$prefix}-table-container >.#{$prefix}-table-body >table>tbody>tr>td >.#{$prefix}-table-expanded-row-fixed {
+//  margin-top: 0;
+//  margin-bottom: 0;
+//  border-inline-end: 1px solid $tableBorderColor;
+//}
+//
+//.#{$prefix}-table-wrapper .#{$prefix}-table.#{$prefix}-table-bordered.#{$prefix}-table-small >.#{$prefix}-table-container >.#{$prefix}-table-body >table>tbody>tr>td >.#{$prefix}-table-expanded-row-fixed::after {
+//  border-inline-end: 0 solid $tableBorderColor;
+//}
 
 
 .#{$prefix}-table-wrapper {
@@ -542,10 +533,28 @@ $cell-index-focus-bg: #CEDBEF !default;
 .ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-title,
 .ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-footer,
 .ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-cell,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-thead>tr>th,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-tbody>tr>th,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-tbody>tr>td,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small tfoot>tr>th,
-.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small tfoot>tr>td {
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-thead > tr > th,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-tbody > tr > th,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-tbody > tr > td,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small tfoot > tr > th,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small tfoot > tr > td {
   padding: 5px 8px;
 }
+
+
+//ui-rc-table-ping-right
+
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-content >table >thead>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-header >table >thead>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-body >table >thead>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-summary >table >thead>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-content >table >tbody>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-header >table >tbody>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-body >table >tbody>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-summary >table >tbody>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-content >table >tfoot>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-header >table >tfoot>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-body >table >tfoot>tr >.ui-rc-table-cell-fix-right-first::after,
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-bordered >.ui-rc-table-container >.ui-rc-table-summary >table >tfoot>tr >.ui-rc-table-cell-fix-right-first::after {
+  border-inline-end: 1px solid $tableBorderColor;
+}

package/lib/grid-component/{rc-table → table}/Grid.js

@@ -10,6 +10,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _GridStyle = require("../GridStyle");
 var _TableGrid = _interopRequireDefault(require("../TableGrid"));
 var _EditableCell = _interopRequireDefault(require("../EditableCell"));
+var _Command = _interopRequireDefault(require("../Command"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const Grid = props => {
@@ -19,74 +20,57 @@ const Grid = props => {
     tableRef,
     className,
     components,
+    style,
     ...rest
   } = props;
-
-  // const transformColumns = React.useCallback((cols: ColumnsTable<RecordType>): ColumnsTable<RecordType> => {
-  //   return cols.map((column) => {
-  //
-  //     if (column?.children && column?.children.length > 0) {
-  //       return {
-  //         ...column,
-  //         children: transformColumns(column?.children) // Xử lý đệ quy cho cấp con
-  //       }
-  //     }
-  //
-  //     if (column.dataIndex === 'index' || column.field === 'index' || column.dataIndex === '#' || column.dataIndex === '#') {
-  //       return {
-  //         ...column,
-  //         render: (value: any, record: any, rowIndex: number) => {
-  //           return rowIndex + 1
-  //         }
-  //       }
-  //     }
-  //
-  //     return {
-  //       ...column,
-  //     }
-  //   })
-  // }, [])
-  //
-  //
-  // const mergedColumns = useMemo(() => {
-  //
-  //   // @ts-ignore
-  //   return transformColumns(columns ?? [])
-  //
-  // }, [transformColumns, columns])
-
-  const addFilter = _react.default.useCallback(cols => {
+  const transformColumns = _react.default.useCallback(cols => {
+    // @ts-ignore
     return cols.map(column => {
-      // @ts-ignore
-      if (!column?.dataIndex && !column?.key) {
+      if (!column?.field && !column?.key) {
         return column;
       }
-      // @ts-ignore
-      if (column?.children && column?.children.length > 0) {
+
+      // Xử lý đệ quy cho children
+      if (column.children?.length) {
         return {
           ...column,
-          // @ts-ignore
-          children: addFilter(column?.children) // Xử lý đệ quy cho cấp con
+          children: transformColumns(column.children)
         };
       }
+      const transformedColumn = {
+        ...column,
+        dataIndex: column.field ?? column.dataIndex,
+        title: column.headerText ?? column.title,
+        ellipsis: column.ellipsis !== false,
+        align: column.textAlign ?? column.align,
+        fixed: column.frozen ? column.frozen.toLowerCase() : column.fixed
+      };
       // @ts-ignore
-      if (column.dataIndex === 'index' || column.field === 'index' || column.dataIndex === '#' || column.dataIndex === '#') {
+      if (["index", "#"].includes(transformedColumn.dataIndex)) {
         return {
-          ...column,
-          render: (value, record, rowIndex) => {
-            return rowIndex + 1;
-          }
+          ...transformedColumn,
+          render: (_, __, rowIndex) => rowIndex + 1
         };
       }
-      return {
-        ...column
-      };
+      if (transformedColumn.dataIndex === "command") {
+        return {
+          ...transformedColumn,
+          onCell: () => ({
+            className: "ui-rc-cell-command"
+          }),
+          render: () => /*#__PURE__*/_react.default.createElement("div", {
+            className: "ui-rc-cell-command__content"
+          }, column.commandItems?.map((item, index) => item.visible !== false ? /*#__PURE__*/_react.default.createElement(_Command.default, {
+            key: `command-${index}`,
+            item: item,
+            onClick: e => e.preventDefault()
+          }) : null))
+        };
+      }
+      return transformedColumn;
     });
   }, []);
-  const tmpColumns = (0, _react.useMemo)(() => {
-    // @ts-ignore
-    return addFilter(columns ?? []);
-  }, [addFilter, columns]);
+  const mergedColumns = (0, _react.useMemo)(() => transformColumns(columns ?? []), [transformColumns, columns]);
   return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_GridStyle.GridStyle, {
     heightTable: height,
     style: {
@@ -99,10 +83,12 @@ const Grid = props => {
       body: {
         cell: _EditableCell.default
       }
+    },
+    columns: mergedColumns,
+    style: {
+      ...style,
+      minHeight: height
     }
-    // columns={mergedColumns}
-    ,
-    columns: tmpColumns
   }))));
 };
 var _default = exports.default = Grid;

package/{es/grid-component/rc-table → lib/grid-component/table}/GridEdit.d.ts

@@ -2,8 +2,12 @@ import React from 'react';
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
 import type { TableEditProps } from "../type";
+import type { GetRowKey } from "../type";
 type Props<RecordType> = TableEditProps<RecordType> & {
     tableRef: any;
+    triggerChangeColumns?: () => void;
+    triggerChangeData?: () => void;
+    getRowKey: GetRowKey<RecordType>;
 };
 declare const GridEdit: <RecordType extends object>(props: Props<RecordType>) => React.JSX.Element;
 export default GridEdit;