es-grid-template 1.5.4 → 1.5.6

package/es/grid-component/ColumnsGroup/ColumnsGroup.js

@@ -27,7 +27,7 @@ export const ColumnsGroup = props => {
   const [tempGroup, setTempGroup] = useState([]);
   const [clicked, setClicked] = useState(false);
   const rsCol = React.useMemo(() => {
-    return columns.filter(it => it.hidden !== true && !tempGroup.includes(it.field));
+    return columns.filter(it => it.hidden !== true && !tempGroup.includes(it.field) && it.field !== '#' && it.field !== 'command');
   }, [columns, tempGroup]);
   const options = React.useMemo(() => {
     return rsCol.map(it => ({

package/es/grid-component/InternalTable.js

@@ -187,25 +187,6 @@ const InternalTable = props => {
     return propRowKey ?? 'rowId';
   }, [propRowKey]);
   const [scrollHeight, setHeight] = useState(0);
-
-  // const heightt = React.useMemo(() => {
-  //
-  //   const table = document.querySelector(`#${id}`)
-  //   console.log('table', table)
-  //
-  //   const title: any = table?.querySelector(`.ui-rc-table-title`)
-  //
-  //   console.log('title', title)
-  //
-  //   if (title) {
-  //     const titleHeight = title.offsetHeight;
-  //     console.log('Chiều cao:', titleHeight);
-  //   }
-  //
-  //   return (height ?? 0) - (title ? title.offsetHeight : 0)
-  //
-  // }, [height, id])
-
   const local = lang && lang === 'en' ? en : vi;
   const dateRangeLocale = lang && lang === 'en' ? enDr : viDr;
   const buddhistLocale = {
@@ -376,7 +357,7 @@ const InternalTable = props => {
         }
       }
     }
-  }), [buddhistLocale, propDataSourceFilter, locale, t]);
+  }), [t, propDataSourceFilter, buddhistLocale, locale, format, dateRangeLocale]);
   const convertColumns = React.useMemo(() => {
     return flatColumns2(columns).map((column, colIndex) => {
       if (column === SELECTION_COLUMN) {
@@ -411,8 +392,11 @@ const InternalTable = props => {
             },
             t: t
           }),
-          onCell: () => ({
-            className: 'cell-number'
+          onCell: data => ({
+            // className: 'cell-number',
+            className: classNames('cell-number', {
+              'cell-group': groupColumns && data.children
+            })
           }),
           render: (val, record) => {
             if (pagination && pagination.onChange && pagination.currentPage && pagination.pageSize) {
@@ -431,8 +415,11 @@ const InternalTable = props => {
             },
             t: t
           }),
-          onCell: () => ({
-            className: 'cell-number',
+          onCell: data => ({
+            // className: 'cell-number',
+            className: classNames('', {
+              'cell-group': groupColumns && data.children
+            }),
             style: {
               padding: '2px 8px'
             }