es-grid-template 1.3.6 → 1.3.7

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

@@ -13,21 +13,13 @@ import dayjs from "dayjs";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
 import TableGrid from "../TableGrid";
-import { addRows8, addRowsUp, checkChild, editAbleColumns, findAllChildrenKeys, findItemByKey, findItemPath, flattenArray, flattenData, getDefaultValue, getEditType, getFirstSelectCell, getLastSelectCell, getRowNumber, getRowsPasteIndex,
-// isBottomMostInRanges,
-isBottomMostInRegion,
-// isContinuous,
-isEditable,
-// isEqualSet,
-isObjEmpty, isRightMostInRegion, isTopMostInRegion,
-// mergedSets,
-newGuid, 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, onAddClassBgSelectedCell, onRemoveClassSelectedCell, 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/es/hooks/useMergedState";
+// import useMergedState from "rc-util/lib/hooks/useMergedState";
 import { Plus, Trash2 } from "becoxy-icons";
 // import type {ContextMenuItem} from "../type";
 // import {ContextInfo, ContextMenuItem} from "../type";
@@ -117,6 +109,7 @@ const defaultContext = [{
 }];
 const GridEdit = props => {
   const {
+    // id = newGuid(),
     id,
     tableRef,
     t,
@@ -145,21 +138,36 @@ const GridEdit = props => {
     showDefaultContext,
     ...rest
   } = props;
-  const {
-    mode,
-    type,
-    // checkboxOnly,
-    // hideSelectAll,
-    columnWidth
-    // selectedRowKeys,
-    // defaultSelectedRowKeys
-  } = selectionSettings || {};
+
+  // const {
+  //   mode,
+  //   type,
+  //   checkboxOnly,
+  //   hideSelectAll,
+  //   columnWidth,
+  //   selectedRowKeys,
+  //   defaultSelectedRowKeys
+  // } = selectionSettings || {}
+
   const ref = useRef(null);
   const isSelecting = useRef(false);
   const startCell = useRef(null);
   const childrenColumnName = 'children';
   const isSelectingRow = useRef(false);
   const rowStart = useRef(null);
+  const rowsSelected = useRef(new Set());
+  const selectedCells = useRef(new Set());
+  const pasteCells = useRef(new Set());
+  const startSelectedCells = useRef(null);
+
+  // quét vùng chọn
+  const isDragMouse = useRef(false);
+  const isMouseDown = useRef(false);
+
+  // 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);
 
@@ -176,7 +184,9 @@ const GridEdit = props => {
   const [form] = Form.useForm();
   const [editingKey, setEditingKey] = useState('');
   const [isFilter, setIsFilter] = React.useState(false);
-  const [selectedCells, setSelectedCells] = 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: []}
 
@@ -189,16 +199,17 @@ const GridEdit = props => {
     open: false,
     type: ''
   });
-  // const [openModalPaste, setOpenModalPaste] = useState(defaultModalPaste)
-
   const [rowsAdd, setRowsAdd] = useState(1);
-  const [pasteCells, setPasteCells] = useState(new Set());
   const [cellEditing, setCellEditing] = useState(null);
-  const [isSelectDragging, setSelectIsDragging] = useState(false);
+
+  // const [isSelectDragging, setSelectIsDragging] = useState(false)
+
   const [isPasteDragging, setIsPasteDragging] = useState(false); // isPasteDragging == tiếp tục hiển thị con trỏ crosshair
 
-  const [rowsSelected, setRowsSelected] = useState(new Set());
-  const [startSelectedCells, setStartSelectedCell] = useState(null);
+  // const [rowsSelected, setRowsSelected] = useState(new Set())
+
+  // const [startSelectedCells, setStartSelectedCell] = useState<{ row: number; col: number } | null>(null)
+
   const [innerExpandedKeys, setInnerExpandedKeys] = React.useState(() => {
     // if (defaultExpandedRowKeys) {
     //   return defaultExpandedRowKeys;
@@ -209,11 +220,16 @@ const GridEdit = props => {
     // return [];
   });
   const mergedExpandedKeys = React.useMemo(() => new Set(innerExpandedKeys || []), [innerExpandedKeys]);
-  const [mergedSelectedKeys, setMergedSelectedKeys] = useMergedState([], {
-    value: []
-  });
+
+  // const [mergedSelectedKeys, setMergedSelectedKeys] = useMergedState<any[]>(
+  //   [],
+  //   {
+  //     value: [],
+  //   },
+  // );
+
   const rowsFocus = React.useMemo(() => {
-    return [...new Set(Array.from(selectedCells).map(item => parseInt(item.split('-')[0])))] ?? [];
+    return [...new Set(Array.from(selectedCells.current).map(item => parseInt(item.split('-')[0])))] ?? [];
   }, [selectedCells]);
   const contextMenuItems = React.useMemo(() => {
     const a = showDefaultContext !== false ? [...defaultContext] : [];
@@ -505,14 +521,14 @@ const GridEdit = props => {
     triggerChangeData?.([], 'INSERT_BEFORE');
   };
   const handleDeleteContent = () => {
-    if (selectedCells.size > 0) {
+    if (selectedCells.current.size > 0) {
       const newData = [...dataSource];
 
       // colIndex => field
       const colIndexToField = flatColumns2(columns).map(col => col.field);
 
       // Duyệt qua mỗi ô cần xóa
-      for (const cell of selectedCells) {
+      for (const cell of selectedCells.current) {
         const [rowIndexStr, colIndexStr] = cell.split("-");
         const rowIndex = Number(rowIndexStr);
         const colIndex = Number(colIndexStr);
@@ -777,8 +793,13 @@ const GridEdit = props => {
         setEditingKey('');
         isSelecting.current = false;
         startCell.current = null;
-        setSelectedCells(new Set());
-        setRowsSelected(new Set());
+        // setSelectedCells(new Set())
+        // setRowsSelected(new Set())
+
+        onRemoveClassSelectedCell(selectedCells.current, id);
+        hideDraggingPoint(selectedCells.current, id);
+        rowsSelected.current = new Set();
+        selectedCells.current = new Set();
       }
 
       // if (tableBodies.length > 0) {
@@ -805,6 +826,9 @@ const GridEdit = props => {
       e.stopPropagation();
       return;
     }
+
+    // isDragMouse.current = true
+    isMouseDown.current = true;
     if (e.ctrlKey) {
       isSelecting.current = true;
       startCell.current = {
@@ -821,43 +845,43 @@ const GridEdit = props => {
         row,
         col
       };
-      if (e.target.className === 'dragging-point') {
-        // e.stopPropagation()
-        // e.preventDefault()
+      const target = e.target;
+      if (target.closest('.dragging-point')) {
+        e.stopPropagation();
+        e.preventDefault();
+        return; // Không xử lý gì cả
       } else {
-        setStartSelectedCell({
+        // setStartSelectedCell({row, col})
+
+        startSelectedCells.current = {
           row,
           col
-        });
-        setSelectedCells(new Set([`${row}-${col}`]));
-        setRowsSelected(new Set());
+        };
+
+        // setSelectedCells(new Set([`${row}-${col}`]));
+
+        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);
+          }
+        }
+        selectedCells.current = cells;
+        onAddClassBgSelectedCell(cells, id);
+        if (rowsSelected.current && rowsSelected.current.size > 0) {
+          removeClassCellIndexSelected(rowsSelected.current, id);
+        }
+        // setRowsSelected(new Set())
+        rowsSelected.current = new Set();
       }
     }
-
-    // isSelecting.current = true;
-    // startCell.current = { row, col };
-    //
-    // if (e.target.className === 'dragging-point') {
-    //   // e.stopPropagation()
-    //   // e.preventDefault()
-    // } else {
-    //
-    //   setStartSelectedCell({row, col})
-    //   setSelectedCells(new Set([`${row}-${col}`]));
-    //   setRowsSelected(new Set())
-    // }
   };
   const triggerDragPaste = pastesArray => {
-    const mergedSet = new Set([...selectedCells, ...pastesArray]);
-
-    // console.log('pastesArray', pastesArray)
-    // console.log('selectedCells', selectedCells)
-
-    setSelectedCells(sortedSetASC(mergedSet));
-    setPasteCells(new Set());
-    const rowSelectedFirst = getFirstSelectCell(selectedCells).row;
-    const rowPasteLast = getLastSelectCell(pasteCells).row;
-    const selectedArray = Array.from(selectedCells).map(key => {
+    const mergedSet = new Set([...selectedCells.current, ...pastesArray]);
+    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;
@@ -871,6 +895,35 @@ const GridEdit = props => {
       // return { row, col, value: '' };
     });
 
+    // let selectedArray = []
+    //
+    // if (rowPasteLast > rowSelectedFirst) {
+    //   // kéo xuóng
+    //    selectedArray = Array.from(selectedCells).map((key: any) => {
+    //
+    //     const [row, col] = key.split("-").map(Number);
+    //     // @ts-ignore
+    //     const columnKey = columns[col].field;
+    //
+    //     // @ts-ignore
+    //     return { row, col, value: flattenData(childrenColumnName as any,dataSource)[row][columnKey] };
+    //     // return { row, col, value: '' };
+    //   });
+    // } else {
+    //   // kéo lên
+    //
+    //    selectedArray = Array.from(sortedSetDSC(selectedCells)).map((key: any) => {
+    //
+    //     const [row, col] = key.split("-").map(Number);
+    //     // @ts-ignore
+    //     const columnKey = columns[col].field;
+    //
+    //     // @ts-ignore
+    //     return { row, col, value: flattenData(childrenColumnName as any,dataSource)[row][columnKey] };
+    //     // return { row, col, value: '' };
+    //   });
+    // }
+
     // Xác định min/max row và col để sắp xếp dữ liệu
     const minRow = Math.min(...selectedArray.map(cell => cell.row));
     const maxRow = Math.max(...selectedArray.map(cell => cell.row));
@@ -909,7 +962,7 @@ const GridEdit = props => {
       // Lấy vị trí bắt đầu
       // const { row: startRow, col: startCol } = selectedCell;
       const startRow = getFirstSelectCell(pastesArray).row;
-      const startCol = getFirstSelectCell(selectedCells).col;
+      const startCol = getFirstSelectCell(selectedCells.current).col;
       const pastedRows = [];
       const pastedColumns = new Set();
       newRange.addedRows.forEach((rowValues, rowIndex) => {
@@ -947,19 +1000,38 @@ const GridEdit = props => {
       const pastedColumnsArray = Array.from(pastedColumns) ?? [];
       triggerPaste?.(pastedRows, pastedColumnsArray, newData);
     }
+
+    /// cập nhật cell class
+    if (selectedCells.current && selectedCells.current.size > 0) {
+      onRemoveClassSelectedCell(selectedCells.current, id);
+    }
+
+    // selectedCells.current = sortedSetASC(mergedSet)
+    hideDraggingPoint(selectedCells.current, id);
+    selectedCells.current = sortedSetASC(mergedSet);
+    onAddClassBgSelectedCell(sortedSetASC(mergedSet), id);
+    showDraggingPoint(sortedSetASC(mergedSet), id);
+
+    // setPasteCells(new Set())
+
+    if (pasteCells.current && pasteCells.current.size > 0) {
+      removeClassBorderPasteCell(pasteCells.current, 'up', id);
+    }
+    pasteCells.current = new Set();
   };
   const handlePointDoubleClick = e => {
-    e.preventDefault();
+    // e.preventDefault()
     e.stopPropagation();
-    const colStart = getFirstSelectCell(selectedCells).col;
-    const colEnd = getLastSelectCell(selectedCells).col;
-    const startPasteRow = getLastSelectCell(selectedCells).row;
+    const colStart = getFirstSelectCell(selectedCells.current).col;
+    const colEnd = getLastSelectCell(selectedCells.current).col;
+    const startPasteRow = getLastSelectCell(selectedCells.current).row;
     const newPasteCells = new Set();
     for (let r = Math.min(startPasteRow, dataSource.length - 1) + 1; r <= Math.max(startPasteRow, dataSource.length - 1); r++) {
       for (let c = Math.min(colStart, colStart); c <= Math.max(colStart, colEnd); c++) {
         newPasteCells.add(`${r}-${c}`);
       }
     }
+    hideDraggingPoint(selectedCells.current, id);
     triggerDragPaste(newPasteCells);
   };
 
@@ -988,8 +1060,12 @@ const GridEdit = props => {
     startCell.current = null;
     isSelectingRow.current = false;
     rowStart.current = null;
+    isDragMouse.current = false;
+    isMouseDown.current = false;
     setIsPasteDragging(false);
-    setSelectIsDragging(false);
+
+    // isPasteDragging.current = false
+    // setSelectIsDragging(false);
 
     // setCurrentCtrlCells(new Set())
 
@@ -1000,10 +1076,30 @@ const GridEdit = props => {
 
     // nếu ctrlCell length > 0 thì set selectCells
 
-    if (pasteCells.size > 0) {
-      triggerDragPaste(pasteCells);
+    if (pasteCells && pasteCells.current.size > 0) {
+      triggerDragPaste(pasteCells.current);
+    } else {
+      const target = e.target;
+      if (target.closest('.dragging-point')) {
+        e.stopPropagation();
+        e.preventDefault();
+        return; // Không xử lý gì cả
+      }
+      if (selectedCells.current && selectedCells.current.size > 0) {
+        hideDraggingPoint(selectedCells.current, id);
+      }
+      showDraggingPoint(selectedCells.current, id);
     }
   };
+
+  // const handlePointEnter = () => {
+  //   isPointEnter.current = true;
+  // }
+  //
+  // const handlePointLeave = () => {
+  //   isPointEnter.current = false;
+  // }
+
   const handleMouseEnter = (row, col, e) => {
     if (!isSelecting.current || !startCell.current) {
       return;
@@ -1027,29 +1123,41 @@ const GridEdit = props => {
     if (!isPasteDragging) {
       // chọn vùng copy
 
-      setSelectIsDragging(true);
+      // setSelectIsDragging(true)
+
       setIsPasteDragging(false);
+      // isPasteDragging.current = false
+
       const newSelectedCells = new Set();
       for (let r = Math.min(startRow, row); r <= Math.max(startRow, row); r++) {
         for (let c = Math.min(startCol, col); c <= Math.max(startCol, col); c++) {
           newSelectedCells.add(`${r}-${c}`);
         }
       }
-      setSelectedCells(newSelectedCells);
+
+      // setSelectedCells(newSelectedCells)
+
+      if (selectedCells.current && selectedCells.current.size > 0) {
+        onRemoveClassSelectedCell(selectedCells.current, id);
+      }
+      selectedCells.current = newSelectedCells;
+      onAddClassBgSelectedCell(newSelectedCells, id);
     } else {
       // chọn vùng paste
 
-      setSelectIsDragging(false);
-      setIsPasteDragging(true);
+      // setSelectIsDragging(false)
+
+      // setIsPasteDragging(true)  ////////
+
       const newSelectedCells = new Set();
       for (let r = Math.min(startRow, row); r <= Math.max(startRow, row); r++) {
         for (let c = Math.min(startCol, col); c <= Math.max(startCol, col); c++) {
           newSelectedCells.add(`${r}-${c}`);
         }
       }
-      const colStart = getFirstSelectCell(selectedCells).col;
-      const colEnd = getLastSelectCell(selectedCells).col;
-      const rowSelectedEnd = getLastSelectCell(selectedCells).row;
+      const colStart = getFirstSelectCell(selectedCells.current).col;
+      const colEnd = getLastSelectCell(selectedCells.current).col;
+      const rowSelectedEnd = getLastSelectCell(selectedCells.current).row;
       if (row >= rowSelectedEnd) {
         // kéo xuống dưới
 
@@ -1059,12 +1167,19 @@ const GridEdit = props => {
             newPasteCells.add(`${r}-${c}`);
           }
         }
-        setPasteCells(newPasteCells);
+
+        // setPasteCells(newPasteCells)
+
+        if (pasteCells.current && pasteCells.current.size > 0) {
+          removeClassBorderPasteCell(pasteCells.current, 'down', id);
+        }
+        pasteCells.current = newPasteCells;
+        addClassBorderPasteCell(newPasteCells, 'down', id);
       }
       if (row < rowSelectedEnd) {
         // kéo lên trên
 
-        const rowSelectedStart = getFirstSelectCell(selectedCells).row;
+        const rowSelectedStart = getFirstSelectCell(selectedCells.current).row;
         if (row < rowSelectedStart) {
           const newPasteCells = new Set();
           for (let r = Math.min(rowSelectedStart, row); r <= Math.max(rowSelectedStart, row) - 1; r++) {
@@ -1072,7 +1187,14 @@ const GridEdit = props => {
               newPasteCells.add(`${r}-${c}`);
             }
           }
-          setPasteCells(newPasteCells);
+
+          // setPasteCells(newPasteCells)
+
+          if (pasteCells.current && pasteCells.current.size > 0) {
+            removeClassBorderPasteCell(pasteCells.current, 'up', id);
+          }
+          pasteCells.current = newPasteCells;
+          addClassBorderPasteCell(newPasteCells, 'up', id);
         }
       }
       if (col > colEnd) {
@@ -1083,16 +1205,32 @@ const GridEdit = props => {
       }
     }
   };
-  const handleClickRowHeader = (row, col) => {
-    const newSelectedCells = new Set();
-    const tCols = editAbleColumns(columns);
-    for (let r = Math.min(row, row); r <= Math.max(row, row); r++) {
-      for (let c = Math.min(tCols.length, col) + 1; c <= Math.max(tCols.length, col); c++) {
-        newSelectedCells.add(`${r}-${c}`);
-      }
-    }
-    setSelectedCells(newSelectedCells);
-  };
+
+  // const handleClickRowHeader = (row: any, col: any) => {
+  //
+  //   const newSelectedCells = new Set()
+  //
+  //   const tCols = editAbleColumns(columns)
+  //
+  //   for (let r = Math.min(row, row); r <= Math.max(row, row); r++) {
+  //     for (let c = Math.min(tCols.length, col) + 1; c <= Math.max(tCols.length, col); c++) {
+  //       newSelectedCells.add(`${r}-${c}`)
+  //     }
+  //   }
+  //
+  //   // setSelectedCells(newSelectedCells)
+  //
+  //   if (selectedCells.current && selectedCells.current.size > 0) {
+  //     onRemoveClassSelectedCell(selectedCells.current, id)
+  //   }
+  //
+  //   selectedCells.current = newSelectedCells
+  //
+  //   onAddClassBgSelectedCell(newSelectedCells, id)
+  //
+  //
+  // };
+
   const handleClickColHeader = (column, indexColumn) => {
     const newSelectedCells = new Set();
     for (let r = Math.min(dataSource.length, 0); r <= Math.max(dataSource.length - 1, 0); r++) {
@@ -1100,9 +1238,21 @@ const GridEdit = props => {
         newSelectedCells.add(`${r}-${c}`);
       }
     }
-    setSelectedCells(new Set(newSelectedCells));
+
+    // setSelectedCells(new Set(newSelectedCells));
+
+    if (selectedCells.current && selectedCells.current.size > 0) {
+      onRemoveClassSelectedCell(selectedCells.current, id);
+    }
+    if (rowsSelected.current && rowsSelected.current.size > 0) {
+      removeClassCellIndexSelected(rowsSelected.current, id);
+    }
+    selectedCells.current = newSelectedCells;
+    onAddClassBgSelectedCell(newSelectedCells, id);
+    hideDraggingPoint(selectedCells.current, id);
+    showDraggingPoint(newSelectedCells, id);
   };
-  const handleMouseDownColIndex = (row, col, e) => {
+  const handleMouseDownRowHeader = (row, col, column, e) => {
     if (e.button === 2) {
       e.stopPropagation();
       return;
@@ -1112,9 +1262,30 @@ const GridEdit = props => {
       row,
       col
     };
-    setRowsSelected(new Set([`${row}-${col}`]));
+    const newSelectedCells = new Set();
+    const tCols = editAbleColumns(columns);
+    for (let r = Math.min(row, row); r <= Math.max(row, row); r++) {
+      for (let c = Math.min(tCols.length, col) + 1; c <= Math.max(tCols.length, col); c++) {
+        newSelectedCells.add(`${r}-${c}`);
+      }
+    }
+
+    // setSelectedCells(newSelectedCells)
+    // setRowsSelected(new Set([`${row}-${col}`]));
+
+    if (selectedCells.current && selectedCells.current.size > 0) {
+      onRemoveClassSelectedCell(selectedCells.current, id);
+    }
+    if (rowsSelected.current && rowsSelected.current.size > 0) {
+      removeClassCellIndexSelected(rowsSelected.current, id);
+    }
+    hideDraggingPoint(selectedCells.current, id);
+    selectedCells.current = newSelectedCells;
+    rowsSelected.current = new Set([`${row}-${col}`]);
+    onAddClassBgSelectedCell(newSelectedCells, id);
+    addClassCellIndexSelected(new Set([`${row}-${col}`]), id);
   };
-  const handleMouseEnterColIndex = (row, col, e) => {
+  const handleMouseEnterRowHeader = (row, col, e) => {
     // dừng sự kiện kéo để chọn từ các column khác khi vừa gặp column index
     if (isSelecting) {
       startCell.current = null;
@@ -1138,8 +1309,18 @@ const GridEdit = props => {
         newSelectedCells.add(`${r}-${c}`);
       }
     }
-    setRowsSelected(newSelectedRows);
-    setSelectedCells(newSelectedCells);
+    if (selectedCells.current && selectedCells.current.size > 0) {
+      onRemoveClassSelectedCell(selectedCells.current, id);
+    }
+    // setSelectedCells(newSelectedCells)
+    selectedCells.current = newSelectedCells;
+    onAddClassBgSelectedCell(newSelectedCells, id);
+    if (rowsSelected.current && rowsSelected.current.size > 0) {
+      removeClassCellIndexSelected(rowsSelected.current, id);
+    }
+    // setRowsSelected(newSelectedRows)
+    rowsSelected.current = newSelectedRows;
+    addClassCellIndexSelected(newSelectedRows, id);
   };
   const handleCellClick = (indexRow, record, column) => {
     const cellClickCallback = newOptions => {
@@ -1169,7 +1350,7 @@ const GridEdit = props => {
     }
   };
   const handleCopy = e => {
-    const selectedArray = Array.from(selectedCells).map(key => {
+    const selectedArray = Array.from(selectedCells.current).map(key => {
       const [row, col] = key.split("-").map(Number);
       // @ts-ignore
       const columnKey = editAbleColumns(columns)[col - 1].field;
@@ -1534,7 +1715,7 @@ const GridEdit = props => {
             indexRow,
             rowData: record,
             rowId: key,
-            rowsData: [],
+            rowsData: [...dataSource],
             sumValue: []
           }, handleChangeCallback);
         } else {
@@ -1547,7 +1728,7 @@ const GridEdit = props => {
             indexRow,
             rowData: record,
             rowId: key,
-            rowsData: [],
+            rowsData: [...dataSource],
             sumValue: []
           }, handleChangeCallback);
           onSubmit(record);
@@ -1580,20 +1761,6 @@ const GridEdit = props => {
         // }
       });
     }
-
-    // columns.forEach(column => {
-    //
-    //   const dateFormat  = getDatepickerFormat(editType, column)
-    //
-    //   // @ts-ignore
-    //   if ((column.editType === 'date' || column.editType === 'datetime') && record[column.dataIndex]) {
-    //
-    //     // @ts-ignore
-    //     formattedRecord[column.dataIndex] = !isEmpty(record[column.dataIndex]) ? convertDateToDayjs(new Date(record[column.dataIndex]), dateFormat) : null
-    //   }
-    //
-    // });
-
     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)
@@ -1602,13 +1769,13 @@ const GridEdit = props => {
       // setSearchValue(e.key)
       // setOpen(true)
     }
-    if (startSelectedCells?.row !== undefined && startSelectedCells?.col !== undefined) {
+    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.row}"].cell-editing[data-col-index="${startSelectedCells.col}"] input`);
+        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?.col}"] .ant-select-selection-search input`);
+        const select = document.querySelector(`div.cell-editing[tabindex="${startSelectedCells.current.col}"] .ant-select-selection-search input`);
         if (input) {
           input.focus();
         }
@@ -1660,11 +1827,24 @@ const GridEdit = props => {
     const cellEdit = document.querySelector(`.ui-rc-table-row .cell-editing[data-row-index="${rowIndex}"].cell-editing[data-col-index="${colIndex}"]`);
     const cell = document.querySelector(`.ui-rc-table-row .cell-editable[data-row-index="${rowIndex}"].cell-editable[data-col-index="${colIndex}"]`);
     const updateSelection = () => {
-      setStartSelectedCell({
+      // setStartSelectedCell({ row: rowIndex, col: colIndex });
+      startSelectedCells.current = {
         row: rowIndex,
         col: colIndex
-      });
-      setSelectedCells(new Set([`${rowIndex}-${colIndex}`]));
+      };
+      // 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);
+      }
+      hideDraggingPoint(selectedCells.current, id);
+      selectedCells.current = cells;
+      setTimeout(() => {
+        onAddClassBgSelectedCell(selectedCells.current, id);
+      }, 10);
+      showDraggingPoint(cells, id);
     };
     const focusNextCell = (editingCell, cellEditable) => {
       if (isEdit) {
@@ -1711,62 +1891,88 @@ const GridEdit = props => {
       focusNextCell(cellEdit, cell);
     }
   };
-  const getCellClass = (record, rowIndex, colIndex) => {
-    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 topPasteCellKey = `${rowIndex + 1}-${colIndex}`;
-    const isPasteSelected = pasteCells.has(cellKey);
-    const isPasteTopSelected = pasteCells.has(topPasteCellKey);
-    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 = cellPasteSEnd.row > cellStart.row && pasteCells.size && cellPasteSEnd && rowIndex === Math.max(cellPasteStart.row, cellPasteSEnd.row);
-
-    // const rowSelectedFirst = getFirstSelectCell(selectedCells).row
-    // const rowPasteLast = getLastSelectCell(pasteCells).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 isPasteTop = cellPasteSEnd.row < cellStart.row && isTopMostInRegion(rowIndex + 1, colIndex, pasteCells);
-      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 || isPasteTopSelected ? `${cellClass} ${isPasteLeft ? `cell-paste-border-left` : ''} ${isPasteRight ? `next-cell-paste-border-left` : ''} ${isPasteTop ? `cell-paste-border-top` : ''}` : 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 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;
     }
-    if (column.dataIndex === 'index' || column.field === 'index' || column.dataIndex === '#' || column.dataIndex === '#') {
+    if (column.dataIndex === '#' || column.dataIndex === '#') {
       return {
         ...column,
-        className: 'rc-ui-cell-editable',
+        className: 'rc-ui-cell-editable rc-ui-cell-index',
         onCell: (record, rowIndex) => {
           const rowNumber = getRowNumber(dataSource, record[rowKey], rowKey);
           return {
+            'data-row-index': rowNumber,
             onPaste: event => {
               if (editingKey === '') {
                 handlePaste(record, colIndex + 1, rowNumber, event);
@@ -1791,12 +1997,16 @@ const GridEdit = props => {
           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 => item.startsWith(`${rowNumber}-`))
+
+              // selected: rowsSelected.has(`${rowNumber}-${colIndex}`) ,
+
+              // focus: selectedCells && Array.from(selectedCells).some((item: any) => item.startsWith(`${rowNumber}-`))
             }),
-            onMouseDown: event => handleMouseDownColIndex(rowNumber, colIndex, event),
-            onMouseEnter: event => handleMouseEnterColIndex(rowNumber, colIndex, event),
-            onClick: () => handleClickRowHeader(rowNumber, colIndex),
+            onMouseDown: event => handleMouseDownRowHeader(rowNumber, colIndex, column, event),
+            onMouseEnter: event => handleMouseEnterRowHeader(rowNumber, colIndex, event)
+
+            // onClick={() => handleClickRowHeader(rowNumber, colIndex)}
+            ,
             onMouseUp: handleMouseUp
           }, /*#__PURE__*/React.createElement("div", {
             className: 'ui-rc_content'
@@ -1826,6 +2036,7 @@ const GridEdit = props => {
                   event.preventDefault();
                   event.stopPropagation();
                   handleEdit(record, column, column.editType, event);
+                  onRemoveClassSelectedCell(selectedCells.current, id);
                   handleCellClick(rowNumber, record, column);
                   const hasKey = mergedExpandedKeys.has(key);
                   if (hasKey) {
@@ -1867,7 +2078,7 @@ const GridEdit = props => {
                 }
               }
               if (event.key === 'ArrowLeft' && colIndex > 0) {
-                if (!column.dataIndex && !column.key || column.field === 'index' || column.field === '#' || column.dataIndex === 'index' || column.dataIndex === '#') {
+                if (!column.dataIndex && !column.key || column.field === '#' || column.dataIndex === '#') {
                   event.stopPropagation();
                   event.preventDefault();
                 } else {
@@ -1898,13 +2109,6 @@ const GridEdit = props => {
               }
             }
           },
-          // onKeyUp: (event: any) => {
-          //   if (event.key === 'Control' && event.ctrlKey) {
-          //
-          //     console.log('onKeyUp')
-          //   }
-          // },
-
           onPaste: event => {
             if (editingKey === '') {
               handlePaste(record, colIndex, rowNumber, event);
@@ -1928,12 +2132,15 @@ const GridEdit = props => {
             // startCell.current = { row: rowNumber, col: colIndex };
 
             if (selectedCells.size === 0) {
-              setStartSelectedCell({
+              // setStartSelectedCell({ row: rowNumber, col: colIndex })
+              // setSelectedCells(new Set([`${rowNumber}-${colIndex}`]));
+
+              startSelectedCells.current = {
                 row: rowNumber,
                 col: colIndex
-              });
-              setSelectedCells(new Set([`${rowNumber}-${colIndex}`]));
-              setRowsSelected(new Set());
+              };
+              selectedCells.current = new Set([`${rowNumber}-${colIndex}`]);
+              rowsSelected.current = new Set();
             }
           },
           onClick: () => {
@@ -1941,12 +2148,14 @@ const GridEdit = props => {
               setEditingKey('');
             }
           },
-          // className: isEditing(record) ? 'rc-ui-cell-editable cell-editing' : 'rc-ui-cell-editable cell-editable',
-          className: getCellClass(record, rowNumber, colIndex),
+          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),
           dataIndex: column.dataIndex,
+          indexRow: rowNumber,
+          indexCol: colIndex,
           title: getValueCell(column, record[column.field], format),
           'data-col-index': colIndex,
           'data-row-index': rowNumber,
@@ -1962,6 +2171,8 @@ const GridEdit = props => {
           style: isPasteDragging ? {
             cursor: "crosshair"
           } : {}
+
+          // style: getStyle()
         };
       },
       onHeaderCell: (data, index) => {
@@ -1993,12 +2204,19 @@ const GridEdit = props => {
           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, record)
+            // selected: selectedCells.has(`${rowNumber}-${colIndex}`),
+            // disable: !isEditable(column as any, record)
           }),
           onMouseDown: event => handleMouseDown(record, rowNumber, colIndex, event),
           onMouseEnter: event => handleMouseEnter(rowNumber, colIndex, event),
-          onMouseUp: handleMouseUp
+          onMouseUp: handleMouseUp,
+          onMouseMove: () => {
+            if (selectedCells && selectedCells.current.size > 0 && isMouseDown.current) {
+              hideDraggingPoint(selectedCells.current, id);
+              isDragMouse.current = true;
+            }
+          }
+
           // onClick={(event) => {
           //
           //   handleClickCell(event)
@@ -2006,18 +2224,21 @@ const GridEdit = props => {
           // }}
         }, /*#__PURE__*/React.createElement("div", {
           className: 'ui-rc_content'
-        }, renderContent(column, value, record, rowIndex, format)), selectedCells && selectedCells.size > 0 && getLastSelectCell(selectedCells).row === rowNumber && getLastSelectCell(selectedCells).col === colIndex && isEditable(column, record) && !isSelectDragging && rowIndex !== dataSource.length - 1 &&
-        /*#__PURE__*/
-        // showDraggingPoint &&
-        React.createElement("div", {
-          className: 'dragging-point'
-          // onMouseEnter={(event) => handlePointEnter(event)}
-          // onMouseLeave={() => handlePointLeave()}
-          ,
+        }, renderContent(column, value, record, rowIndex, format)),
+        // selectedCells.current && selectedCells.current.size > 0 && getLastSelectCell(selectedCells.current).row === rowNumber &&
+        // getLastSelectCell(selectedCells.current).col === colIndex &&
+        // isEditable(column as any, record) &&
+
+        !isDragMouse.current && /*#__PURE__*/React.createElement("div", {
+          className: 'dragging-point hidden',
           onMouseDown: e => {
             // e.stopPropagation()
             e.preventDefault();
-            setIsPasteDragging(true);
+            if (e.button === 0) {
+              setIsPasteDragging(true);
+
+              // isPasteDragging.current = true
+            }
           },
           onDoubleClick: handlePointDoubleClick
         }, /*#__PURE__*/React.createElement("span", {
@@ -2071,9 +2292,13 @@ const GridEdit = props => {
       }
     }));
   };
-  const onSelectChange = keys => {
-    setMergedSelectedKeys(keys);
-  };
+  //
+  // 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') {
@@ -2131,7 +2356,7 @@ const GridEdit = props => {
     setRowsAdd(val);
   };
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(GridStyle, {
-    heightTable: height,
+    $heightTable: height,
     style: {
       position: 'relative'
     },
@@ -2194,9 +2419,11 @@ const GridEdit = props => {
     ,
     selectionSettings: selectionSettings ? {
       ...selectionSettings,
-      checkboxOnly: true
+      checkboxOnly: true,
+      arrowKey: false
     } : {
-      checkboxOnly: true
+      checkboxOnly: true,
+      arrowKey: false
     },
     rowHoverable: false,
     bottomToolbar: bottomToolbar,
@@ -2237,18 +2464,33 @@ const GridEdit = props => {
       }
     },
     triggerChangeColumns: triggerChangeColumns,
-    clickHeaderToSort: false,
-    rowSelection: columns && columns.length === 0 ? undefined : {
-      type: mode === 'checkbox' || type === 'multiple' ? 'checkbox' : "radio",
-      columnWidth: !mode ? 0.0000001 : columnWidth ?? 50,
-      onChange: onSelectChange,
-      selectedRowKeys: mergedSelectedKeys,
-      preserveSelectedRowKeys: true
-    },
+    clickHeaderToSort: false
+
+    // rowSelection={ columns && columns.length === 0 ? undefined : {
+    //   type: mode,
+    //   columnWidth: columnWidth ?? 50 ,
+    //   onChange: onSelectChange,
+    //
+    //   selectedRowKeys: mergedSelectedKeys,
+    //   preserveSelectedRowKeys: true,
+    //   arrowKey: false
+    //
+    // }}
+    ,
+
     isFilter: isFilter,
     setIsFilter: setIsFilter,
     contextMenuItems: contextMenuItems,
-    contextMenuClick: contextMenuClick
+    contextMenuClick: contextMenuClick,
+    onScroll: () => {
+      if (selectedCells.current && selectedCells.current.size > 0) {
+        onAddClassBgSelectedCell(selectedCells.current, id);
+        showDraggingPoint(selectedCells.current, id);
+      }
+      if (rowsSelected && rowsSelected.current.size > 0) {
+        addClassCellIndexSelected(rowsSelected.current, id);
+      }
+    }
   })))))), /*#__PURE__*/React.createElement(Toaster, {
     position: toast,
     toastOptions: {