es-grid-template 1.4.5 → 1.4.7

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.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"
-})(["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);
+})(["height:", ";.ui-rc-table.ui-rc-table-virtual.ui-rc-table-scroll-horizontal{.ui-rc-table-container{&:has(.ui-rc-table-tbody-virtual-scrollbar-horizontal){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

@@ -234,7 +234,7 @@ const InternalTable = props => {
     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]);
+  }, [id, propsHeight, columns, editAble]);
   const tableRef = React.useRef(null);
   React.useEffect(() => {
     setColumns(propsColumns);
@@ -847,7 +847,7 @@ const InternalTable = props => {
     // scroll={{ y: scrollHeight - (summary ? 0 : 7) }} // scroll height auto, không quá  600
     ,
     scroll: {
-      y: scrollHeight - (summary ? 0 : 0)
+      y: scrollHeight - (summary ? 1 : 1)
     } // scroll height auto, không quá  600
     ,
     height: propsHeight,

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

@@ -1523,6 +1523,61 @@ export function getCellsByPosition(cellSet, position = "bottom") {
       return [];
   }
 }
+export function getCellsByPosition2(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 - 1}-${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 - 1}`);
+      }
+    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 const addBorderClass = (selectedCells, type, className, id, nextCellRight) => {
   const table = document.querySelector(`#${id}`);
   const typeCells = getCellsByPosition(selectedCells, type);
@@ -1564,6 +1619,60 @@ export const addBorderClass = (selectedCells, type, className, id, nextCellRight
   // }
 };
 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);
+    });
+  }
+};
+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 => {
@@ -1750,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) => {

package/es/grid-component/styles.scss

@@ -85,7 +85,7 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
           .ui-rc-table-tbody-virtual-scrollbar.ui-rc-table-tbody-virtual-scrollbar-horizontal {
             visibility: visible !important;
-            //bottom: -7px !important;
+            bottom: -8px !important;
             z-index: 5 !important;
             background-color: #f0f0f0;
           }