es-grid-template 1.4.3 → 1.4.4

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

@@ -188,7 +188,7 @@ const GridEdit = props => {
     dataSource,
     components,
     allowResizing,
-    rowKey = 'id',
+    rowKey = 'rowId',
     selectionSettings,
     height,
     format,
@@ -365,13 +365,13 @@ const GridEdit = props => {
   // thêm n dòng bên trên
   const handleInsertBefore = _react.default.useCallback((item, n) => {
     //
-    (0, _hooks.onRemoveBgSelectedCell)(selectedCells.current, id);
-    (0, _hooks.onRemoveBorderSelectedCell)(selectedCells.current, id);
+    // onRemoveBgSelectedCell(selectedCells.current, id)
+    // onRemoveBorderSelectedCell(selectedCells.current, id)
     //
 
     setTimeout(() => {
-      (0, _hooks.onAddBgSelectedCell)(selectedCells.current, id);
-      (0, _hooks.onAddBorderSelectedCell)(selectedCells.current, id);
+      // onAddBgSelectedCell(selectedCells.current, id)
+      // onAddBorderSelectedCell(selectedCells.current, id)
     }, 10);
     const defaultRowValue = (0, _hooks.getDefaultValue)(defaultValue);
     // const rowId = defaultRowValue && defaultRowValue.id ? defaultRowValue.id : newGuid()
@@ -561,8 +561,8 @@ const GridEdit = props => {
   }, [dataSource, defaultValue, getRowKey, mergedExpandedKeys, rowKey, rowsFocus, triggerChangeData]);
   const handleDeleteRows = _react.default.useCallback(item => {
     setTimeout(() => {
-      (0, _hooks.onAddBgSelectedCell)(selectedCells.current, id);
-      (0, _hooks.onAddBorderSelectedCell)(selectedCells.current, id);
+      // onAddBgSelectedCell(selectedCells.current, id)
+      // onAddBorderSelectedCell(selectedCells.current, id)
     });
     if (item.onClick) {
       item.onClick({
@@ -824,7 +824,7 @@ const GridEdit = props => {
     }
   } = (0, _reactHookForm.useForm)({
     mode: 'onChange',
-    resolver: (0, _yup.yupResolver)(validate)
+    resolver: validate ? (0, _yup.yupResolver)(validate) : undefined
   });
   const isEditing = _react.default.useCallback(record => {
     return record[rowKey] === editingKey;
@@ -874,77 +874,6 @@ const GridEdit = props => {
       document.removeEventListener("click", handleClickOutside);
     };
   }, [id]);
-  const handleMouseDown = (record, row, col, e) => {
-    if (editingKey && editingKey === record[rowKey]) {
-      return;
-    }
-    if (e.button === 2) {
-      e.stopPropagation();
-      return;
-    }
-
-    // isDragMouse.current = true
-    isMouseDown.current = true;
-    if (e.ctrlKey) {
-      isSelecting.current = true;
-      startCell.current = {
-        row,
-        col
-      };
-
-      // const cell: any  = new Set([`${row}-${col}`])
-
-      // setCurrentCtrlCells(cell)
-    } else {
-      isSelecting.current = true;
-      startCell.current = {
-        row,
-        col
-      };
-      const target = e.target;
-      if (target.closest('.dragging-point')) {
-        e.stopPropagation();
-        e.preventDefault();
-        return; // Không xử lý gì cả
-      } else {
-        // setStartSelectedCell({row, col})
-
-        startSelectedCells.current = {
-          row,
-          col
-        };
-
-        // setSelectedCells(new Set([`${row}-${col}`]));
-
-        const cells = new Set([`${row}-${col}`]);
-        if (selectedCells.current && selectedCells.current.size > 0) {
-          if (!(0, _hooks.isEqualSet)(cells, rangeCells)) {
-            (0, _hooks.onRemoveBgSelectedCell)(rangeCells, id);
-            (0, _hooks.onRemoveBorderSelectedCell)(rangeCells, id);
-            (0, _hooks.hideDraggingPoint)(rangeCells, id);
-          }
-        }
-        if (rowsSelected.current && rowsSelected.current.size > 0) {
-          (0, _hooks.removeClassCellIndexSelected)(rowsSelected.current, id);
-        }
-        if (!(0, _hooks.isEqualSet)(cells, selectedCells.current)) {
-          selectedCells.current = cells;
-          if (editingKey) {
-            setTimeout(() => {
-              (0, _hooks.onAddBgSelectedCell)(cells, id);
-              (0, _hooks.onAddBorderSelectedCell)(cells, id);
-            }, 200);
-          } else {
-            (0, _hooks.onAddBgSelectedCell)(cells, id);
-            (0, _hooks.onAddBorderSelectedCell)(cells, id);
-          }
-        }
-
-        // setRowsSelected(new Set())
-        rowsSelected.current = new Set();
-      }
-    }
-  };
   const triggerDragPaste = pastesArray => {
     const mergedSet = new Set([...selectedCells.current, ...pastesArray]);
     const tmpCols = {
@@ -965,35 +894,6 @@ 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));
@@ -1073,18 +973,20 @@ const GridEdit = props => {
 
     /// cập nhật cell class
     if (selectedCells.current && selectedCells.current.size > 0) {
-      (0, _hooks.onRemoveBgSelectedCell)(rangeCells, id);
-      (0, _hooks.onRemoveBorderSelectedCell)(rangeCells, id);
+      // onRemoveBgSelectedCell(rangeCells, id)
+      // onRemoveBorderSelectedCell(rangeCells, id)
     }
 
     // selectedCells.current = sortedSetASC(mergedSet)
     (0, _hooks.hideDraggingPoint)(selectedCells.current, id);
-    selectedCells.current = (0, _hooks.sortedSetASC)(mergedSet);
-    setRangeCells((0, _hooks.sortedSetASC)(mergedSet));
+    const newCells = (0, _hooks.sortedSetASC)(mergedSet);
+    selectedCells.current = newCells;
+    (0, _hooks.onAddBgCellIndex)(newCells, id);
+    setRangeCells(newCells);
+    (0, _hooks.onAddBgSelectedCell)(newCells, id);
+    (0, _hooks.onAddBorderSelectedCell)(newCells, id);
     setTimeout(() => {
-      (0, _hooks.onAddBgSelectedCell)((0, _hooks.sortedSetASC)(mergedSet), id);
-      (0, _hooks.onAddBorderSelectedCell)((0, _hooks.sortedSetASC)(mergedSet), id);
-      (0, _hooks.showDraggingPoint)((0, _hooks.sortedSetASC)(mergedSet), id);
+      (0, _hooks.showDraggingPoint)(newCells, id);
     }, 50);
 
     // setPasteCells(new Set())
@@ -1109,6 +1011,80 @@ const GridEdit = props => {
     (0, _hooks.hideDraggingPoint)(selectedCells.current, id);
     triggerDragPaste(newPasteCells);
   };
+  const handleMouseDown = (record, row, col, e) => {
+    if (e.button === 2) {
+      e.stopPropagation();
+      return;
+    }
+    if (editingKey && editingKey === record[rowKey]) {
+      return;
+    }
+    if (record[rowKey] !== editingKey && editingKey !== '') {
+      setEditingKey('');
+    }
+
+    // isDragMouse.current = true
+    isMouseDown.current = true;
+    if (e.ctrlKey) {
+      isSelecting.current = true;
+      startCell.current = {
+        row,
+        col
+      };
+
+      // const cell: any  = new Set([`${row}-${col}`])
+
+      // setCurrentCtrlCells(cell)
+    } else {
+      isSelecting.current = true;
+      startCell.current = {
+        row,
+        col
+      };
+      const target = e.target;
+      if (target.closest('.dragging-point')) {
+        e.stopPropagation();
+        e.preventDefault();
+        return; // Không xử lý gì cả
+      } else {
+        // setStartSelectedCell({row, col})
+
+        startSelectedCells.current = {
+          row,
+          col
+        };
+
+        // setSelectedCells(new Set([`${row}-${col}`]));
+
+        const cells = new Set([`${row}-${col}`]);
+        if (selectedCells.current && selectedCells.current.size > 0) {
+          if (!(0, _hooks.isEqualSet)(cells, rangeCells)) {
+            // onRemoveBgSelectedCell(rangeCells, id)
+            // onRemoveBorderSelectedCell(rangeCells, id)
+            (0, _hooks.hideDraggingPoint)(rangeCells, id);
+            (0, _hooks.onRemoveBgCellIndex)(selectedCells.current, id);
+          }
+        }
+        if (rowsSelected.current && rowsSelected.current.size > 0) {
+          (0, _hooks.removeClassCellIndexSelected)(rowsSelected.current, id);
+        }
+        if (!(0, _hooks.isEqualSet)(cells, selectedCells.current)) {
+          (0, _hooks.onRemoveBgSelectedCell)(selectedCells.current, id);
+          (0, _hooks.hideDraggingPoint)(selectedCells.current, id);
+          selectedCells.current = cells;
+          // setRangeCells(cells)
+
+          (0, _hooks.onAddBgCellIndex)(cells, id);
+          (0, _hooks.onAddBorderSelectedCell)(cells, id);
+          (0, _hooks.onAddBgSelectedCell)(selectedCells.current, id, false);
+          (0, _hooks.showDraggingPoint)(selectedCells.current, id);
+        }
+
+        // setRowsSelected(new Set())
+        rowsSelected.current = new Set();
+      }
+    }
+  };
   const handleMouseUp = e => {
     isSelecting.current = false;
     startCell.current = null;
@@ -1117,12 +1093,6 @@ const GridEdit = props => {
     isDragMouse.current = false;
     isMouseDown.current = false;
     setIsPasteDragging(false);
-
-    // isPasteDragging.current = false
-    // setSelectIsDragging(false);
-
-    // setCurrentCtrlCells(new Set())
-
     if (e.ctrlKey) {
 
       // setCtrlCells([...ctrlCells, currentCtrlCells])
@@ -1134,18 +1104,20 @@ const GridEdit = props => {
       triggerDragPaste(pasteCells.current);
     } else {
       setRangeCells(selectedCells.current);
-      (0, _hooks.onRemoveBorderSelectedCell)(rangeCells, id);
-      (0, _hooks.onAddBorderSelectedCell)(selectedCells.current, id);
       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) {
+      if (selectedCells.current && selectedCells.current.size > 1) {
         (0, _hooks.hideDraggingPoint)(selectedCells.current, id);
+        (0, _hooks.onAddBorderSelectedCell)(selectedCells.current, id);
+
+        // showDraggingPoint(selectedCells.current, id)
       }
       (0, _hooks.showDraggingPoint)(selectedCells.current, id);
+      // onAddBorderSelectedCell(selectedCells.current, id)
     }
   };
   const handleMouseEnter = (row, col, e) => {
@@ -1264,15 +1236,17 @@ const GridEdit = props => {
     // setSelectedCells(new Set(newSelectedCells));
 
     if (selectedCells.current && selectedCells.current.size > 0) {
-      (0, _hooks.onRemoveBgSelectedCell)(selectedCells.current, id);
-      (0, _hooks.onRemoveBorderSelectedCell)(selectedCells.current, id);
+      // onRemoveBgSelectedCell(selectedCells.current, id)
+      // onRemoveBorderSelectedCell(selectedCells.current, id)
     }
     if (rowsSelected.current && rowsSelected.current.size > 0) {
       (0, _hooks.removeClassCellIndexSelected)(rowsSelected.current, id);
     }
     selectedCells.current = newSelectedCells;
-    (0, _hooks.onAddBgSelectedCell)(newSelectedCells, id);
-    (0, _hooks.onAddBorderSelectedCell)(newSelectedCells, id);
+
+    // onAddBgSelectedCell(newSelectedCells, id)
+    // onAddBorderSelectedCell(newSelectedCells, id)
+
     (0, _hooks.hideDraggingPoint)(selectedCells.current, id);
     (0, _hooks.showDraggingPoint)(newSelectedCells, id);
   };
@@ -1281,6 +1255,9 @@ const GridEdit = props => {
       e.stopPropagation();
       return;
     }
+    if (editingKey) {
+      setEditingKey('');
+    }
     isSelectingRow.current = true;
     rowStart.current = {
       row,
@@ -1293,13 +1270,11 @@ const GridEdit = props => {
         newSelectedCells.add(`${r}-${c}`);
       }
     }
-
-    // setSelectedCells(newSelectedCells)
-    // setRowsSelected(new Set([`${row}-${col}`]));
-
     if (selectedCells.current && selectedCells.current.size > 0) {
+      (0, _hooks.onRemoveBgCellIndex)(selectedCells.current, id);
       (0, _hooks.onRemoveBgSelectedCell)(selectedCells.current, id);
       (0, _hooks.onRemoveBorderSelectedCell)(selectedCells.current, id);
+      // onRemoveBorderSelectedCell(selectedCells.current, id)
     }
     if (rowsSelected.current && rowsSelected.current.size > 0) {
       (0, _hooks.removeClassCellIndexSelected)(rowsSelected.current, id);
@@ -1308,7 +1283,9 @@ const GridEdit = props => {
     selectedCells.current = newSelectedCells;
     rowsSelected.current = new Set([`${row}-${col}`]);
     (0, _hooks.onAddBgSelectedCell)(newSelectedCells, id, false);
-    (0, _hooks.onAddBorderSelectedCell)(newSelectedCells, id);
+    setTimeout(() => {
+      (0, _hooks.onAddBgSelectedCell)(newSelectedCells, id, false);
+    }, 10);
     (0, _hooks.addClassCellIndexSelected)(new Set([`${row}-${col}`]), id);
   };
   const handleMouseEnterRowHeader = (row, col, e) => {
@@ -1338,13 +1315,11 @@ const GridEdit = props => {
     if (selectedCells.current && selectedCells.current.size > 0) {
       (0, _hooks.onRemoveBgSelectedCell)(selectedCells.current, id);
     }
-    // setSelectedCells(newSelectedCells)
     selectedCells.current = newSelectedCells;
     (0, _hooks.onAddBgSelectedCell)(newSelectedCells, id);
     if (rowsSelected.current && rowsSelected.current.size > 0) {
       (0, _hooks.removeClassCellIndexSelected)(rowsSelected.current, id);
     }
-    // setRowsSelected(newSelectedRows)
     rowsSelected.current = newSelectedRows;
     (0, _hooks.addClassCellIndexSelected)(newSelectedRows, id);
   };
@@ -1763,6 +1738,7 @@ const GridEdit = props => {
     }
   };
   const handleEdit = (record, col, editType, e) => {
+    (0, _hooks.onRemoveBorderSelectedCell)(selectedCells.current, id);
     setTooltipContent('');
     // @ts-ignore
     setEditingKey(record[rowKey]);
@@ -1862,10 +1838,16 @@ const GridEdit = props => {
       (0, _hooks.hideDraggingPoint)(selectedCells.current, id);
       selectedCells.current = cells;
       setRangeCells(cells);
-      setTimeout(() => {
-        (0, _hooks.onAddBgSelectedCell)(selectedCells.current, id);
-        (0, _hooks.onAddBorderSelectedCell)(selectedCells.current, id);
-      }, 50);
+
+      // setTimeout(() => {
+      //
+      //   // onAddBgSelectedCell(selectedCells.current, id)
+      //   // onAddBorderSelectedCell(selectedCells.current, id)
+      //
+      // }, 50)
+
+      (0, _hooks.onAddBgSelectedCell)(selectedCells.current, id);
+      (0, _hooks.onAddBorderSelectedCell)(selectedCells.current, id);
       (0, _hooks.showDraggingPoint)(cells, id);
     };
     const focusNextCell = (editingCell, cellEditable) => {
@@ -1874,6 +1856,7 @@ const GridEdit = props => {
           updateSelection();
           if (e?.key !== 'Tab') {
             editingCell.focus();
+            // editingCell.click()
           }
         }
         if (scrollType === 'horizontal' && editingCell) {
@@ -1885,6 +1868,8 @@ const GridEdit = props => {
           scrollToCell(rowIndex, colIndex, cellEdit, 'vertical');
           if (e?.key !== 'Tab') {
             cellEditable.focus();
+            (0, _hooks.onAddBorderSelectedCell)(selectedCells.current, id);
+            // editingCell.click()
           }
         }
       } else {
@@ -1892,6 +1877,7 @@ const GridEdit = props => {
           updateSelection();
           if (e?.key !== 'Tab') {
             cellEditable.focus();
+            (0, _hooks.onAddBorderSelectedCell)(selectedCells.current, id);
           }
         }
         if (cellEditable) {
@@ -1913,296 +1899,312 @@ const GridEdit = props => {
       focusNextCell(cellEdit, cell);
     }
   };
-  const convertColumns = (0, _columns.flatColumns2)(columns.filter(it => it.visible !== false)).map((column, colIndex) => {
-    if (column === _InternalTable.SELECTION_COLUMN) {
-      return _InternalTable.SELECTION_COLUMN;
-    }
-    if (column.field === '#') {
+  const convertColumns = _react.default.useMemo(() => {
+    return (0, _columns.flatColumns2)(columns.filter(it => it.visible !== false)).map((column, colIndex) => {
+      if (column === _InternalTable.SELECTION_COLUMN) {
+        return _InternalTable.SELECTION_COLUMN;
+      }
+      if (column.field === '#') {
+        return {
+          ...column,
+          className: 'rc-ui-cell-editable rc-ui-cell-index',
+          onCell: (record, rowIndex) => {
+            const rowNumber = (0, _hooks.getRowNumber)(dataSource, record[rowKey], rowKey);
+            return {
+              'data-row-index': rowNumber,
+              onPaste: event => {
+                if (editingKey === '') {
+                  handlePaste(record, colIndex + 1, rowNumber, event);
+                  event.preventDefault();
+                }
+              },
+              onCopy: e => {
+                if (editingKey === '') {
+                  handleCopy(e);
+                  e.preventDefault();
+                }
+              },
+              // onClick: () => {
+              //   if (record[rowKey] !== editingKey && (editingKey !== '')) {
+              //     setEditingKey('')
+              //   }
+              // },
+              tabIndex: (rowIndex ?? 0) * visibleCols.length + colIndex
+            };
+          },
+          render: (value, record) => {
+            const rowNumber = (0, _hooks.getRowNumber)(dataSource, record[rowKey], rowKey);
+            return /*#__PURE__*/_react.default.createElement("div", {
+              className: (0, _classnames.default)('ui-rc_cell-content ui-rc_cell-content--index', {}),
+              onMouseDown: event => handleMouseDownRowHeader(rowNumber, colIndex, column, event),
+              onMouseEnter: event => handleMouseEnterRowHeader(rowNumber, colIndex, event),
+              onMouseUp: event => handleMouseUp(event)
+            }, /*#__PURE__*/_react.default.createElement("div", {
+              className: 'ui-rc_content'
+            }, (0, _hooks.findItemPath)(dataSource, record, rowKey)));
+          }
+        };
+      }
+      if (column.field === 'command') {
+        return {
+          ...column
+        };
+      }
       return {
         ...column,
-        className: 'rc-ui-cell-editable rc-ui-cell-index',
         onCell: (record, rowIndex) => {
           const rowNumber = (0, _hooks.getRowNumber)(dataSource, record[rowKey], rowKey);
           return {
-            'data-row-index': rowNumber,
-            onPaste: event => {
-              if (editingKey === '') {
-                handlePaste(record, colIndex + 1, rowNumber, event);
-                event.preventDefault();
-              }
-            },
-            onCopy: e => {
-              if (editingKey === '') {
-                handleCopy(e);
-                e.preventDefault();
-              }
-            },
-            onClick: () => {
-              if (record[rowKey] !== editingKey && editingKey !== '') {
-                setEditingKey('');
-              }
-            },
-            tabIndex: (rowIndex ?? 0) * visibleCols.length + colIndex
-          };
-        },
-        render: (value, record) => {
-          const rowNumber = (0, _hooks.getRowNumber)(dataSource, record[rowKey], rowKey);
-          return /*#__PURE__*/_react.default.createElement("div", {
-            className: (0, _classnames.default)('ui-rc_cell-content ui-rc_cell-content--index', {}),
-            onMouseDown: event => handleMouseDownRowHeader(rowNumber, colIndex, column, event),
-            onMouseEnter: event => handleMouseEnterRowHeader(rowNumber, colIndex, event),
-            onMouseUp: handleMouseUp
-          }, /*#__PURE__*/_react.default.createElement("div", {
-            className: 'ui-rc_content'
-          }, (0, _hooks.findItemPath)(dataSource, record, rowKey)));
-        }
-      };
-    }
-    if (column.field === 'command') {
-      return {
-        ...column
-      };
-    }
-    return {
-      ...column,
-      onCell: (record, rowIndex) => {
-        const rowNumber = (0, _hooks.getRowNumber)(dataSource, record[rowKey], rowKey);
-        return {
-          ...column?.onCell?.(record, rowIndex),
-          onKeyDown: event => {
-            const key = getRowKey(record, dataSource.indexOf(record));
-            if (event.key === 'Control' && event.ctrlKey) {} else {
-              if (event.key.length === 1 && !event.ctrlKey && !event.metaKey || event.key === 'Enter') {
-                if (record[rowKey] !== editingKey && (0, _hooks.isEditable)(column, record)) {
-                  // ~~ khi editingKey = ''
-                  event.preventDefault();
-                  event.stopPropagation();
-                  handleEdit(record, column, column.editType, event);
-                  (0, _hooks.onRemoveBgSelectedCell)(selectedCells.current, id);
-                  (0, _hooks.onRemoveBorderSelectedCell)(selectedCells.current, id);
-                  selectedCells.current = new Set();
-                  handleCellClick(rowNumber, record, column);
-                  const hasKey = mergedExpandedKeys.has(key);
-                  if (hasKey) {
-                    // mergedExpandedKeys.delete(key);
-                    // newExpandedKeys = [...mergedExpandedKeys];
-                  } else {
-                    onTriggerExpand(record);
-                  }
-                } else {
-                  if (event.key === 'Enter') {
+            ...column?.onCell?.(record, rowIndex),
+            onKeyDown: event => {
+              const key = getRowKey(record, dataSource.indexOf(record));
+              if (event.key === 'Control' && event.ctrlKey) {} else {
+                if (event.key.length === 1 && !event.ctrlKey && !event.metaKey || event.key === 'Enter') {
+                  if (record[rowKey] !== editingKey && (0, _hooks.isEditable)(column, record)) {
+                    // ~~ khi editingKey = ''
                     event.preventDefault();
                     event.stopPropagation();
-                    if (editingKey && editingKey !== '' && (rowNumber ?? 0) + 1 < (0, _hooks.flattenArray)(dataSource).length && event.key === 'Enter') {
-                      handleFocusCell((rowNumber ?? 0) + 1, colIndex, column, 'vertical', event);
-                    } else {
-                      // // focus cell hiện tại và tắt edit
-                      // handleFocusCell((rowNumber ?? 0), colIndex, column, 'vertical', event)
-                      // setEditingKey('')
+                    handleEdit(record, column, column.editType, event);
 
-                      // thêm dòng mới
+                    // onRemoveBgSelectedCell(selectedCells.current, id)
+                    // onRemoveBorderSelectedCell(selectedCells.current, id)
 
-                      handleAddSingle();
-                      handleFocusCell((rowNumber ?? 0) + 1, colIndex, column, 'vertical', event, true);
+                    // selectedCells.current = new Set()
+
+                    handleCellClick(rowNumber, record, column);
+                    const hasKey = mergedExpandedKeys.has(key);
+                    if (hasKey) {
+                      // mergedExpandedKeys.delete(key);
+                      // newExpandedKeys = [...mergedExpandedKeys];
+                    } else {
+                      onTriggerExpand(record);
+                    }
+                  } else {
+                    if (event.key === 'Enter') {
+                      event.preventDefault();
+                      event.stopPropagation();
+                      if (editingKey && editingKey !== '' && (rowNumber ?? 0) + 1 < (0, _hooks.flattenArray)(dataSource).length && event.key === 'Enter') {
+                        handleFocusCell((rowNumber ?? 0) + 1, colIndex, column, 'vertical', event);
+                      } else {
+                        // // focus cell hiện tại và tắt edit
+                        // handleFocusCell((rowNumber ?? 0), colIndex, column, 'vertical', event)
+                        // setEditingKey('')
+
+                        // thêm dòng mới
+
+                        handleAddSingle();
+                        handleFocusCell((rowNumber ?? 0) + 1, colIndex, column, 'vertical', event, true);
+                      }
                     }
                   }
                 }
-              }
-              if (event.key === 'Tab') {
-                if (editingKey) {} else {
-                  if (colIndex + 1 !== visibleCols.length) {
+                if (event.key === 'Tab') {
+                  if (editingKey) {} else {
+                    if (colIndex + 1 !== visibleCols.length) {
+                      handleFocusCell(rowNumber, colIndex + 1, column, 'horizontal', event);
+                    } else {
+                      event.stopPropagation();
+                      event.preventDefault();
+                    }
+                  }
+                }
+                if (event.key === 'ArrowRight' && colIndex + 1 !== visibleCols.length) {
+                  if (editingKey !== '') {} else {
                     handleFocusCell(rowNumber, colIndex + 1, column, 'horizontal', event);
-                  } else {
+                  }
+                }
+                if (event.key === 'ArrowLeft' && colIndex > 0) {
+                  if (!column.dataIndex && !column.key || column.field === '#' || column.dataIndex === '#') {
                     event.stopPropagation();
                     event.preventDefault();
+                  } else {
+                    if (editingKey !== '') {} else {
+                      handleFocusCell(rowNumber, colIndex - 1, column, 'horizontal', event);
+                    }
                   }
                 }
-              }
-              if (event.key === 'ArrowRight' && colIndex + 1 !== visibleCols.length) {
-                if (editingKey !== '') {} else {
-                  handleFocusCell(rowNumber, colIndex + 1, column, 'horizontal', event);
+                if (event.key === 'ArrowDown' && (rowNumber ?? 0) + 1 < (0, _hooks.flattenArray)(dataSource).length) {
+                  if (isEditing(record) && ((0, _hooks.getEditType)(column, record) === 'treeSelect' || (0, _hooks.getEditType)(column, record) === 'select' || (0, _hooks.getEditType)(column, record) === 'selectTable' || (0, _hooks.getEditType)(column, record) === 'asyncSelect')) {
+                    event.stopPropagation();
+                  } else {
+                    handleFocusCell((rowNumber ?? 0) + 1, colIndex, column, 'vertical', event);
+                  }
                 }
-              }
-              if (event.key === 'ArrowLeft' && colIndex > 0) {
-                if (!column.dataIndex && !column.key || column.field === '#' || column.dataIndex === '#') {
-                  event.stopPropagation();
-                  event.preventDefault();
-                } else {
-                  if (editingKey !== '') {} else {
-                    handleFocusCell(rowNumber, colIndex - 1, column, 'horizontal', event);
+                if (event.key === 'ArrowUp' && (rowNumber ?? 0) > 0) {
+                  if (isEditing(record) && ((0, _hooks.getEditType)(column, record) === 'asyncSelect' || (0, _hooks.getEditType)(column, record) === 'select' || (0, _hooks.getEditType)(column, record) === 'selectTable' || (0, _hooks.getEditType)(column, record) === 'treeSelect')) {
+                    event.stopPropagation();
+                  } else {
+                    handleFocusCell((rowNumber ?? 0) - 1, colIndex, column, 'vertical', event);
                   }
                 }
-              }
-              if (event.key === 'ArrowDown' && (rowNumber ?? 0) + 1 < (0, _hooks.flattenArray)(dataSource).length) {
-                if (isEditing(record) && ((0, _hooks.getEditType)(column, record) === 'treeSelect' || (0, _hooks.getEditType)(column, record) === 'select' || (0, _hooks.getEditType)(column, record) === 'selectTable' || (0, _hooks.getEditType)(column, record) === 'asyncSelect')) {
-                  event.stopPropagation();
-                } else {
-                  handleFocusCell((rowNumber ?? 0) + 1, colIndex, column, 'vertical', event);
+                if (event.key === 'Delete') {
+                  handleDeleteContent();
                 }
-              }
-              if (event.key === 'ArrowUp' && (rowNumber ?? 0) > 0) {
-                if (isEditing(record) && ((0, _hooks.getEditType)(column, record) === 'asyncSelect' || (0, _hooks.getEditType)(column, record) === 'select' || (0, _hooks.getEditType)(column, record) === 'selectTable' || (0, _hooks.getEditType)(column, record) === 'treeSelect')) {
-                  event.stopPropagation();
-                } else {
-                  handleFocusCell((rowNumber ?? 0) - 1, colIndex, column, 'vertical', event);
+                if (event.key === 'Escape') {
+                  setEditingKey('');
                 }
               }
-              if (event.key === 'Delete') {
-                handleDeleteContent();
+            },
+            onPaste: event => {
+              if (editingKey === '') {
+                handlePaste(record, colIndex, rowNumber, event);
+                event.preventDefault();
               }
-              if (event.key === 'Escape') {
-                setEditingKey('');
+            },
+            onCopy: e => {
+              if (editingKey === '') {
+                handleCopy(e);
+                e.preventDefault();
               }
-            }
-          },
-          onPaste: event => {
-            if (editingKey === '') {
-              handlePaste(record, colIndex, rowNumber, event);
-              event.preventDefault();
-            }
-          },
-          onCopy: e => {
-            if (editingKey === '') {
-              handleCopy(e);
-              e.preventDefault();
-            }
-          },
-          onDoubleClick: event => {
-            if (!isEditing(record) && record[rowKey] !== editingKey && (0, _hooks.isEditable)(column, record)) {
-              handleEdit(record, column, (0, _hooks.getEditType)(column, record), event);
-              (0, _hooks.onRemoveBgSelectedCell)(selectedCells.current, id);
-              (0, _hooks.onRemoveBorderSelectedCell)(selectedCells.current, id);
-              handleCellClick(rowNumber, record, column);
-            }
-          },
-          onContextMenu: () => {
-            // isSelecting.current = true;
-            // startCell.current = { row: rowNumber, col: colIndex };
-
-            if (selectedCells.size === 0) {
-              // setStartSelectedCell({ row: rowNumber, col: colIndex })
-              // setSelectedCells(new Set([`${rowNumber}-${colIndex}`]));
-
-              startSelectedCells.current = {
-                row: rowNumber,
-                col: colIndex
-              };
-              selectedCells.current = new Set([`${rowNumber}-${colIndex}`]);
-              rowsSelected.current = new Set();
-            }
-          },
-          onClick: () => {
-            if (record[rowKey] !== editingKey && editingKey !== '') {
-              setEditingKey('');
-            } else {
-              if (editingKey) {
+            },
+            onDoubleClick: event => {
+              if (!isEditing(record) && record[rowKey] !== editingKey && (0, _hooks.isEditable)(column, record)) {
+                handleEdit(record, column, (0, _hooks.getEditType)(column, record), event);
+
+                // onRemoveBgSelectedCell(selectedCells.current, id)
+                // onRemoveBorderSelectedCell(selectedCells.current, id)
                 handleCellClick(rowNumber, record, column);
               }
+            },
+            onContextMenu: () => {
+              // isSelecting.current = true;
+              // startCell.current = { row: rowNumber, col: colIndex };
+
+              if (selectedCells.size === 0) {
+                // setStartSelectedCell({ row: rowNumber, col: colIndex })
+                // setSelectedCells(new Set([`${rowNumber}-${colIndex}`]));
+
+                startSelectedCells.current = {
+                  row: rowNumber,
+                  col: colIndex
+                };
+                selectedCells.current = new Set([`${rowNumber}-${colIndex}`]);
+                rowsSelected.current = new Set();
+              }
+            },
+            onClick: () => {
+              if (record[rowKey] !== editingKey && editingKey !== '') {
+                // setEditingKey('')
+              } else {
+                if (record[rowKey] !== editingKey) {
+                  (0, _hooks.onAddBorderSelectedCell)(selectedCells.current, id);
+                }
+                if (editingKey) {
+                  handleCellClick(rowNumber, record, column);
+                }
+              }
+            },
+            // className: isEditing(record) ? `rc-ui-cell-editable cell-editing ${!isEditable(column as any, record) ? 'disable' : ''}` : `rc-ui-cell-editable cell-editable ${!isEditable(column as any, record) ? 'disable' : ''}`,
+            className: (0, _classnames.default)('rc-ui-cell-editable', {
+              'cell-editing': isEditing(record),
+              'cell-editable': !isEditing(record)
+              // selected: isSelectedCell(rangeCells,rowIndex, colIndex),
+              // 'cell-border-bottom': isRangeCell(rangeCells, 'bottom',rowIndex, colIndex),
+              // 'cell-border-right': isRangeCell(rangeCells, 'right',rowIndex, colIndex),
+              // 'cell-border-top': isRangeCell(rangeCells, 'top',rowIndex, colIndex),
+              // 'cell-border-left': isRangeCell(rangeCells, 'left',rowIndex, colIndex),
+              // disable: !isEditable(column as any, record)
+            }),
+            record,
+            column: column,
+            editType: (0, _hooks.getEditType)(column, record),
+            dataIndex: column.dataIndex,
+            indexRow: rowNumber,
+            indexCol: colIndex,
+            title: (0, _columns.getValueCell)(column, record[column.field], format),
+            'data-col-index': colIndex,
+            'data-row-index': rowNumber,
+            'data-tooltip-id': "tooltip-cell-content",
+            editing: isEditing(record) && rowEditable?.(record) !== false && (0, _hooks.isEditable)(column, record),
+            cellEditing,
+            t,
+            tabIndex: (rowIndex ?? 0) * visibleCols.length + colIndex,
+            style: isPasteDragging ? {
+              cursor: "crosshair"
+            } : {}
+          };
+        },
+        onHeaderCell: (data, index) => {
+          return {
+            ...(column.onHeaderCell ? column.onHeaderCell?.(data, index) : {}),
+            onClick: () => {
+              handleClickColHeader(column, colIndex);
+            },
+            onCopy: e => {
+              if (editingKey === '') {
+                handleCopy(e);
+                e.preventDefault();
+              }
+            },
+            onPaste: event => {
+              if (editingKey === '') {
+                handlePaste(dataSource[0], colIndex, 0, event);
+                event.preventDefault();
+              }
+            },
+            style: {
+              userSelect: 'none'
             }
-          },
-          className: isEditing(record) ? `rc-ui-cell-editable cell-editing ${!(0, _hooks.isEditable)(column, record) ? 'disable' : ''}` : `rc-ui-cell-editable cell-editable ${!(0, _hooks.isEditable)(column, record) ? 'disable' : ''}`,
-          record,
-          column: column,
-          editType: (0, _hooks.getEditType)(column, record),
-          dataIndex: column.dataIndex,
-          indexRow: rowNumber,
-          indexCol: colIndex,
-          title: (0, _columns.getValueCell)(column, record[column.field], format),
-          'data-col-index': colIndex,
-          'data-row-index': rowNumber,
-          'data-tooltip-id': "tooltip-cell-content",
-          // 'data-tooltip-content': 'tooltip-cell-content',
-          // 'data-tooltip-delay-show': 1000,
-          // 'data-tooltip-content': getValueCell(column, record[column.field as any], format),
-          editing: isEditing(record) && rowEditable?.(record) !== false && (0, _hooks.isEditable)(column, record),
-          cellEditing,
-          t,
-          tabIndex: (rowIndex ?? 0) * visibleCols.length + colIndex,
-          style: isPasteDragging ? {
-            cursor: "crosshair"
-          } : {}
-        };
-      },
-      onHeaderCell: (data, index) => {
-        return {
-          ...(column.onHeaderCell ? column.onHeaderCell?.(data, index) : {}),
-          onClick: () => {
-            handleClickColHeader(column, colIndex);
-          },
-          onCopy: e => {
-            if (editingKey === '') {
-              handleCopy(e);
-              e.preventDefault();
-            }
-          },
-          onPaste: event => {
-            if (editingKey === '') {
-              handlePaste(dataSource[0], colIndex, 0, event);
-              event.preventDefault();
-            }
-          },
-          style: {
-            userSelect: 'none'
-          }
-        };
-      },
-      render: (value, record, rowIndex) => {
-        const rowNumber = (0, _hooks.getRowNumber)(dataSource, record[rowKey], rowKey);
-        const colFormat = typeof column.format === 'function' ? column.format(record) : column.format;
-        const cellFormat = (0, _hooks.getFormat)(colFormat, format);
-        const rowError = dataErrors.find(it => it.index === rowNumber);
-        const cellError = rowError && column.field && rowError[column.field]?.field === column.field ? rowError[column.field] : null;
-
-        // const aaa =  dataErrors.find((it) => column?.field && it[column.field].field === column.field && it.index === rowNumber)
-        // const aaa =  column.field && rowError && rowError[column.field]?.field === column?.field
-
-        return /*#__PURE__*/_react.default.createElement("div", {
-          className: (0, _classnames.default)('ui-rc_cell-content', {
-            // disable: !isEditable(column as any, record)
-            isValid: column.field && rowError && rowError[column.field]?.field === column?.field
-          }),
-          onMouseDown: event => handleMouseDown(record, rowNumber, colIndex, event),
-          onMouseEnter: event => {
-            // setTooltipContent(cellError ? cellError.message : renderContent(column as any, value, record, rowIndex, cellFormat))
-            setTooltipContent(cellError ? cellError.message : '');
-            handleMouseEnter(rowNumber, colIndex, event);
-          },
-          onMouseUp: handleMouseUp,
-          onMouseMove: () => {
-            if (selectedCells && selectedCells.current.size > 0 && isMouseDown.current) {
-              (0, _hooks.hideDraggingPoint)(selectedCells.current, id);
-              isDragMouse.current = true;
-            }
-          }
+          };
+        },
+        render: (value, record, rowIndex) => {
+          const rowNumber = (0, _hooks.getRowNumber)(dataSource, record[rowKey], rowKey);
+          const colFormat = typeof column.format === 'function' ? column.format(record) : column.format;
+          const cellFormat = (0, _hooks.getFormat)(colFormat, format);
+          const rowError = dataErrors.find(it => it.index === rowNumber);
+          const cellError = rowError && column.field && rowError[column.field]?.field === column.field ? rowError[column.field] : null;
 
-          // onClick={(event) => {
-          //
-          //   handleClickCell(event)
-          //
-          // }}
-        }, /*#__PURE__*/_react.default.createElement("div", {
-          className: 'ui-rc_content'
-        }, (0, _columns.renderContent)(column, value, record, rowIndex, cellFormat)),
-        // 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.default.createElement("div", {
-          className: 'dragging-point hidden',
-          onMouseDown: e => {
-            // e.stopPropagation()
-            e.preventDefault();
-            if (e.button === 0) {
-              setIsPasteDragging(true);
+          // const aaa =  dataErrors.find((it) => column?.field && it[column.field].field === column.field && it.index === rowNumber)
+          // const aaa =  column.field && rowError && rowError[column.field]?.field === column?.field
+
+          return /*#__PURE__*/_react.default.createElement("div", {
+            className: (0, _classnames.default)('ui-rc_cell-content', {
+              // disable: !isEditable(column as any, record)
+              isValid: column.field && rowError && rowError[column.field]?.field === column?.field
+            }),
+            onMouseDown: event => handleMouseDown(record, rowNumber, colIndex, event),
+            onMouseEnter: event => {
+              // setTooltipContent(cellError ? cellError.message : renderContent(column as any, value, record, rowIndex, cellFormat))
+              setTooltipContent(cellError ? cellError.message : '');
+              handleMouseEnter(rowNumber, colIndex, event);
+            },
+            onMouseUp: handleMouseUp,
+            onMouseMove: () => {
+              if (selectedCells && selectedCells.current.size > 0 && isMouseDown.current) {
+                (0, _hooks.hideDraggingPoint)(selectedCells.current, id);
+                isDragMouse.current = true;
+              }
             }
-          },
-          onDoubleClick: handlePointDoubleClick
-        }, /*#__PURE__*/_react.default.createElement("span", {
-          className: 'dot-point'
-        })));
-      }
-    };
-  });
+
+            // onClick={(event) => {
+            //
+            //   handleClickCell(event)
+            //
+            // }}
+          }, /*#__PURE__*/_react.default.createElement("div", {
+            className: 'ui-rc_content'
+          }, (0, _columns.renderContent)(column, value, record, rowIndex, cellFormat)),
+          // 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.default.createElement("div", {
+            className: 'dragging-point hidden',
+            onMouseDown: e => {
+              // e.stopPropagation()
+              e.preventDefault();
+              if (e.button === 0) {
+                setIsPasteDragging(true);
+              }
+            },
+            onDoubleClick: handlePointDoubleClick
+          }, /*#__PURE__*/_react.default.createElement("span", {
+            className: 'dot-point'
+          })));
+        }
+      };
+    });
+  }, [cellEditing, columns, dataErrors, dataSource, editingKey, format, getRowKey, handleAddSingle, handleCellClick, handleClickColHeader, handleCopy, handleDeleteContent, handleEdit, handleFocusCell, handleMouseDown, handleMouseDownRowHeader, handleMouseEnter, handleMouseEnterRowHeader, handleMouseUp, handlePaste, handlePointDoubleClick, id, isEditing, isPasteDragging, mergedExpandedKeys, onTriggerExpand, rangeCells, rowEditable, rowKey, setTooltipContent, t, visibleCols.length]);
   const transformColumns = _react.default.useCallback(cols => {
     // @ts-ignore
     return cols.map(column => {