es-grid-template 1.9.67 → 1.9.69

package/es/group-component/hook/utils.d.ts

@@ -196,10 +196,10 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
         value: any;
         rowData: RecordType;
     }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
-    onCellStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "display" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "display" | "position">);
-    onCellHeaderStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "display" | "position"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "display" | "position">);
+    onCellStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
+    onCellHeaderStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
     onCell?: (rowData: RecordType, index: number) => import("react").TdHTMLAttributes<HTMLTableCellElement>;
-    onCellFooterStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "display" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "display" | "position">);
+    onCellFooterStyles?: Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "display" | "width" | "minWidth" | "position">);
     getValue?: (row: any, rowIndex: number) => any;
     getCellProps?: (value: any, row: any, rowIndex: number) => import("./../../grid-component/type").CellProps;
     headerCellProps?: import("./../../grid-component/type").CellProps;

package/es/table-component/header/TableHeadCell2.js

@@ -297,9 +297,11 @@ const TableHeadCell2 = props => {
     onChange: e => {
       table.getToggleAllRowsSelectedHandler()(e);
       const prevSelected = isSelectionChange?.rowsData ?? [];
-      const allRowsInPage = table.getRowModel().flatRows;
+      const allRows = table.getRowModel().flatRows;
+      const allRowsInPage = allRows.map(it => it.original);
       if (table.getIsAllRowsSelected()) {
         const cc = excludeItems(prevSelected, allRowsInPage);
+        console.log(cc);
         setIsSelectionChange({
           isChange: true,
           type: 'all',
@@ -308,7 +310,8 @@ const TableHeadCell2 = props => {
         });
       } else {
         const abc = [...prevSelected, ...allRowsInPage];
-        const newSeletedRows = removeDuplicatesByKey(abc, 'id');
+        const newSeletedRows = removeDuplicatesByKey(abc, 'rowId');
+        console.log('newSeletedRows', newSeletedRows);
         setIsSelectionChange({
           isChange: true,
           type: 'all',

package/es/table-component/hook/utils.js

@@ -817,8 +817,8 @@ export const isDateValue = value => {
 
   // number timestamp
   if (typeof value === 'number') {
-    const date = new Date(value);
-    return !isNaN(date.getTime());
+    // const date = new Date(value)
+    return false;
   }
   if (typeof value !== 'string') return false;
   const str = value.trim();
@@ -1045,7 +1045,6 @@ export const shouldInclude = (item, queries, ignoreAccents) => {
         // ignoreAccents = false => so sánh có dấu + uperrcase sensitive
         const abc = ignoreAccents === false ? itemValue === value : itemStr === queryStr;
         condition = isDateComparison ? compareDates(itemDate, queryDate) : abc;
-        // condition = isDateComparison ? compareDates(itemDate, queryDate) : (itemValue === value)
         break;
       case "notequal":
         const abcN = ignoreAccents === false ? itemValue !== value : itemStr !== queryStr;
@@ -1054,8 +1053,6 @@ export const shouldInclude = (item, queries, ignoreAccents) => {
       case "greaterthan":
         // @ts-ignore
         condition = isDateComparison ? itemDate > queryDate : itemValue > value;
-
-        // condition = isDateComparison ? invalidDate(itemDate) && invalidDate(queryDate) && itemDate > queryDate : itemValue > value;
         break;
       case "greaterthanorequal":
         // @ts-ignore

package/lib/table-component/header/TableHeadCell2.js

@@ -305,9 +305,11 @@ const TableHeadCell2 = props => {
     onChange: e => {
       table.getToggleAllRowsSelectedHandler()(e);
       const prevSelected = isSelectionChange?.rowsData ?? [];
-      const allRowsInPage = table.getRowModel().flatRows;
+      const allRows = table.getRowModel().flatRows;
+      const allRowsInPage = allRows.map(it => it.original);
       if (table.getIsAllRowsSelected()) {
         const cc = (0, _utils.excludeItems)(prevSelected, allRowsInPage);
+        console.log(cc);
         setIsSelectionChange({
           isChange: true,
           type: 'all',
@@ -316,7 +318,8 @@ const TableHeadCell2 = props => {
         });
       } else {
         const abc = [...prevSelected, ...allRowsInPage];
-        const newSeletedRows = (0, _utils.removeDuplicatesByKey)(abc, 'id');
+        const newSeletedRows = (0, _utils.removeDuplicatesByKey)(abc, 'rowId');
+        console.log('newSeletedRows', newSeletedRows);
         setIsSelectionChange({
           isChange: true,
           type: 'all',

package/lib/table-component/hook/utils.js

@@ -928,8 +928,8 @@ const isDateValue = value => {
 
   // number timestamp
   if (typeof value === 'number') {
-    const date = new Date(value);
-    return !isNaN(date.getTime());
+    // const date = new Date(value)
+    return false;
   }
   if (typeof value !== 'string') return false;
   const str = value.trim();
@@ -1159,7 +1159,6 @@ const shouldInclude = (item, queries, ignoreAccents) => {
         // ignoreAccents = false => so sánh có dấu + uperrcase sensitive
         const abc = ignoreAccents === false ? itemValue === value : itemStr === queryStr;
         condition = isDateComparison ? compareDates(itemDate, queryDate) : abc;
-        // condition = isDateComparison ? compareDates(itemDate, queryDate) : (itemValue === value)
         break;
       case "notequal":
         const abcN = ignoreAccents === false ? itemValue !== value : itemStr !== queryStr;
@@ -1168,8 +1167,6 @@ const shouldInclude = (item, queries, ignoreAccents) => {
       case "greaterthan":
         // @ts-ignore
         condition = isDateComparison ? itemDate > queryDate : itemValue > value;
-
-        // condition = isDateComparison ? invalidDate(itemDate) && invalidDate(queryDate) && itemDate > queryDate : itemValue > value;
         break;
       case "greaterthanorequal":
         // @ts-ignore

package/package.json

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