es-grid-template 1.4.4 → 1.4.6

package/es/grid-component/EditableCell.js

@@ -5,7 +5,7 @@ import { checkDecimalSeparator, checkThousandSeparator, checkFieldKey, convertAr
 // convertDayjsToDate,
 convertLabelToTitle,
 // customWeekStartEndFormat,
-getDatepickerFormat, getTemplate, isDisable, isEmpty, isNullOrUndefined, customWeekStartEndFormat, convertDayjsToDate, parseBooleanToValue, isColor, genPresets
+getDatepickerFormat, getTemplate, isDisable, isEmpty, isNullOrUndefined, customWeekStartEndFormat, convertDayjsToDate, parseBooleanToValue, isColor, genPresets, getFormat
 // isEditable,
 // convertDayjsToDate
 } from "./hooks";
@@ -67,7 +67,8 @@ const EditableCell = props => {
   const dateTimePickerRef = React.useRef(null);
   // const timePickerRef = React.useRef(null);
 
-  const cellFormat = column?.format ? typeof column?.format === 'function' ? column?.format?.(record) : column?.format : format;
+  const colFormat = typeof column?.format === 'function' ? column?.format(record) : column?.format;
+  const cellFormat = getFormat(colFormat, format);
   const inputNode = (value, onChange) => {
     const dateFormat = getDatepickerFormat(editType, cellFormat);
     const date = !isEmpty(value) ? convertDateToDayjs(new Date(value), dateFormat) : null;

package/es/grid-component/GridStyle.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 interface GridProps {
-    $heightTable?: number | string;
+    $heightTable?: number;
+    $heightScroll?: number;
 }
 export declare const GridStyle: import("styled-components/dist/types").IStyledComponentBase<"web", import("styled-components/dist/types").Substitute<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, GridProps>> & string;
 export {};

package/es/grid-component/GridStyle.js

@@ -2,4 +2,4 @@ import styled from "styled-components";
 export const GridStyle = styled.div.withConfig({
   displayName: "GridStyle",
   componentId: "es-grid-template__sc-sueu2e-0"
-})([".ui-rc-table-container{min-height:", ";}.ui-rc-toolbar-bottom{position:relative;padding:.25rem 1rem;background-color:#ffffff;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;}.toolbar-button{border-radius:0;.ant-btn{border-radius:0;}}}.ui-rc-pagination{border-bottom:1px solid #e0e0e0;border-top:1px solid #e0e0e0;margin:0;padding:.75rem 1rem;background-color:#ffffff;.ui-rc-pagination-total-text{order:2;margin-left:auto;}&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;visibility:visible;right:0;}&.pagination-template{position:relative;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;}}}.react-resizable{position:relative;background-clip:padding-box;}.rc-resizable-handle{position:absolute;right:0px;bottom:0;z-index:1;width:5px;height:100%;cursor:col-resize;&.none{cursor:auto;display:none;}}"], props => props.$heightTable ? typeof props.$heightTable === 'string' ? props.$heightTable : `${props.$heightTable}px` : undefined);
+})(["height:", ";.ui-rc-table.ui-rc-table-virtual.ui-rc-table-scroll-horizontal{.ui-rc-table-container{padding-bottom:8px;border-bottom:1px solid #e0e0e0;}}.ui-rc-table-container{.ui-rc-table-tbody-virtual.ui-rc-table-tbody{min-height:", ";}}.ui-rc-toolbar-bottom{position:relative;padding:.25rem 1rem;background-color:#ffffff;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;}.toolbar-button{border-radius:0;.ant-btn{border-radius:0;}}}.ui-rc-pagination{border-bottom:1px solid #e0e0e0;border-top:1px solid #e0e0e0;margin:0;padding:.75rem 1rem;background-color:#ffffff;.ui-rc-pagination-total-text{order:2;margin-left:auto;}&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;visibility:visible;right:0;}&.pagination-template{position:relative;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;}}}.react-resizable{position:relative;background-clip:padding-box;}.rc-resizable-handle{position:absolute;right:0px;bottom:0;z-index:1;width:5px;height:100%;cursor:col-resize;&.none{cursor:auto;display:none;}}"], props => props.$heightTable ? `${props.$heightTable}px` : undefined, props => props.$heightScroll ? `${props.$heightScroll}px` : undefined);

package/es/grid-component/InternalTable.js

@@ -30,6 +30,7 @@ import { closestCenter, DndContext, DragOverlay, PointerSensor, useSensor, useSe
 import { arrayMove, horizontalListSortingStrategy, SortableContext, useSortable } from "@dnd-kit/sortable";
 // import {CSS} from "@dnd-kit/utilities";
 import { Resizable } from "react-resizable";
+import { faker } from "@faker-js/faker";
 dayjs.extend(customParseFormat);
 const MySwal = withReactContent(Swal);
 const ASCEND = 'ascend';
@@ -142,6 +143,7 @@ const SortableHeaderCell = ({
 const InternalTable = props => {
   const {
     t,
+    id: tableId,
     // columns,
     columns: propsColumns,
     lang,
@@ -168,11 +170,37 @@ const InternalTable = props => {
     commandClick,
     commandSettings,
     pagination,
+    height: propsHeight,
+    summary,
     ...rest
   } = props;
+  const id = React.useMemo(() => {
+    return tableId ?? faker.string.alpha(20);
+    // return tableId ?? newGuid()
+  }, [tableId]);
   const rowKey = React.useMemo(() => {
-    return editAble ? 'rowId' : propRowKey ?? 'rowId';
-  }, [propRowKey, editAble]);
+    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 buddhistLocale = {
     ...local,
@@ -194,6 +222,19 @@ const InternalTable = props => {
     return addRowIdArray(dataSource);
   }, [dataSource]);
   const [columns, setColumns] = React.useState([]);
+  React.useEffect(() => {
+    // setTimeout(() => {
+    const table = document.querySelector(`#${id}`);
+    const title = table?.querySelector(`.ui-rc-table-title`);
+    const header = table?.querySelector(`.ui-rc-table-header`);
+    const paginationE = table?.querySelector(`.ui-rc-pagination`);
+    const toolbar = table?.querySelector(`.ui-rc-toolbar-bottom`);
+    const summaryE = table?.querySelector(`.ui-rc-table-summary`);
+    const scrollbar = table?.querySelector(`.ui-rc-table-tbody-virtual-scrollbar.ui-rc-table-tbody-virtual-scrollbar-horizontal`);
+    const hhh = (propsHeight ?? 0) - (title ? title.offsetHeight : 0) - (header ? header.offsetHeight : 0) - (paginationE ? paginationE.offsetHeight : 0) - (toolbar ? toolbar.offsetHeight : 0) - (summaryE ? summaryE.offsetHeight : 0) - (scrollbar ? scrollbar.offsetHeight : 0);
+    setHeight(hhh);
+    // })
+  }, [id, propsHeight, columns]);
   const tableRef = React.useRef(null);
   React.useEffect(() => {
     setColumns(propsColumns);
@@ -483,26 +524,46 @@ const InternalTable = props => {
       if (column === SELECTION_COLUMN) {
         return SELECTION_COLUMN;
       }
-      if (find) {
+      const tmpColumn = {
+        ...column,
+        dataIndex: column.field ?? column.dataIndex,
+        key: column.field ?? column.key,
+        title: /*#__PURE__*/React.createElement(SortableHeaderCell, {
+          columnKey: column.field
+        }, /*#__PURE__*/React.createElement(HeaderContent, {
+          column: {
+            ...column
+          },
+          t: t
+        })),
+        ellipsis: column.ellipsis !== false,
+        align: column.textAlign ?? column.align,
+        fixed: column.fixedType ?? column.fixed,
+        isSummary: column.isSummary ?? column.haveSum,
+        hidden: column.hidden ?? column.visible === false
+      };
+
+      // Xử lý đệ quy cho children
+      if (column.children?.length) {
         return {
-          ...find
+          ...column,
+          ...tmpColumn,
+          children: transformColumns(column.children)
         };
       }
-      if (!find) {
+      if (find) {
         return {
-          ...column
+          ...find
         };
       }
-
-      // Xử lý đệ quy cho children
-      if (column.children?.length) {
+      if (!find) {
         return {
           ...column,
-          children: transformColumns(column.children)
+          ...tmpColumn
         };
       }
     });
-  }, [convertColumns]);
+  }, [convertColumns, t]);
   const mergedColumns = React.useMemo(() => {
     return transformColumns(columns);
   }, [columns, transformColumns]);
@@ -596,13 +657,13 @@ const InternalTable = props => {
   };
   const triggerCommandClick = args => {
     const {
-      id,
+      id: idCommand,
       rowId,
       rowData,
       index
     } = args;
     const tmpData = [...mergedData];
-    if (id === 'DELETE') {
+    if (idCommand === 'DELETE') {
       // bật modal confirm
       if (commandSettings && commandSettings.confirmDialog) {
         MySwal.fire({
@@ -688,7 +749,7 @@ const InternalTable = props => {
           }
           if (commandClick) {
             commandClick({
-              id,
+              id: idCommand,
               rowId,
               rowData,
               index,
@@ -699,7 +760,7 @@ const InternalTable = props => {
           // server
           if (commandClick) {
             commandClick({
-              id,
+              id: idCommand,
               rowId,
               rowData,
               index,
@@ -760,6 +821,7 @@ const InternalTable = props => {
     value: dragIndex
   }, /*#__PURE__*/React.createElement(TableComponent, _extends({}, rest, {
     t: t,
+    id: id,
     locale: locale,
     tableRef: tableRef,
     dataSource: mergedData,
@@ -779,7 +841,17 @@ const InternalTable = props => {
     groupAble: groupAble,
     groupColumns: groupColumns,
     commandClick: triggerCommandClick,
-    pagination: pagination,
+    summary: summary,
+    pagination: pagination
+    // scroll={{ y: 300 - 41 - 7 }} // scroll height auto, không quá  600
+    // scroll={{ y: scrollHeight - (summary ? 0 : 7) }} // scroll height auto, không quá  600
+    ,
+    scroll: {
+      y: scrollHeight - (summary ? 0 : 0)
+    } // scroll height auto, không quá  600
+    ,
+    height: propsHeight,
+    scrollHeight: scrollHeight,
     components: {
       header: {
         cell: ResizableTitle

package/es/grid-component/hooks/utils.d.ts

@@ -121,8 +121,11 @@ export declare const sortedSetASC: (setValue: any) => Set<unknown>;
 export declare const sortedSetDSC: (setValue: any) => Set<unknown>;
 export declare function getBottomRowCells(cellSet: any): any[];
 export declare function getCellsByPosition(cellSet: any, position?: string): any[];
+export declare function getCellsByPosition2(cellSet: any, position?: string): any[];
 export declare const addBorderClass: (selectedCells: any, type: string, className: string, id?: string, nextCellRight?: boolean) => void;
 export declare const removeBorderClass: (selectedCells: any, type: string, className: string, id?: string) => void;
+export declare const addBorderPasteClass: (selectedCells: any, type: string, className: string, id?: string, nextCellRight?: boolean) => void;
+export declare const removeBorderPasteClass: (selectedCells: any, type: string, className: string, id?: string) => void;
 export declare const removeBorderClass2: (className: string, id?: string) => void;
 export declare const onAddBgSelectedCell: (selectedCells: any, id?: string, isFocusCellIndex?: boolean) => void;
 export declare const onRemoveBgSelectedCell: (selectedCells: any, id?: string, rowsSelected?: any) => void;

package/es/grid-component/hooks/utils.js

@@ -1469,6 +1469,61 @@ export function getBottomRowCells(cellSet) {
   return cells.filter(c => c.row === maxRow).map(c => c.key);
 }
 export function getCellsByPosition(cellSet, position = "bottom") {
+  const cells = Array.from(cellSet).map(key => {
+    const [row, col] = key.split("-").map(Number);
+    return {
+      row,
+      col,
+      key
+    };
+  });
+  switch (position) {
+    case "top":
+      {
+        // const minRow = Math.min(...cells.map(c => c.row));
+        // return cells.filter(c => c.row === minRow).map(c => c.key);
+
+        // const rows = cells.map(c => c.row).filter(r => r > 0);
+        // if (rows.length === 0) return [];
+        // const minRow = Math.min(...rows);
+        // return cells.filter(c => c.row === minRow).map(c => c.key);
+
+        const minRow = Math.min(...cells.map(c => c.row));
+        if (minRow === 0) return []; // Bỏ qua nếu rowIndex = 0
+
+        return cells.filter(c => c.row === minRow).map(c => `${c.row}-${c.col}`);
+      }
+    case "bottom":
+      {
+        const maxRow = Math.max(...cells.map(c => c.row));
+        return cells.filter(c => c.row === maxRow).map(c => c.key);
+      }
+    case "left":
+      {
+        // const minCol = Math.min(...cells.map(c => c.col));
+        // return cells.filter(c => c.col === minCol).map(c => c.key);
+
+        // const cols = cells.map(c => c.col).filter(c => c > 0);
+        // if (cols.length === 0) return [];
+        // const minCol = Math.min(...cols);
+        // return cells.filter(c => c.col === minCol).map(c => c.key);
+
+        const minCol = Math.min(...cells.map(c => c.col));
+        if (minCol === 0) return []; // Bỏ qua nếu colIndex = 0
+
+        // Trả về các ô cùng row, nhưng ở cột bên trái
+        return cells.filter(c => c.col === minCol).map(c => `${c.row}-${c.col}`);
+      }
+    case "right":
+      {
+        const maxCol = Math.max(...cells.map(c => c.col));
+        return cells.filter(c => c.col === maxCol).map(c => c.key);
+      }
+    default:
+      return [];
+  }
+}
+export function getCellsByPosition2(cellSet, position = "bottom") {
   const cells = Array.from(cellSet).map(key => {
     const [row, col] = key.split("-").map(Number);
     return {
@@ -1539,22 +1594,85 @@ export const addBorderClass = (selectedCells, type, className, id, nextCellRight
       }
     });
   }
-  if (type === 'left') {
-    const selectorsCells2 = typeCells.map(pos => {
-      const [row, col] = pos.split('-');
-      return `[data-row-index="${row}"][data-col-index="${Number(col) + 1}"]`;
+
+  // ui-rc-table-tbody-virtual-scrollbar ui-rc-table-tbody-virtual-scrollbar-horizontal ui-rc-table-tbody-virtual-scrollbar-visible
+
+  // if (type === 'left') {
+  //
+  //   const selectorsCells2 = typeCells.map((pos: any) => {
+  //     const [row, col] = pos.split('-');
+  //     return `[data-row-index="${row}"][data-col-index="${Number(col) + 1}"]`;
+  //   });
+  //
+  //   const fullSelector = selectorsCells2.map(s => `.ui-rc-table-cell-fix-right-first${s}`).join(', ');
+  //
+  //   const cellsFilter2 = typeCells.length > 0 ? table?.querySelectorAll(fullSelector) : null
+  //
+  //   if (cellsFilter2 && cellsFilter2.length > 0) {
+  //
+  //     cellsFilter2.forEach(cell => {
+  //       // cell.classList.add('has-before');
+  //       cell.classList.add('cell-border-left');
+  //     });
+  //   }
+  //
+  // }
+};
+export const removeBorderClass = (selectedCells, type, className, id) => {
+  const table = document.querySelector(`#${id}`);
+  const typeCells = getCellsByPosition2(selectedCells, type);
+  const selectorsCells = typeCells.map(pos => {
+    const [row, col] = pos.split('-');
+    return `[data-row-index="${row}"][data-col-index="${col}"]`;
+  });
+  const cellsFilter = typeCells.length > 0 ? table?.querySelectorAll(selectorsCells.join(',')) : null;
+  if (cellsFilter && cellsFilter.length > 0) {
+    cellsFilter.forEach(cell => {
+      cell.classList.remove(className);
     });
-    const fullSelector = selectorsCells2.map(s => `.ui-rc-table-cell-fix-right-first${s}`).join(', ');
-    const cellsFilter2 = typeCells.length > 0 ? table?.querySelectorAll(fullSelector) : null;
-    if (cellsFilter2 && cellsFilter2.length > 0) {
-      cellsFilter2.forEach(cell => {
-        // cell.classList.add('has-before');
-        cell.classList.add('cell-border-left');
-      });
-    }
   }
 };
-export const removeBorderClass = (selectedCells, type, className, id) => {
+export const addBorderPasteClass = (selectedCells, type, className, id, nextCellRight) => {
+  const table = document.querySelector(`#${id}`);
+  const typeCells = getCellsByPosition2(selectedCells, type);
+  const selectorsCells = typeCells.map(pos => {
+    const [row, col] = pos.split('-');
+    return `[data-row-index="${row}"][data-col-index="${col}"]`;
+  });
+  const cellsFilter = typeCells.length > 0 ? table?.querySelectorAll(selectorsCells.join(',')) : null;
+  if (cellsFilter && cellsFilter.length > 0) {
+    cellsFilter.forEach(cell => {
+      cell.classList.add(className);
+      if (nextCellRight) {
+        cell.style.zIndex = 1;
+      }
+    });
+  }
+
+  // ui-rc-table-tbody-virtual-scrollbar ui-rc-table-tbody-virtual-scrollbar-horizontal ui-rc-table-tbody-virtual-scrollbar-visible
+
+  // if (type === 'left') {
+  //
+  //   const selectorsCells2 = typeCells.map((pos: any) => {
+  //     const [row, col] = pos.split('-');
+  //     return `[data-row-index="${row}"][data-col-index="${Number(col) + 1}"]`;
+  //   });
+  //
+  //   const fullSelector = selectorsCells2.map(s => `.ui-rc-table-cell-fix-right-first${s}`).join(', ');
+  //
+  //   const cellsFilter2 = typeCells.length > 0 ? table?.querySelectorAll(fullSelector) : null
+  //
+  //   if (cellsFilter2 && cellsFilter2.length > 0) {
+  //
+  //     cellsFilter2.forEach(cell => {
+  //       // cell.classList.add('has-before');
+  //       cell.classList.add('cell-border-left');
+  //     });
+  //   }
+  //
+  // }
+};
+export const removeBorderPasteClass = (selectedCells, type, className, id) => {
   const table = document.querySelector(`#${id}`);
   const typeCells = getCellsByPosition(selectedCells, type);
   const selectorsCells = typeCells.map(pos => {
@@ -1697,9 +1815,7 @@ export const onAddBorderSelectedCell = (selectedCells, id) => {
   const col = getLastSelectCell(selectedCells).col;
   const cell = table?.querySelector(`.ui-rc-table-cell[data-row-index="${row}"][data-col-index="${col}"]`);
   const nextCellLeft = table?.querySelector(`.ui-rc-table-cell.ui-rc-table-cell-fix-left[data-row-index="${row}"][data-col-index="${col + 1}"]`);
-  // const nextCellRight: any = table?.querySelector(`.ui-rc-table-cell.ui-rc-table-cell-fix-right[data-row-index="${row}"][data-col-index="${col + 1}"]`)
-
-  console.log('nextCell', nextCellLeft);
+  const nextCellRight = table?.querySelector(`.ui-rc-table-cell.ui-rc-table-cell-fix-right[data-row-index="${row}"][data-col-index="${col + 1}"]`);
   if (cell) {
     cell.style.zIndex = nextCellLeft ? 3 : 1;
   }
@@ -1714,7 +1830,7 @@ export const onAddBorderSelectedCell = (selectedCells, id) => {
   //  thêm class border selected
 
   addBorderClass(selectedCells, 'bottom', 'cell-border-bottom', id);
-  addBorderClass(selectedCells, 'right', 'cell-border-right', id);
+  addBorderClass(selectedCells, 'right', 'cell-border-right', id, !!nextCellRight);
   addBorderClass(selectedCells, 'top', 'cell-border-top', id);
   addBorderClass(selectedCells, 'left', 'cell-border-left', id);
 };
@@ -1743,13 +1859,13 @@ export const onRemoveBorderSelectedCell = (selectedCells, id) => {
 export const addClassBorderPasteCell = (pasteCells, type, id) => {
   //  thêm class border
 
-  addBorderClass(pasteCells, 'right', 'cell-paste-border-right', id);
-  addBorderClass(pasteCells, 'left', 'cell-paste-border-left', id);
+  addBorderPasteClass(pasteCells, 'right', 'cell-paste-border-right', id);
+  addBorderPasteClass(pasteCells, 'left', 'cell-paste-border-left', id);
   if (type === 'up') {
-    addBorderClass(pasteCells, 'top', 'cell-paste-border-top', id);
+    addBorderPasteClass(pasteCells, 'top', 'cell-paste-border-top', id);
   }
   if (type === 'down') {
-    addBorderClass(pasteCells, 'bottom', 'cell-paste-border-bottom', id);
+    addBorderPasteClass(pasteCells, 'bottom', 'cell-paste-border-bottom', id);
   }
 };
 export const removeClassBorderPasteCell = (pasteCells, type, id) => {