es-grid-template 1.6.1 → 1.6.3

package/es/grid-component/EditForm/EditForm.js

@@ -25,6 +25,7 @@ export const EditForm = props => {
     menuWidth,
     // classNamePrefix,
     onChange,
+    rowData,
     // onKeyDown,
     t,
     cellFocus,
@@ -314,7 +315,8 @@ export const EditForm = props => {
             value,
             setValue,
             getValues,
-            reset
+            reset,
+            rowData
           });
         }
       } else {
@@ -323,7 +325,8 @@ export const EditForm = props => {
             value,
             setValue,
             getValues,
-            reset
+            reset,
+            rowData
           });
         }
       }

package/es/grid-component/InternalTable.js

@@ -3,7 +3,9 @@ import React, { createContext, Fragment, useCallback, useContext, useState } fro
 // import {Resizable} from "react-resizable";
 import 'react-resizable/css/styles.css';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
-import { addRowIdArray, booleanOperator, convertFilters, convertFlatColumn, filterDataByColumns4, findItemByKey, findItemPath, getAllRowKey, getFormat, getTypeFilter, groupArrayByColumns, numberOperator, removeColumns, removeInvisibleColumns, stringOperator, translateOption, updateArrayByKey, updateColumnsByGroup, updateData } from "./hooks";
+import { addRowIdArray, booleanOperator, convertFilters, convertFlatColumn, filterDataByColumns4, findItemByKey, findItemPath, flattenArray, getAllRowKey, getFormat, getTypeFilter, groupArrayByColumns, numberOperator, removeColumns, removeInvisibleColumns, stringOperator, translateOption, unFlattenData, updateArrayByKey, updateColumnsByGroup,
+// updateData,
+updateOrInsert } from "./hooks";
 import dayjs from "dayjs";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
@@ -326,7 +328,9 @@ const InternalTable = props => {
       setSearchValue
     }) => {
       const type = getTypeFilter(column);
-      const operatorOptions = type === ('Checkbox' || 'Dropdown' || 'DropTree' || 'CheckboxDropdown') ? booleanOperator : !type || type === 'Text' ? stringOperator : numberOperator;
+      // const operatorOptions = type === ('Checkbox' || 'Dropdown' || 'DropTree' || 'CheckboxDropdown') ? booleanOperator : (!type || type === 'Text' ? stringOperator : numberOperator)
+
+      const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? booleanOperator : !type || type === 'Text' ? stringOperator : numberOperator;
       return /*#__PURE__*/React.createElement("div", {
         style: {
           padding: 8,
@@ -825,8 +829,11 @@ const InternalTable = props => {
   };
   const triggerPaste = (pastedRows, pastedColumnsArray, newData, copyRows) => {
     const handlePasteCallback = callbackData => {
-      const newDataUpdate = updateData(mergedData, callbackData, rowKey);
-      triggerChangeData(newDataUpdate);
+      // const newDataUpdate  = updateData(mergedData, callbackData, rowKey as any)
+
+      const rsFilterData = updateOrInsert(flattenArray([...mergedData]), callbackData);
+      const rs = unFlattenData(rsFilterData);
+      triggerChangeData(rs);
 
       // onCellPaste?.dataChange?.(newDataUpdate)
     };

package/es/grid-component/control/InputControl/InputControl.d.ts

@@ -1,4 +1,5 @@
-import React, { HTMLInputTypeAttribute } from "react";
+import type { HTMLInputTypeAttribute } from "react";
+import React from "react";
 interface IFFormInput {
     id?: any;
     control: any;

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

@@ -15,7 +15,5 @@ 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/GridEdit.js

@@ -1371,7 +1371,7 @@ const GridEdit = props => {
     const pasteData = e.clipboardData.getData("text/plain");
 
     // Chuyển đổi dữ liệu từ clipboard thành mảng
-    const rowsPasted = pasteData.split("\n").map(row =>
+    const rowsPasted = pasteData.split("\n").filter(row => row !== '').map(row =>
     // const rows = pasteData.split("\n").map((row: any) =>
     row.replace(/\r/g, "").split("\t"));
     if (rowsPasted.length > (onCellPaste?.maxRowsPaste ?? 200)) {

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

@@ -141,6 +141,7 @@ export type IFormOpen = {
     setValue?: any;
     getValues?: any;
     reset?: any;
+    rowData?: any;
 };
 export type IEditFromSettings = {
     fieldKey: string;

package/lib/grid-component/EditForm/EditForm.js

@@ -34,6 +34,7 @@ const EditForm = props => {
     menuWidth,
     // classNamePrefix,
     onChange,
+    rowData,
     // onKeyDown,
     t,
     cellFocus,
@@ -323,7 +324,8 @@ const EditForm = props => {
             value,
             setValue,
             getValues,
-            reset
+            reset,
+            rowData
           });
         }
       } else {
@@ -332,7 +334,8 @@ const EditForm = props => {
             value,
             setValue,
             getValues,
-            reset
+            reset,
+            rowData
           });
         }
       }

package/lib/grid-component/InternalTable.js

@@ -337,7 +337,9 @@ const InternalTable = props => {
       setSearchValue
     }) => {
       const type = (0, _hooks.getTypeFilter)(column);
-      const operatorOptions = type === ('Checkbox' || 'Dropdown' || 'DropTree' || 'CheckboxDropdown') ? _hooks.booleanOperator : !type || type === 'Text' ? _hooks.stringOperator : _hooks.numberOperator;
+      // const operatorOptions = type === ('Checkbox' || 'Dropdown' || 'DropTree' || 'CheckboxDropdown') ? booleanOperator : (!type || type === 'Text' ? stringOperator : numberOperator)
+
+      const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? _hooks.booleanOperator : !type || type === 'Text' ? _hooks.stringOperator : _hooks.numberOperator;
       return /*#__PURE__*/_react.default.createElement("div", {
         style: {
           padding: 8,
@@ -836,8 +838,11 @@ const InternalTable = props => {
   };
   const triggerPaste = (pastedRows, pastedColumnsArray, newData, copyRows) => {
     const handlePasteCallback = callbackData => {
-      const newDataUpdate = (0, _hooks.updateData)(mergedData, callbackData, rowKey);
-      triggerChangeData(newDataUpdate);
+      // const newDataUpdate  = updateData(mergedData, callbackData, rowKey as any)
+
+      const rsFilterData = (0, _hooks.updateOrInsert)((0, _hooks.flattenArray)([...mergedData]), callbackData);
+      const rs = (0, _hooks.unFlattenData)(rsFilterData);
+      triggerChangeData(rs);
 
       // onCellPaste?.dataChange?.(newDataUpdate)
     };

package/lib/grid-component/control/InputControl/InputControl.d.ts

@@ -1,4 +1,5 @@
-import React, { HTMLInputTypeAttribute } from "react";
+import type { HTMLInputTypeAttribute } from "react";
+import React from "react";
 interface IFFormInput {
     id?: any;
     control: any;

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

@@ -1368,7 +1368,7 @@ const GridEdit = props => {
     const pasteData = e.clipboardData.getData("text/plain");
 
     // Chuyển đổi dữ liệu từ clipboard thành mảng
-    const rowsPasted = pasteData.split("\n").map(row =>
+    const rowsPasted = pasteData.split("\n").filter(row => row !== '').map(row =>
     // const rows = pasteData.split("\n").map((row: any) =>
     row.replace(/\r/g, "").split("\t"));
     if (rowsPasted.length > (onCellPaste?.maxRowsPaste ?? 200)) {

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

@@ -141,6 +141,7 @@ export type IFormOpen = {
     setValue?: any;
     getValues?: any;
     reset?: any;
+    rowData?: any;
 };
 export type IEditFromSettings = {
     fieldKey: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "description": "es-grid-template",
   "keywords": [
     "react",
@@ -62,7 +62,7 @@
     "rc-checkbox": "^3.5.0",
     "rc-dropdown": "^4.2.1",
     "rc-field-form": "^2.6.0",
-    "rc-master-ui": "^1.1.37",
+    "rc-master-ui": "^1.1.38",
     "rc-select": "^14.16.3",
     "rc-tooltip": "^6.3.0",
     "rc-tree": "^5.10.1",
@@ -78,8 +78,8 @@
     "sweetalert2": "^11.4.14",
     "sweetalert2-react-content": "^5.0.0",
     "throttle-debounce": "^5.0.2",
-    "yup": "^1.6.1",
-    "vitest": "^2.0.5"
+    "vitest": "^2.0.5",
+    "yup": "^1.6.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.26.4",