es-grid-template 1.5.15 → 1.5.17

package/es/grid-component/InternalTable.js

@@ -785,7 +785,7 @@ const InternalTable = props => {
       }
     }
   };
-  const triggerPaste = (pastedRows, pastedColumnsArray, newData) => {
+  const triggerPaste = (pastedRows, pastedColumnsArray, newData, copyRows) => {
     const handlePasteCallback = callbackData => {
       const newDataUpdate = updateData(mergedData, callbackData, rowKey);
       triggerChangeData(newDataUpdate);
@@ -797,6 +797,7 @@ const InternalTable = props => {
         // có callback
         onCellPaste.onPasted({
           pasteData: pastedRows,
+          copyRows,
           type: 'onPaste',
           data: mergedData,
           pastedColumns: pastedColumnsArray
@@ -806,6 +807,7 @@ const InternalTable = props => {
         onCellPaste.onPasted({
           pasteData: pastedRows,
           type: 'onPaste',
+          copyRows,
           data: mergedData,
           pastedColumns: pastedColumnsArray
         }, handlePasteCallback);

package/es/grid-component/TableGrid.js

@@ -178,6 +178,7 @@ const TableGrid = props => {
     groupToolbar,
     showEmptyText,
     setIsFilter,
+    actionTemplate,
     ...rest
   } = props;
   const {
@@ -337,7 +338,7 @@ const TableGrid = props => {
           setMergedSelectedKeys([selectedRow[rowKey]]);
           rowSelected?.({
             // @ts-ignore
-            selected: [selectedRow[rowKey]],
+            selected: [selectedRow],
             type: 'rowSelected',
             rowData: selectedRow
           });
@@ -464,7 +465,7 @@ const TableGrid = props => {
         // @ts-ignore
         ,
         showTotal: (total, range) => `${range[0]}-${range[1]} / ${total} ${t ? t(pagination?.locale?.items ?? 'items') : 'items'}`
-      }, pagination)), showColumnChoose && /*#__PURE__*/React.createElement(ColumnsChoose, {
+      }, pagination)), typeof actionTemplate === 'function' ? actionTemplate() : actionTemplate, showColumnChoose && /*#__PURE__*/React.createElement(ColumnsChoose, {
         columns: columns,
         t: t,
         columnsGroup: groupColumns,

package/es/grid-component/hooks/useColumns.d.ts

@@ -15,5 +15,7 @@ interface UseColumnsConfig<RecordType> {
     rowKey?: any;
     onMouseHover?: any;
 }
-declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [any];
+declare const useColumns: <RecordType extends AnyObject = AnyObject>(config: UseColumnsConfig<RecordType>) => readonly [
+    any
+];
 export default useColumns;

package/es/grid-component/table/Grid.d.ts

@@ -10,7 +10,7 @@ type Props<T> = GridTableProps<T> & {
     getRowKey: GetRowKey<T>;
     triggerGroupColumns?: (groupedColumns: string[]) => void;
     setTooltipContent?: any;
-    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[]) => void;
+    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[], copyRows: T[]) => void;
     isFilter?: boolean;
     setIsFilter?: React.Dispatch<React.SetStateAction<boolean>>;
 };

package/es/grid-component/table/GridEdit.d.ts

@@ -8,7 +8,7 @@ type Props<RecordType> = TableProps<RecordType> & {
     tableRef: any;
     triggerChangeColumns?: (columns: ColumnsTable<RecordType>, type: string) => void;
     triggerChangeData?: (newData: RecordType[], type: string) => void;
-    triggerPaste?: (pastedRows: RecordType[], pastedColumnsArray: string[], newData: RecordType[]) => void;
+    triggerPaste?: (pastedRows: RecordType[], pastedColumnsArray: string[], newData: RecordType[], copyRows: RecordType[]) => void;
     getRowKey: GetRowKey<RecordType>;
     triggerGroupColumns?: (groupedColumns: string[]) => void;
     setTooltipContent?: any;

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

@@ -1043,6 +1043,9 @@ const GridEdit = props => {
       };
       // return { row, col, value: '' };
     });
+    const copyRows = selectedArray.map(it => ({
+      ...flattenData(childrenColumnName, dataSource)[it.row]
+    }));
 
     // Xác định min/max row và col để sắp xếp dữ liệu
     const minRow = Math.min(...selectedArray.map(cell => cell.row));
@@ -1115,7 +1118,7 @@ const GridEdit = props => {
         pastedRows.push(newData[targetRow]);
       });
       const pastedColumnsArray = Array.from(pastedColumns) ?? [];
-      triggerPaste?.(pastedRows, pastedColumnsArray, newData);
+      triggerPaste?.(pastedRows, pastedColumnsArray, newData, copyRows);
     }
 
     /// cập nhật cell class
@@ -1145,11 +1148,7 @@ const GridEdit = props => {
   };
   const handlePasted = (record, indexCol, rowNumber, pasteData) => {
     const rows = pasteData.slice(0, onCellPaste?.maxRowsPaste ?? 200);
-    console.log('rows', rows);
-    console.log('record', record);
     if (!record?.parentId) {
-      console.log('1');
-
       // Cập nhật data mới
       const newData = [...dataSource];
 
@@ -1224,12 +1223,8 @@ const GridEdit = props => {
         pastedRows.push(newData[targetRow]);
       });
       const pastedColumnsArray = Array.from(pastedColumns) ?? [];
-      console.log('pastedRows', pastedRows);
-      console.log('pastedColumnsArray', pastedColumnsArray);
-      console.log('newData', newData);
-      triggerPaste?.(pastedRows, pastedColumnsArray, newData);
+      triggerPaste?.(pastedRows, pastedColumnsArray, newData, []);
     } else {
-      console.log('2');
       // Cập nhật data mới
       const newData = [...dataSource];
       const parent = findItemByKey(newData, rowKey, record.parentId);
@@ -1282,13 +1277,12 @@ const GridEdit = props => {
         children: childData
       };
       const newDataSource = updateArrayByKey(newData, newRowData, rowKey);
-      triggerPaste?.(pastedRows, pastedColumnsArray, newDataSource);
+      triggerPaste?.(pastedRows, pastedColumnsArray, newDataSource, []);
     }
   };
   const handlePaste = (record, indexCol, rowNumber, e) => {
     // const clipboard: any = (e.clipboardData || (window && window?.Clipboard)).getData("text")
     const pasteData = e.clipboardData.getData("text/plain");
-    console.log('pasteData', pasteData);
 
     // Chuyển đổi dữ liệu từ clipboard thành mảng
     const rowsPasted = pasteData.split("\n").map(row =>
@@ -1322,7 +1316,6 @@ const GridEdit = props => {
         // ),
       });
     } else {
-      console.log('5555');
       handlePasted(record, indexCol, rowNumber, rowsPasted);
     }
 
@@ -2246,7 +2239,6 @@ const GridEdit = props => {
             }
           },
           onPaste: event => {
-            console.log('aaaaaa');
             if (editingKey.current === '') {
               handlePaste(record, colIndex, rowNumber, event);
               event.preventDefault();

package/es/grid-component/table/Group.d.ts

@@ -7,7 +7,7 @@ type Props<T> = GridTableProps<T> & {
     triggerChangeData?: (newData: T[], type: string) => void;
     getRowKey: GetRowKey<T>;
     triggerGroupColumns?: (groupedColumns: string[]) => void;
-    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[]) => void;
+    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[], copyRows: T[]) => void;
     triggerFilter?: (queries: any) => void;
     setTooltipContent?: any;
     scrollHeight?: number;

package/es/grid-component/table/InfiniteTable.d.ts

@@ -10,7 +10,7 @@ type Props<T> = TableProps<T> & {
     getRowKey: GetRowKey<T>;
     triggerGroupColumns?: (groupedColumns: string[]) => void;
     setTooltipContent?: any;
-    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[]) => void;
+    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[], copyRows: T[]) => void;
     isFilter?: boolean;
     setIsFilter?: React.Dispatch<React.SetStateAction<boolean>>;
 };

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

@@ -227,6 +227,7 @@ export interface TableProps<RecordType = AnyObject> extends Omit<RcTableProps<Re
         rowData: any;
     }) => void;
     wrapSettings?: IWrapSettings;
+    actionTemplate?: ReactNode | ReactElement | (() => ReactNode | ReactElement);
 }
 export type PaginationConfig = TablePaginationConfig & {
     currentPage?: number;
@@ -284,6 +285,7 @@ export type CellChangeArgs<T> = {
 };
 export type IOnPastedProps = {
     data: any[];
+    copyRows: any[];
     pastedColumns: string[];
     pasteData: any[];
     type: 'onPaste' | 'onChange' | 'onCellPaste';

package/lib/grid-component/InternalTable.js

@@ -796,7 +796,7 @@ const InternalTable = props => {
       }
     }
   };
-  const triggerPaste = (pastedRows, pastedColumnsArray, newData) => {
+  const triggerPaste = (pastedRows, pastedColumnsArray, newData, copyRows) => {
     const handlePasteCallback = callbackData => {
       const newDataUpdate = (0, _hooks.updateData)(mergedData, callbackData, rowKey);
       triggerChangeData(newDataUpdate);
@@ -808,6 +808,7 @@ const InternalTable = props => {
         // có callback
         onCellPaste.onPasted({
           pasteData: pastedRows,
+          copyRows,
           type: 'onPaste',
           data: mergedData,
           pastedColumns: pastedColumnsArray
@@ -817,6 +818,7 @@ const InternalTable = props => {
         onCellPaste.onPasted({
           pasteData: pastedRows,
           type: 'onPaste',
+          copyRows,
           data: mergedData,
           pastedColumns: pastedColumnsArray
         }, handlePasteCallback);

package/lib/grid-component/TableGrid.js

@@ -178,6 +178,7 @@ const TableGrid = props => {
     groupToolbar,
     showEmptyText,
     setIsFilter,
+    actionTemplate,
     ...rest
   } = props;
   const {
@@ -337,7 +338,7 @@ const TableGrid = props => {
           setMergedSelectedKeys([selectedRow[rowKey]]);
           rowSelected?.({
             // @ts-ignore
-            selected: [selectedRow[rowKey]],
+            selected: [selectedRow],
             type: 'rowSelected',
             rowData: selectedRow
           });
@@ -464,7 +465,7 @@ const TableGrid = props => {
         // @ts-ignore
         ,
         showTotal: (total, range) => `${range[0]}-${range[1]} / ${total} ${t ? t(pagination?.locale?.items ?? 'items') : 'items'}`
-      }, pagination)), showColumnChoose && /*#__PURE__*/_react.default.createElement(_ColumnsChoose.ColumnsChoose, {
+      }, pagination)), typeof actionTemplate === 'function' ? actionTemplate() : actionTemplate, showColumnChoose && /*#__PURE__*/_react.default.createElement(_ColumnsChoose.ColumnsChoose, {
         columns: columns,
         t: t,
         columnsGroup: groupColumns,

package/lib/grid-component/table/Grid.d.ts

@@ -10,7 +10,7 @@ type Props<T> = GridTableProps<T> & {
     getRowKey: GetRowKey<T>;
     triggerGroupColumns?: (groupedColumns: string[]) => void;
     setTooltipContent?: any;
-    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[]) => void;
+    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[], copyRows: T[]) => void;
     isFilter?: boolean;
     setIsFilter?: React.Dispatch<React.SetStateAction<boolean>>;
 };

package/lib/grid-component/table/GridEdit.d.ts

@@ -8,7 +8,7 @@ type Props<RecordType> = TableProps<RecordType> & {
     tableRef: any;
     triggerChangeColumns?: (columns: ColumnsTable<RecordType>, type: string) => void;
     triggerChangeData?: (newData: RecordType[], type: string) => void;
-    triggerPaste?: (pastedRows: RecordType[], pastedColumnsArray: string[], newData: RecordType[]) => void;
+    triggerPaste?: (pastedRows: RecordType[], pastedColumnsArray: string[], newData: RecordType[], copyRows: RecordType[]) => void;
     getRowKey: GetRowKey<RecordType>;
     triggerGroupColumns?: (groupedColumns: string[]) => void;
     setTooltipContent?: any;

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

@@ -1047,6 +1047,9 @@ const GridEdit = props => {
       };
       // return { row, col, value: '' };
     });
+    const copyRows = selectedArray.map(it => ({
+      ...(0, _hooks.flattenData)(childrenColumnName, dataSource)[it.row]
+    }));
 
     // Xác định min/max row và col để sắp xếp dữ liệu
     const minRow = Math.min(...selectedArray.map(cell => cell.row));
@@ -1119,7 +1122,7 @@ const GridEdit = props => {
         pastedRows.push(newData[targetRow]);
       });
       const pastedColumnsArray = Array.from(pastedColumns) ?? [];
-      triggerPaste?.(pastedRows, pastedColumnsArray, newData);
+      triggerPaste?.(pastedRows, pastedColumnsArray, newData, copyRows);
     }
 
     /// cập nhật cell class
@@ -1149,11 +1152,7 @@ const GridEdit = props => {
   };
   const handlePasted = (record, indexCol, rowNumber, pasteData) => {
     const rows = pasteData.slice(0, onCellPaste?.maxRowsPaste ?? 200);
-    console.log('rows', rows);
-    console.log('record', record);
     if (!record?.parentId) {
-      console.log('1');
-
       // Cập nhật data mới
       const newData = [...dataSource];
 
@@ -1228,12 +1227,8 @@ const GridEdit = props => {
         pastedRows.push(newData[targetRow]);
       });
       const pastedColumnsArray = Array.from(pastedColumns) ?? [];
-      console.log('pastedRows', pastedRows);
-      console.log('pastedColumnsArray', pastedColumnsArray);
-      console.log('newData', newData);
-      triggerPaste?.(pastedRows, pastedColumnsArray, newData);
+      triggerPaste?.(pastedRows, pastedColumnsArray, newData, []);
     } else {
-      console.log('2');
       // Cập nhật data mới
       const newData = [...dataSource];
       const parent = (0, _hooks.findItemByKey)(newData, rowKey, record.parentId);
@@ -1286,13 +1281,12 @@ const GridEdit = props => {
         children: childData
       };
       const newDataSource = (0, _hooks.updateArrayByKey)(newData, newRowData, rowKey);
-      triggerPaste?.(pastedRows, pastedColumnsArray, newDataSource);
+      triggerPaste?.(pastedRows, pastedColumnsArray, newDataSource, []);
     }
   };
   const handlePaste = (record, indexCol, rowNumber, e) => {
     // const clipboard: any = (e.clipboardData || (window && window?.Clipboard)).getData("text")
     const pasteData = e.clipboardData.getData("text/plain");
-    console.log('pasteData', pasteData);
 
     // Chuyển đổi dữ liệu từ clipboard thành mảng
     const rowsPasted = pasteData.split("\n").map(row =>
@@ -1326,7 +1320,6 @@ const GridEdit = props => {
         // ),
       });
     } else {
-      console.log('5555');
       handlePasted(record, indexCol, rowNumber, rowsPasted);
     }
 
@@ -2250,7 +2243,6 @@ const GridEdit = props => {
             }
           },
           onPaste: event => {
-            console.log('aaaaaa');
             if (editingKey.current === '') {
               handlePaste(record, colIndex, rowNumber, event);
               event.preventDefault();

package/lib/grid-component/table/Group.d.ts

@@ -7,7 +7,7 @@ type Props<T> = GridTableProps<T> & {
     triggerChangeData?: (newData: T[], type: string) => void;
     getRowKey: GetRowKey<T>;
     triggerGroupColumns?: (groupedColumns: string[]) => void;
-    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[]) => void;
+    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[], copyRows: T[]) => void;
     triggerFilter?: (queries: any) => void;
     setTooltipContent?: any;
     scrollHeight?: number;

package/lib/grid-component/table/InfiniteTable.d.ts

@@ -10,7 +10,7 @@ type Props<T> = TableProps<T> & {
     getRowKey: GetRowKey<T>;
     triggerGroupColumns?: (groupedColumns: string[]) => void;
     setTooltipContent?: any;
-    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[]) => void;
+    triggerPaste?: (pastedRows: T[], pastedColumnsArray: string[], newData: T[], copyRows: T[]) => void;
     isFilter?: boolean;
     setIsFilter?: React.Dispatch<React.SetStateAction<boolean>>;
 };

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

@@ -227,6 +227,7 @@ export interface TableProps<RecordType = AnyObject> extends Omit<RcTableProps<Re
         rowData: any;
     }) => void;
     wrapSettings?: IWrapSettings;
+    actionTemplate?: ReactNode | ReactElement | (() => ReactNode | ReactElement);
 }
 export type PaginationConfig = TablePaginationConfig & {
     currentPage?: number;
@@ -284,6 +285,7 @@ export type CellChangeArgs<T> = {
 };
 export type IOnPastedProps = {
     data: any[];
+    copyRows: any[];
     pastedColumns: string[];
     pasteData: any[];
     type: 'onPaste' | 'onChange' | 'onCellPaste';

package/package.json

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