es-grid-template 1.3.8 → 1.3.9

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

@@ -833,7 +833,7 @@ const GridEdit = props => {
           if (!isEqualSet(cells, rangeCells)) {
             onRemoveBgSelectedCell(rangeCells, id);
             onRemoveBorderSelectedCell(rangeCells, id);
-            hideDraggingPoint(selectedCells.current, id);
+            hideDraggingPoint(rangeCells, id);
           }
         }
         if (rowsSelected.current && rowsSelected.current.size > 0) {
@@ -859,11 +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);
-      const columnKey = columns[col].field;
+      const columnKey = tmpCols[col].field;
 
       // @ts-ignore
       return {
@@ -957,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] = {
@@ -1822,6 +1823,7 @@ const GridEdit = props => {
       }
       hideDraggingPoint(selectedCells.current, id);
       selectedCells.current = cells;
+      setRangeCells(cells);
       setTimeout(() => {
         onAddBgSelectedCell(selectedCells.current, id);
         onAddBorderSelectedCell(selectedCells.current, id);

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

@@ -841,7 +841,7 @@ const GridEdit = props => {
           if (!(0, _hooks.isEqualSet)(cells, rangeCells)) {
             (0, _hooks.onRemoveBgSelectedCell)(rangeCells, id);
             (0, _hooks.onRemoveBorderSelectedCell)(rangeCells, id);
-            (0, _hooks.hideDraggingPoint)(selectedCells.current, id);
+            (0, _hooks.hideDraggingPoint)(rangeCells, id);
           }
         }
         if (rowsSelected.current && rowsSelected.current.size > 0) {
@@ -867,11 +867,12 @@ const GridEdit = props => {
   };
   const triggerDragPaste = pastesArray => {
     const mergedSet = new Set([...selectedCells.current, ...pastesArray]);
+    const tmpCols = (0, _columns.flatColumns2)(columns.filter(it => it.visible !== false));
     const rowSelectedFirst = (0, _hooks.getFirstSelectCell)(selectedCells.current).row;
     const rowPasteLast = (0, _hooks.getLastSelectCell)(pasteCells.current).row;
     const selectedArray = Array.from(selectedCells.current).map(key => {
       const [row, col] = key.split("-").map(Number);
-      const columnKey = columns[col].field;
+      const columnKey = tmpCols[col].field;
 
       // @ts-ignore
       return {
@@ -965,13 +966,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] = {
@@ -1830,6 +1831,7 @@ 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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "es-grid-template",
   "keywords": [
     "react",