es-grid-template 1.3.7 → 1.3.9

package/es/grid-component/table/GridEdit.js

@@ -13,18 +13,12 @@ import dayjs from "dayjs";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
 import TableGrid from "../TableGrid";
-import { addClassBorderPasteCell, addClassCellIndexSelected, addRows8, addRowsUp, checkChild, editAbleColumns, findAllChildrenKeys, findItemByKey, findItemPath, flattenArray, flattenData, getDefaultValue, getEditType, getFirstSelectCell, getLastSelectCell, getRowNumber, getRowsPasteIndex, hideDraggingPoint, isEditable, isEqualSet, isObjEmpty, newGuid, onAddClassBgSelectedCell, onRemoveClassSelectedCell, removeClassBorderPasteCell, removeClassCellIndexSelected, showDraggingPoint, sortedSetASC, totalFixedWidth, updateArrayByKey } from "../hooks";
+import { addClassBorderPasteCell, addClassCellIndexSelected, addRows8, addRowsUp, checkChild, editAbleColumns, findAllChildrenKeys, findItemByKey, findItemPath, flattenArray, flattenData, getDefaultValue, getEditType, getFirstSelectCell, getLastSelectCell, getRowNumber, getRowsPasteIndex, hideDraggingPoint, isEditable, isEqualSet, isObjEmpty, newGuid, onAddBorderSelectedCell, onAddBgSelectedCell, onRemoveBorderSelectedCell, onRemoveBgSelectedCell, removeClassBorderPasteCell, removeClassCellIndexSelected, showDraggingPoint, sortedSetASC, totalFixedWidth, updateArrayByKey } from "../hooks";
 import Message from "../../Message/Message";
-// import Command from "../Command";
-
 import { Toolbar, ConfigProvider, InputNumber } from "rc-master-ui";
 import classnames from "classnames";
-// import useMergedState from "rc-util/lib/hooks/useMergedState";
 import { Plus, Trash2 } from "becoxy-icons";
-// import type {ContextMenuItem} from "../type";
-// import {ContextInfo, ContextMenuItem} from "../type";
-// import useLazyKVMap from "rc-master-ui/es/table/hooks/useLazyKVMap";
-
+import { faker } from "@faker-js/faker";
 const {
   Paragraph,
   Title
@@ -109,8 +103,7 @@ const defaultContext = [{
 }];
 const GridEdit = props => {
   const {
-    // id = newGuid(),
-    id,
+    id: tableId,
     tableRef,
     t,
     columns,
@@ -138,17 +131,6 @@ const GridEdit = props => {
     showDefaultContext,
     ...rest
   } = props;
-
-  // const {
-  //   mode,
-  //   type,
-  //   checkboxOnly,
-  //   hideSelectAll,
-  //   columnWidth,
-  //   selectedRowKeys,
-  //   defaultSelectedRowKeys
-  // } = selectionSettings || {}
-
   const ref = useRef(null);
   const isSelecting = useRef(false);
   const startCell = useRef(null);
@@ -167,10 +149,10 @@ const GridEdit = props => {
   // quét vùng được paste - tiếp tục hiển thị con trỏ crosshair
   // const isPasteDragging = useRef(false);
 
-  // const isPointEnter = useRef(false);
-
-  // const [getRecordByKey] = useLazyKVMap(dataSource, childrenColumnName, getRowKey);
-
+  const id = React.useMemo(() => {
+    return tableId ?? faker.string.alpha(20);
+    // return tableId ?? newGuid()
+  }, [tableId]);
   const itemsAdd = [{
     key: '10',
     label: '10 rows'
@@ -184,8 +166,8 @@ const GridEdit = props => {
   const [form] = Form.useForm();
   const [editingKey, setEditingKey] = useState('');
   const [isFilter, setIsFilter] = React.useState(false);
+  const [rangeCells, setRangeCells] = useState(new Set());
 
-  // const [selectedCells, setSelectedCells] = useState(new Set())
   // const [pasteCells, setPasteCells] = useState(new Set())
 
   // const defaultModalPaste = {open: false, rowIndex: -1, colIndex: -1, record: {}, rowsPasted: []}
@@ -220,17 +202,9 @@ const GridEdit = props => {
     // return [];
   });
   const mergedExpandedKeys = React.useMemo(() => new Set(innerExpandedKeys || []), [innerExpandedKeys]);
-
-  // const [mergedSelectedKeys, setMergedSelectedKeys] = useMergedState<any[]>(
-  //   [],
-  //   {
-  //     value: [],
-  //   },
-  // );
-
   const rowsFocus = React.useMemo(() => {
-    return [...new Set(Array.from(selectedCells.current).map(item => parseInt(item.split('-')[0])))] ?? [];
-  }, [selectedCells]);
+    return [...new Set(Array.from(rangeCells).map(item => parseInt(item.split('-')[0])))] ?? [];
+  }, [rangeCells]);
   const contextMenuItems = React.useMemo(() => {
     const a = showDefaultContext !== false ? [...defaultContext] : [];
     const b = propsContext ? [...propsContext, {
@@ -310,6 +284,15 @@ const GridEdit = props => {
 
   // thêm n dòng bên trên
   const handleInsertBefore = (item, n) => {
+    //
+    onRemoveBgSelectedCell(selectedCells.current, id);
+    onRemoveBorderSelectedCell(selectedCells.current, id);
+    //
+
+    setTimeout(() => {
+      onAddBgSelectedCell(selectedCells.current, id);
+      onAddBorderSelectedCell(selectedCells.current, id);
+    }, 10);
     const defaultRowValue = getDefaultValue(defaultValue);
     // const rowId = defaultRowValue && defaultRowValue.id ? defaultRowValue.id : newGuid()
 
@@ -384,9 +367,6 @@ const GridEdit = props => {
   //thêm 1 dòng bên dưới
   const handleInsertAfter = (item, n) => {
     const defaultRowValue = getDefaultValue(defaultValue);
-
-    // const rowId = defaultRowValue && defaultRowValue.id ? defaultRowValue.id : newGuid()
-
     const record = flattenData(childrenColumnName, dataSource)[rowsFocus[rowsFocus.length - 1]];
 
     // const record = getRecordByKey()
@@ -419,8 +399,6 @@ const GridEdit = props => {
           rowId: newGuid()
         });
         const index = newData.findIndex(obj => obj[rowKey] === record[rowKey]);
-
-        // newData.splice(index + 1, 0, { ...defaultRowValue, rowId, parentId: null })
         newData.splice(index + 1, 0, ...newRows);
         triggerChangeData?.(newData, 'INSERT_AFTER');
       } else {
@@ -502,6 +480,10 @@ const GridEdit = props => {
     }
   };
   const handleDeleteRows = item => {
+    setTimeout(() => {
+      onAddBgSelectedCell(selectedCells.current, id);
+      onAddBorderSelectedCell(selectedCells.current, id);
+    });
     if (item.onClick) {
       item.onClick({
         toolbar: item
@@ -757,10 +739,8 @@ const GridEdit = props => {
     trigger,
     getValues,
     reset
-    // formState: { errors }
   } = useForm({
     mode: 'onChange'
-    // defaultValues,
     // resolver: yupResolver(formSchema)
   });
   const isEditing = record => record[rowKey] === editingKey;
@@ -796,25 +776,13 @@ const GridEdit = props => {
         // setSelectedCells(new Set())
         // setRowsSelected(new Set())
 
-        onRemoveClassSelectedCell(selectedCells.current, id);
+        onRemoveBgSelectedCell(selectedCells.current, id);
+        onRemoveBorderSelectedCell(selectedCells.current, id);
         hideDraggingPoint(selectedCells.current, id);
         rowsSelected.current = new Set();
         selectedCells.current = new Set();
+        setRangeCells(new Set());
       }
-
-      // if (tableBodies.length > 0) {
-      //   const tableBody = tableBodies[0]; // Chọn tbody đầu tiên (nếu có nhiều)
-      //
-      //   if (!tableBody.contains(event.target as Node)) {
-      //     setEditingKey('')
-      //     isSelecting.current = false;
-      //     startCell.current = null;
-      //     setSelectedCells(new Set())
-      //     setRowsSelected(new Set())
-      //   } else {
-      //
-      //   }
-      // }
     };
     document.addEventListener("click", handleClickOutside);
     return () => {
@@ -862,16 +830,28 @@ const GridEdit = props => {
 
         const cells = new Set([`${row}-${col}`]);
         if (selectedCells.current && selectedCells.current.size > 0) {
-          onRemoveClassSelectedCell(selectedCells.current, id);
-          if (!isEqualSet(cells, selectedCells.current)) {
-            hideDraggingPoint(selectedCells.current, id);
+          if (!isEqualSet(cells, rangeCells)) {
+            onRemoveBgSelectedCell(rangeCells, id);
+            onRemoveBorderSelectedCell(rangeCells, id);
+            hideDraggingPoint(rangeCells, id);
           }
         }
-        selectedCells.current = cells;
-        onAddClassBgSelectedCell(cells, id);
         if (rowsSelected.current && rowsSelected.current.size > 0) {
           removeClassCellIndexSelected(rowsSelected.current, id);
         }
+        if (!isEqualSet(cells, selectedCells.current)) {
+          selectedCells.current = cells;
+          if (editingKey) {
+            setTimeout(() => {
+              onAddBgSelectedCell(cells, id);
+              onAddBorderSelectedCell(cells, id);
+            }, 100);
+          } else {
+            onAddBgSelectedCell(cells, id);
+            onAddBorderSelectedCell(cells, id);
+          }
+        }
+
         // setRowsSelected(new Set())
         rowsSelected.current = new Set();
       }
@@ -879,12 +859,12 @@ const GridEdit = props => {
   };
   const triggerDragPaste = pastesArray => {
     const mergedSet = new Set([...selectedCells.current, ...pastesArray]);
+    const tmpCols = flatColumns2(columns.filter(it => it.visible !== false));
     const rowSelectedFirst = getFirstSelectCell(selectedCells.current).row;
     const rowPasteLast = getLastSelectCell(pasteCells.current).row;
     const selectedArray = Array.from(selectedCells.current).map(key => {
       const [row, col] = key.split("-").map(Number);
-      // @ts-ignore
-      const columnKey = columns[col].field;
+      const columnKey = tmpCols[col].field;
 
       // @ts-ignore
       return {
@@ -978,13 +958,13 @@ const GridEdit = props => {
         }
         rowValues.forEach((cellValue, colIndex) => {
           const targetCol = startCol + colIndex;
-          if (targetCol >= columns.length) {
+          if (targetCol >= tmpCols.length) {
             // Không vượt quá số cột
             return;
           }
 
           // @ts-ignore
-          const columnKey = columns[targetCol].field;
+          const columnKey = tmpCols[targetCol].field;
 
           // @ts-ignore
           newData[targetRow] = {
@@ -1003,13 +983,15 @@ const GridEdit = props => {
 
     /// cập nhật cell class
     if (selectedCells.current && selectedCells.current.size > 0) {
-      onRemoveClassSelectedCell(selectedCells.current, id);
+      onRemoveBgSelectedCell(rangeCells, id);
+      onRemoveBorderSelectedCell(rangeCells, id);
     }
 
     // selectedCells.current = sortedSetASC(mergedSet)
     hideDraggingPoint(selectedCells.current, id);
     selectedCells.current = sortedSetASC(mergedSet);
-    onAddClassBgSelectedCell(sortedSetASC(mergedSet), id);
+    onAddBgSelectedCell(sortedSetASC(mergedSet), id);
+    onAddBorderSelectedCell(sortedSetASC(mergedSet), id);
     showDraggingPoint(sortedSetASC(mergedSet), id);
 
     // setPasteCells(new Set())
@@ -1079,6 +1061,9 @@ const GridEdit = props => {
     if (pasteCells && pasteCells.current.size > 0) {
       triggerDragPaste(pasteCells.current);
     } else {
+      setRangeCells(selectedCells.current);
+      onRemoveBorderSelectedCell(rangeCells, id);
+      onAddBorderSelectedCell(selectedCells.current, id);
       const target = e.target;
       if (target.closest('.dragging-point')) {
         e.stopPropagation();
@@ -1138,10 +1123,10 @@ const GridEdit = props => {
       // setSelectedCells(newSelectedCells)
 
       if (selectedCells.current && selectedCells.current.size > 0) {
-        onRemoveClassSelectedCell(selectedCells.current, id);
+        onRemoveBgSelectedCell(selectedCells.current, id);
       }
       selectedCells.current = newSelectedCells;
-      onAddClassBgSelectedCell(newSelectedCells, id);
+      onAddBgSelectedCell(newSelectedCells, id);
     } else {
       // chọn vùng paste
 
@@ -1221,12 +1206,12 @@ const GridEdit = props => {
   //   // setSelectedCells(newSelectedCells)
   //
   //   if (selectedCells.current && selectedCells.current.size > 0) {
-  //     onRemoveClassSelectedCell(selectedCells.current, id)
+  //     onRemoveBgSelectedCell(selectedCells.current, id)
   //   }
   //
   //   selectedCells.current = newSelectedCells
   //
-  //   onAddClassBgSelectedCell(newSelectedCells, id)
+  //   onAddBgSelectedCell(newSelectedCells, id)
   //
   //
   // };
@@ -1242,13 +1227,15 @@ const GridEdit = props => {
     // setSelectedCells(new Set(newSelectedCells));
 
     if (selectedCells.current && selectedCells.current.size > 0) {
-      onRemoveClassSelectedCell(selectedCells.current, id);
+      onRemoveBgSelectedCell(selectedCells.current, id);
+      onRemoveBorderSelectedCell(selectedCells.current, id);
     }
     if (rowsSelected.current && rowsSelected.current.size > 0) {
       removeClassCellIndexSelected(rowsSelected.current, id);
     }
     selectedCells.current = newSelectedCells;
-    onAddClassBgSelectedCell(newSelectedCells, id);
+    onAddBgSelectedCell(newSelectedCells, id);
+    onAddBorderSelectedCell(newSelectedCells, id);
     hideDraggingPoint(selectedCells.current, id);
     showDraggingPoint(newSelectedCells, id);
   };
@@ -1274,7 +1261,8 @@ const GridEdit = props => {
     // setRowsSelected(new Set([`${row}-${col}`]));
 
     if (selectedCells.current && selectedCells.current.size > 0) {
-      onRemoveClassSelectedCell(selectedCells.current, id);
+      onRemoveBgSelectedCell(selectedCells.current, id);
+      onRemoveBorderSelectedCell(selectedCells.current, id);
     }
     if (rowsSelected.current && rowsSelected.current.size > 0) {
       removeClassCellIndexSelected(rowsSelected.current, id);
@@ -1282,7 +1270,8 @@ const GridEdit = props => {
     hideDraggingPoint(selectedCells.current, id);
     selectedCells.current = newSelectedCells;
     rowsSelected.current = new Set([`${row}-${col}`]);
-    onAddClassBgSelectedCell(newSelectedCells, id);
+    onAddBgSelectedCell(newSelectedCells, id);
+    onAddBorderSelectedCell(newSelectedCells, id);
     addClassCellIndexSelected(new Set([`${row}-${col}`]), id);
   };
   const handleMouseEnterRowHeader = (row, col, e) => {
@@ -1310,11 +1299,11 @@ const GridEdit = props => {
       }
     }
     if (selectedCells.current && selectedCells.current.size > 0) {
-      onRemoveClassSelectedCell(selectedCells.current, id);
+      onRemoveBgSelectedCell(selectedCells.current, id);
     }
     // setSelectedCells(newSelectedCells)
     selectedCells.current = newSelectedCells;
-    onAddClassBgSelectedCell(newSelectedCells, id);
+    onAddBgSelectedCell(newSelectedCells, id);
     if (rowsSelected.current && rowsSelected.current.size > 0) {
       removeClassCellIndexSelected(rowsSelected.current, id);
     }
@@ -1692,9 +1681,6 @@ const GridEdit = props => {
       indexRow,
       key
     } = args;
-
-    // const newRecord = getValues()
-
     if (changeType === 'enter') {}
     if (changeType === 'blur') {
       const handleChangeCallback = callbackData => {
@@ -1763,7 +1749,6 @@ const GridEdit = props => {
     }
     if (e.key === 'Enter' || editType === 'date' || e.type === 'dblclick') {} else {
       setValue(col.dataIndex, editType === 'numeric' ? !isNaN(Number(e.key)) ? Number(e.key) : '' : e.key);
-      // setValue(col.dataIndex, e.key)
     }
     if (editType === 'select') {
       // setSearchValue(e.key)
@@ -1771,10 +1756,7 @@ const GridEdit = props => {
     }
     if (startSelectedCells.current && startSelectedCells.current.row !== undefined && startSelectedCells.current.col !== undefined) {
       setTimeout(() => {
-        // const input = document.querySelector(`.ui-rc-table-row[data-row-key="${selectedCell.row}"] .cell-editing[data-col-index="${selectedCell.col}"] input`) as HTMLInputElement;
         const input = document.querySelector(`.ui-rc-table-row .cell-editing[data-row-index="${startSelectedCells.current.row}"].cell-editing[data-col-index="${startSelectedCells.current.col}"] input`);
-        // const input =  document.getElementById(`col${selectedCell.col}-record${selectedCell.row}`) as HTMLInputElement;
-
         const select = document.querySelector(`div.cell-editing[tabindex="${startSelectedCells.current.col}"] .ant-select-selection-search input`);
         if (input) {
           input.focus();
@@ -1835,15 +1817,17 @@ const GridEdit = props => {
       // setSelectedCells(new Set([`${rowIndex}-${colIndex}`]));
 
       const cells = new Set([`${rowIndex}-${colIndex}`]);
-      console.log('cells', cells);
       if (selectedCells.current && selectedCells.current.size > 0) {
-        onRemoveClassSelectedCell(selectedCells.current, id);
+        onRemoveBgSelectedCell(selectedCells.current, id);
+        onRemoveBorderSelectedCell(selectedCells.current, id);
       }
       hideDraggingPoint(selectedCells.current, id);
       selectedCells.current = cells;
+      setRangeCells(cells);
       setTimeout(() => {
-        onAddClassBgSelectedCell(selectedCells.current, id);
-      }, 10);
+        onAddBgSelectedCell(selectedCells.current, id);
+        onAddBorderSelectedCell(selectedCells.current, id);
+      }, 50);
       showDraggingPoint(cells, id);
     };
     const focusNextCell = (editingCell, cellEditable) => {
@@ -1891,76 +1875,6 @@ const GridEdit = props => {
       focusNextCell(cellEdit, cell);
     }
   };
-
-  // const getCellClass = (record: RecordType, rowIndex: number, colIndex: number) => {
-  //
-  //
-  //   const cellKey = `${rowIndex}-${colIndex}`;
-  //   const topCellKey = `${rowIndex + 1}-${colIndex}`;
-  //   const leftCellKey = `${rowIndex}-${colIndex + 1}`;
-  //   const rightCellKey = `${rowIndex}-${colIndex - 1}`;
-  //
-  //   const isSelected = selectedCells.has(cellKey);
-  //   const isTopSelected = selectedCells.has(topCellKey);
-  //   const isLeftSelected = selectedCells.has(leftCellKey);
-  //   const isRightSelected = selectedCells.has(rightCellKey);
-  //
-  //
-  //   const isPasteSelected = pasteCells.has(cellKey);
-  //   const isPasteLeftSelected = pasteCells.has(leftCellKey);
-  //   const isPasteRightSelected = pasteCells.has(rightCellKey);
-  //
-  //   const cellClass = isEditing(record) ? 'rc-ui-cell-editable cell-editing' : 'rc-ui-cell-editable cell-editable'
-  //
-  //   const prevRecordEditing =  flattenData(childrenColumnName, dataSource)[rowIndex + 1]
-  //
-  //   const cellStart = getFirstSelectCell(selectedCells)
-  //   const cellEnd = getLastSelectCell(selectedCells)
-  //
-  //   const cellPasteStart = getFirstSelectCell(pasteCells)
-  //   const cellPasteSEnd = getLastSelectCell(pasteCells)
-  //
-  //
-  //   const isPasteBottom = pasteCells.size && cellPasteSEnd && rowIndex === Math.max(cellPasteStart.row, cellPasteSEnd.row)
-  //
-  //
-  //   if (!isSelected && !isPasteSelected){
-  //
-  //     // const isTop = prevRecordEditing && !isEditing(prevRecordEditing) && rowIndex === Math.min(cellStart.row - 1, cellEnd?.row);
-  //     const isTop = prevRecordEditing && !isEditing(prevRecordEditing) && isTopMostInRegion(rowIndex + 1, colIndex, selectedCells)
-  //
-  //     const isLeft = colIndex + 1 === Math.min(cellStart.col, cellEnd?.col);
-  //     const isRight = colIndex - 1 === Math.max(cellStart.col, cellEnd?.col);
-  //
-  //     const isPasteLeft = colIndex + 1 === Math.min(cellPasteStart.col, cellPasteSEnd?.col);
-  //     const isPasteRight = colIndex - 1 === Math.max(cellPasteStart.col, cellPasteSEnd?.col);
-  //
-  //
-  //     return (isTopSelected || isLeftSelected || isRightSelected ) ?
-  //       `${cellClass} ${isTop ? `cell-border-top` : ''} ${isLeft ? `cell-border-left` : ''} ${isPasteBottom ? `cell-paste-border-bottom` :  ''} ${isRight ? `next-cell-border-left` : ''}` :
-  //
-  //       (isPasteLeftSelected || isPasteRightSelected) ? `${cellClass} ${isPasteLeft ? `cell-paste-border-left` :  ''} ${isPasteRight ? `next-cell-paste-border-left` :  ''}` :
-  //
-  //       cellClass
-  //
-  //   }
-  //
-  //   const isBottom = isBottomMostInRegion(rowIndex, colIndex, selectedCells)
-  //   // const isBottom = isBottomMostInRanges(rowIndex, colIndex, [selectedCells, ...ctrlCells])
-  //
-  //   // const isRight = cellEnd && colIndex === Math.max(cellStart.col, cellEnd.col)
-  //   const isRight = isRightMostInRegion(rowIndex, colIndex, selectedCells)
-  //
-  //   const isLeft = colIndex === Math.min(cellStart.col, cellEnd?.col)
-  //
-  //   const isPasteRight = cellPasteSEnd && colIndex === Math.max(cellPasteStart.col, cellPasteSEnd.col)
-  //   const isPasteLeft = colIndex === Math.min(cellPasteStart.col, cellPasteSEnd?.col)
-  //
-  //
-  //   return `${cellClass} ${isPasteBottom ? `cell-paste-border-bottom` :  ''} ${isPasteSelected && isPasteRight ? `cell-paste-border-right` :  ''} ${isPasteSelected && isPasteLeft ? `fixed-cell-paste-border-left` : '' }  ${isBottom ? `cell-border-bottom` :  ''}  ${isRight ? `cell-border-right` : '' } ${isLeft ? `fixed-cell-border-left` : '' } ${isBottom && isRight ? `cell-border-end` : '' }`
-  //
-  // };
-
   const convertColumns = flatColumns2(columns.filter(it => it.visible !== false)).map((column, colIndex) => {
     if (!column?.field && !column?.key) {
       return column;
@@ -1996,17 +1910,9 @@ const GridEdit = props => {
         render: (value, record) => {
           const rowNumber = getRowNumber(dataSource, record[rowKey], rowKey);
           return /*#__PURE__*/React.createElement("div", {
-            className: classNames('ui-rc_cell-content ui-rc_cell-content--index', {
-
-              // selected: rowsSelected.has(`${rowNumber}-${colIndex}`) ,
-
-              // focus: selectedCells && Array.from(selectedCells).some((item: any) => item.startsWith(`${rowNumber}-`))
-            }),
+            className: classNames('ui-rc_cell-content ui-rc_cell-content--index', {}),
             onMouseDown: event => handleMouseDownRowHeader(rowNumber, colIndex, column, event),
-            onMouseEnter: event => handleMouseEnterRowHeader(rowNumber, colIndex, event)
-
-            // onClick={() => handleClickRowHeader(rowNumber, colIndex)}
-            ,
+            onMouseEnter: event => handleMouseEnterRowHeader(rowNumber, colIndex, event),
             onMouseUp: handleMouseUp
           }, /*#__PURE__*/React.createElement("div", {
             className: 'ui-rc_content'
@@ -2026,17 +1932,16 @@ const GridEdit = props => {
         return {
           onKeyDown: event => {
             const key = getRowKey(record, dataSource.indexOf(record));
-            if (event.key === 'Control' && event.ctrlKey) {
-
-              // setIsCtrlDown(true)
-            } else {
+            if (event.key === 'Control' && event.ctrlKey) {} else {
               if (event.key.length === 1 && !event.ctrlKey && !event.metaKey || event.key === 'Enter') {
                 if (record[rowKey] !== editingKey && isEditable(column, record)) {
                   // ~~ khi editingKey = ''
                   event.preventDefault();
                   event.stopPropagation();
                   handleEdit(record, column, column.editType, event);
-                  onRemoveClassSelectedCell(selectedCells.current, id);
+                  onRemoveBgSelectedCell(selectedCells.current, id);
+                  onRemoveBorderSelectedCell(selectedCells.current, id);
+                  selectedCells.current = new Set();
                   handleCellClick(rowNumber, record, column);
                   const hasKey = mergedExpandedKeys.has(key);
                   if (hasKey) {
@@ -2124,6 +2029,8 @@ const GridEdit = props => {
           onDoubleClick: event => {
             if (!isEditing(record) && record[rowKey] !== editingKey && isEditable(column, record)) {
               handleEdit(record, column, getEditType(column, record), event);
+              onRemoveBgSelectedCell(selectedCells.current, id);
+              onRemoveBorderSelectedCell(selectedCells.current, id);
               handleCellClick(rowNumber, record, column);
             }
           },
@@ -2149,7 +2056,6 @@ const GridEdit = props => {
             }
           },
           className: isEditing(record) ? 'rc-ui-cell-editable cell-editing' : `rc-ui-cell-editable cell-editable ${!isEditable(column, record) ? 'disable' : ''}`,
-          // className: getCellClass(record, rowNumber, colIndex),
           record,
           column: column,
           editType: getEditType(column, record),
@@ -2166,13 +2072,10 @@ const GridEdit = props => {
           editing: isEditing(record) && rowEditable?.(record) !== false && isEditable(column, record),
           cellEditing,
           t,
-          // editing: isEditing(record) && rowEditable?.(record) !== false,
           tabIndex: (rowIndex ?? 0) * columns.length + colIndex,
           style: isPasteDragging ? {
             cursor: "crosshair"
           } : {}
-
-          // style: getStyle()
         };
       },
       onHeaderCell: (data, index) => {
@@ -2202,9 +2105,6 @@ const GridEdit = props => {
         const rowNumber = getRowNumber(dataSource, record[rowKey], rowKey);
         return /*#__PURE__*/React.createElement("div", {
           className: classNames('ui-rc_cell-content', {
-            // selected: selectedCells.has(`${record[rowKey]}-${colIndex}`)
-            // selected: selectedCells.has(`${rowNumber}-${colIndex}`) || currentCtrlCells.has(`${rowNumber}-${colIndex}`) || mergedSets([selectedCells, ...ctrlCells]).has(`${rowNumber}-${colIndex}`),
-            // selected: selectedCells.has(`${rowNumber}-${colIndex}`),
             // disable: !isEditable(column as any, record)
           }),
           onMouseDown: event => handleMouseDown(record, rowNumber, colIndex, event),
@@ -2224,7 +2124,7 @@ const GridEdit = props => {
           // }}
         }, /*#__PURE__*/React.createElement("div", {
           className: 'ui-rc_content'
-        }, renderContent(column, value, record, rowIndex, format)),
+        }, renderContent(column, value, record, rowIndex, column.format ? typeof column.format === 'function' ? column.format(record) : column.format : format)),
         // selectedCells.current && selectedCells.current.size > 0 && getLastSelectCell(selectedCells.current).row === rowNumber &&
         // getLastSelectCell(selectedCells.current).col === colIndex &&
         // isEditable(column as any, record) &&
@@ -2236,8 +2136,6 @@ const GridEdit = props => {
             e.preventDefault();
             if (e.button === 0) {
               setIsPasteDragging(true);
-
-              // isPasteDragging.current = true
             }
           },
           onDoubleClick: handlePointDoubleClick
@@ -2292,13 +2190,6 @@ const GridEdit = props => {
       }
     }));
   };
-  //
-  // const onSelectChange = (keys: any[]) => {
-  //
-  //   console.log(keys)
-  //   setMergedSelectedKeys(keys)
-  // }
-
   const contextMenuClick = args => {
     if (args.item?.parentKey && args.item.parentKey === 'INSERT_BEFORE') {
       if (args.item.key === 'INSERT_BEFORE_ADV') {
@@ -2361,7 +2252,6 @@ const GridEdit = props => {
       position: 'relative'
     },
     ref: ref
-    // onMouseUp={handleMouseUp}
   }, /*#__PURE__*/React.createElement(TableContext.Provider, {
     value: {
       rowKey,
@@ -2401,9 +2291,7 @@ const GridEdit = props => {
     components: {
       ...components,
       body: {
-        // wrapper: () => <div></div>,
         cell: EditableCell
-        // cell: () =>  <EditableCell  />,
       }
     },
     className: classNames(className, 'grid-editable'),
@@ -2464,27 +2352,15 @@ const GridEdit = props => {
       }
     },
     triggerChangeColumns: triggerChangeColumns,
-    clickHeaderToSort: false
-
-    // rowSelection={ columns && columns.length === 0 ? undefined : {
-    //   type: mode,
-    //   columnWidth: columnWidth ?? 50 ,
-    //   onChange: onSelectChange,
-    //
-    //   selectedRowKeys: mergedSelectedKeys,
-    //   preserveSelectedRowKeys: true,
-    //   arrowKey: false
-    //
-    // }}
-    ,
-
+    clickHeaderToSort: false,
     isFilter: isFilter,
     setIsFilter: setIsFilter,
     contextMenuItems: contextMenuItems,
     contextMenuClick: contextMenuClick,
     onScroll: () => {
       if (selectedCells.current && selectedCells.current.size > 0) {
-        onAddClassBgSelectedCell(selectedCells.current, id);
+        onAddBgSelectedCell(selectedCells.current, id);
+        onAddBorderSelectedCell(selectedCells.current, id);
         showDraggingPoint(selectedCells.current, id);
       }
       if (rowsSelected && rowsSelected.current.size > 0) {
@@ -2496,9 +2372,8 @@ const GridEdit = props => {
     toastOptions: {
       className: 'react-hot-toast'
     }
-  }), /*#__PURE__*/React.createElement(Modal
-  // title="Thêm dòng"
-  , {
+  }), /*#__PURE__*/React.createElement(Modal, {
+    title: "Th\xEAm d\xF2ng",
     open: openModalAddRow.open,
     onOk: onOkAddRow,
     onCancel: hideModalAddRow,

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

@@ -84,7 +84,7 @@ export type ToolbarClick = {
     item: any;
     column: any;
 };
-export type ColumnTable<RecordType = AnyObject> = Omit<RcColumnType<RecordType>, 'headerTemplate' | 'title'> & {
+export type ColumnTable<RecordType = AnyObject> = Omit<RcColumnType<RecordType>, 'headerTemplate' | 'title' | 'format' | 'commandItems'> & {
     field?: string;
     key?: any;
     type?: IColumnType;
@@ -93,7 +93,7 @@ export type ColumnTable<RecordType = AnyObject> = Omit<RcColumnType<RecordType>,
     isSummary?: boolean;
     summaryTemplate?: (data: number, key: string) => ReactElement | ReactNode;
     maxWidth?: string | number;
-    format?: IFormat;
+    format?: IFormat | ((rowData: any) => IFormat);
     allowFiltering?: boolean;
     allowSorter?: boolean;
     operator?: FilterOperator;
@@ -207,12 +207,12 @@ export type GridTableProps<RecordType = AnyObject> = TableProps<RecordType>;
 export interface CommandItem {
     id: string;
     type?: string;
-    visible?: boolean;
+    visible?: boolean | ((record: any) => boolean);
     title: string;
     color?: 'blue' | 'purple' | 'cyan' | 'green' | 'magenta' | 'pink' | 'red' | 'orange' | 'yellow' | 'volcano' | 'geekblue' | 'lime' | 'gold';
     tooltip?: string;
     icon?: ReactNode | ReactElement | (() => ReactNode | ReactElement);
-    template?: ReactNode | ReactElement | (() => ReactNode | ReactElement);
+    template?: ReactNode | ReactElement | ((record: any) => ReactNode | ReactElement);
     client?: boolean;
     confirmDialog?: boolean;
 }