es-grid-template 1.8.33 → 1.8.35

package/es/table-component/TableContainerEdit.js

@@ -596,7 +596,7 @@ const TableContainerEdit = props => {
             marginBottom: '.25rem',
             fontSize: 14
           }
-        }, "D\u1EEF li\u1EC7u sao ch\xE9p v\u01B0\u1EE3t qu\xE1 s\u1ED1 d\xF2ng cho ph\xE9p (", onCellPaste?.maxRowsPaste ?? 200, " d\xF2ng).Ph\u1EA7n m\u1EC1n s\u1EBD ch\u1EC9 l\u1EA5y 500 d\xF2ng \u0111\u1EA7u ti\xEAn."), /*#__PURE__*/React.createElement(Title, {
+        }, "D\u1EEF li\u1EC7u sao ch\xE9p v\u01B0\u1EE3t qu\xE1 s\u1ED1 d\xF2ng cho ph\xE9p (", onCellPaste?.maxRowsPaste ?? 200, " d\xF2ng).Ph\u1EA7n m\u1EC1n s\u1EBD ch\u1EC9 l\u1EA5y (", onCellPaste?.maxRowsPaste ?? 200, " d\xF2ng \u0111\u1EA7u ti\xEAn."), /*#__PURE__*/React.createElement(Title, {
           level: 5,
           style: {
             marginTop: '.75rem'

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

@@ -2,7 +2,8 @@ import type { Row, Table } from "@tanstack/react-table";
 import { type Column } from "@tanstack/react-table";
 import type { VirtualItem } from "@tanstack/react-virtual";
 import type { AnyObject, ColumnsTable, ColumnTable, EditType, FilterOperator, IColumnType, IFormat, RangeState, Sorter, TypeFilter } from "./../type";
-import { Key, type CSSProperties } from "react";
+import type { Key } from "react";
+import { type CSSProperties } from "react";
 import dayjs from "dayjs";
 import type { IPositionCell } from "../useContext";
 import type { ColumnDef } from "@tanstack/react-table";
@@ -135,7 +136,6 @@ export declare const convertToObjTrue: (arr: any) => {
     [k: string]: any;
 };
 export declare const getDiffent2Array: (a: any[], b: any[]) => any[];
-export declare function isTree(arr: any[]): boolean;
 export declare function findFirst(items: Column<any>[]): Column<any, unknown>;
 export declare function isTreeArray(arr: any[], options?: any): boolean;
 export declare function updateColumnWidthsRecursive(columns: any[], sizing: Record<string, number>): any[];

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

@@ -1,9 +1,6 @@
 import { SELECTION_COLUMN } from "rc-master-ui/es/table/hooks/useSelection";
 import { v4 as uuidv4 } from 'uuid';
 import { presetPalettes } from "@ant-design/colors";
-
-// import type { AnyObject } from './type';
-
 // import moment from "moment/moment"
 
 import dayjs from "dayjs";
@@ -1902,76 +1899,69 @@ export const convertToObjTrue = arr => {
 export const getDiffent2Array = (a, b) => {
   return [...a.filter(x => !b.includes(x)), ...b.filter(x => !a.includes(x))];
 };
-export function isTree(arr) {
-  if (!Array.isArray(arr)) {
-    return false;
-  }
-  function checkNode(node) {
-    if (typeof node !== "object" || node === null) {
-      return false;
-    }
-    if ("children" in node) {
-      if (!Array.isArray(node.children)) {
-        return false;
-      }
-      if (node.children.length === 0) {
-        return false;
-      }
-      for (const child of node.children) {
-        if (!checkNode(child)) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-  for (const item of arr) {
-    if (!checkNode(item)) return false;
-  }
-  return true;
-}
-export function findFirst(items) {
-  const leftItem = items.find(item => item.getIsPinned() === 'left');
-  if (leftItem) return leftItem;
-  return null;
-}
 
-// export function isTreeArray(arr: any[]): boolean {
+// export function isTree(arr: any[]): boolean {
+//   if (!Array.isArray(arr)){
+//     return false
+//   }
 
-// // if (!Array.isArray(arr)) return false;
+//   function checkNode(node: any): boolean {
+//     if (typeof node !== "object" || node === null) {
+//       return false
+//     }
 
-// //   return arr.every(item => {
-// //     if ("children" in item) {
-// //       return Array.isArray(item.children) && item.children.length > 0;
-// //     }
-// //     return true; // node lá thì hợp lệ
-// //   });
+//     if ("children" in node) {
 
-//  if (!Array.isArray(arr)) return false;
+//       if (!Array.isArray(node.children)) {
+//         return false
+//       }
+//       if (node.children.length === 0) {
+//         return false
+//       }
 
-//   return arr.every(item => {
-//     if (typeof item !== "object" || item === null) return false;
+//       for (const child of node.children) {
+//         if (!checkNode(child)) {
+//           return false
+//         }
+//       }
 
-//     if ("children" in item) {
-//       return Array.isArray(item.children);
 //     }
 
-//     return false; // node lá thì hợp lệ
-//   });
+//     return true;
+//   }
 
+//   for (const item of arr) {
+//     if (!checkNode(item)) return false;
+//   }
+
+//   return true;
 // }
 
+export function findFirst(items) {
+  const leftItem = items.find(item => item.getIsPinned() === 'left');
+  if (leftItem) return leftItem;
+  return null;
+}
 export function isTreeArray(arr, options) {
-  if (!Array.isArray(arr) || arr.length === 0) return false;
+  if (!Array.isArray(arr) || arr.length === 0) {
+    return false;
+  }
   const requireNonEmpty = options?.requireNonEmptyChildren ?? false;
   let hasParent = false;
   for (const item of arr) {
-    if (typeof item !== 'object' || item === null) return false;
+    if (typeof item !== 'object' || item === null) {
+      return false;
+    }
     if ('children' in item) {
       const children = item.children;
-      if (!Array.isArray(children)) return false;
+      if (!Array.isArray(children)) {
+        // return false;
+        hasParent = false;
+      }
       if (requireNonEmpty) {
-        if (children.length > 0) hasParent = true;
+        if (children.length > 0) {
+          hasParent = true;
+        }
       } else {
         hasParent = true;
       }

package/lib/table-component/TableContainerEdit.js

@@ -603,7 +603,7 @@ const TableContainerEdit = props => {
             marginBottom: '.25rem',
             fontSize: 14
           }
-        }, "D\u1EEF li\u1EC7u sao ch\xE9p v\u01B0\u1EE3t qu\xE1 s\u1ED1 d\xF2ng cho ph\xE9p (", onCellPaste?.maxRowsPaste ?? 200, " d\xF2ng).Ph\u1EA7n m\u1EC1n s\u1EBD ch\u1EC9 l\u1EA5y 500 d\xF2ng \u0111\u1EA7u ti\xEAn."), /*#__PURE__*/_react.default.createElement(Title, {
+        }, "D\u1EEF li\u1EC7u sao ch\xE9p v\u01B0\u1EE3t qu\xE1 s\u1ED1 d\xF2ng cho ph\xE9p (", onCellPaste?.maxRowsPaste ?? 200, " d\xF2ng).Ph\u1EA7n m\u1EC1n s\u1EBD ch\u1EC9 l\u1EA5y (", onCellPaste?.maxRowsPaste ?? 200, " d\xF2ng \u0111\u1EA7u ti\xEAn."), /*#__PURE__*/_react.default.createElement(Title, {
           level: 5,
           style: {
             marginTop: '.75rem'

package/lib/table-component/hook/utils.d.ts

@@ -2,7 +2,8 @@ import type { Row, Table } from "@tanstack/react-table";
 import { type Column } from "@tanstack/react-table";
 import type { VirtualItem } from "@tanstack/react-virtual";
 import type { AnyObject, ColumnsTable, ColumnTable, EditType, FilterOperator, IColumnType, IFormat, RangeState, Sorter, TypeFilter } from "./../type";
-import { Key, type CSSProperties } from "react";
+import type { Key } from "react";
+import { type CSSProperties } from "react";
 import dayjs from "dayjs";
 import type { IPositionCell } from "../useContext";
 import type { ColumnDef } from "@tanstack/react-table";
@@ -135,7 +136,6 @@ export declare const convertToObjTrue: (arr: any) => {
     [k: string]: any;
 };
 export declare const getDiffent2Array: (a: any[], b: any[]) => any[];
-export declare function isTree(arr: any[]): boolean;
 export declare function findFirst(items: Column<any>[]): Column<any, unknown>;
 export declare function isTreeArray(arr: any[], options?: any): boolean;
 export declare function updateColumnWidthsRecursive(columns: any[], sizing: Record<string, number>): any[];

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

@@ -47,7 +47,6 @@ exports.isEmpty = exports.isEditable = exports.isDisable = void 0;
 exports.isEqualSet = isEqualSet;
 exports.isObjEmpty = exports.isNullOrUndefined = exports.isNameColor = exports.isFormattedNumber = void 0;
 exports.isObjEqual = isObjEqual;
-exports.isTree = isTree;
 exports.isTreeArray = isTreeArray;
 exports.parseBooleanToValue = exports.onRemoveBgSelectedCell = exports.onAddBgSelectedCell = exports.newGuid = void 0;
 exports.parseClipboardEvent = parseClipboardEvent;
@@ -69,8 +68,6 @@ var _uuid = require("uuid");
 var _colors = require("@ant-design/colors");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _moment = _interopRequireDefault(require("moment"));
-// import type { AnyObject } from './type';
-
 // import moment from "moment/moment"
 
 const newGuid = () => {
@@ -2024,77 +2021,69 @@ exports.convertToObjTrue = convertToObjTrue;
 const getDiffent2Array = (a, b) => {
   return [...a.filter(x => !b.includes(x)), ...b.filter(x => !a.includes(x))];
 };
-exports.getDiffent2Array = getDiffent2Array;
-function isTree(arr) {
-  if (!Array.isArray(arr)) {
-    return false;
-  }
-  function checkNode(node) {
-    if (typeof node !== "object" || node === null) {
-      return false;
-    }
-    if ("children" in node) {
-      if (!Array.isArray(node.children)) {
-        return false;
-      }
-      if (node.children.length === 0) {
-        return false;
-      }
-      for (const child of node.children) {
-        if (!checkNode(child)) {
-          return false;
-        }
-      }
-    }
-    return true;
-  }
-  for (const item of arr) {
-    if (!checkNode(item)) return false;
-  }
-  return true;
-}
-function findFirst(items) {
-  const leftItem = items.find(item => item.getIsPinned() === 'left');
-  if (leftItem) return leftItem;
-  return null;
-}
 
-// export function isTreeArray(arr: any[]): boolean {
+// export function isTree(arr: any[]): boolean {
+//   if (!Array.isArray(arr)){
+//     return false
+//   }
 
-// // if (!Array.isArray(arr)) return false;
+//   function checkNode(node: any): boolean {
+//     if (typeof node !== "object" || node === null) {
+//       return false
+//     }
 
-// //   return arr.every(item => {
-// //     if ("children" in item) {
-// //       return Array.isArray(item.children) && item.children.length > 0;
-// //     }
-// //     return true; // node lá thì hợp lệ
-// //   });
+//     if ("children" in node) {
 
-//  if (!Array.isArray(arr)) return false;
+//       if (!Array.isArray(node.children)) {
+//         return false
+//       }
+//       if (node.children.length === 0) {
+//         return false
+//       }
 
-//   return arr.every(item => {
-//     if (typeof item !== "object" || item === null) return false;
+//       for (const child of node.children) {
+//         if (!checkNode(child)) {
+//           return false
+//         }
+//       }
 
-//     if ("children" in item) {
-//       return Array.isArray(item.children);
 //     }
 
-//     return false; // node lá thì hợp lệ
-//   });
+//     return true;
+//   }
 
-// }
+//   for (const item of arr) {
+//     if (!checkNode(item)) return false;
+//   }
 
+//   return true;
+// }
+exports.getDiffent2Array = getDiffent2Array;
+function findFirst(items) {
+  const leftItem = items.find(item => item.getIsPinned() === 'left');
+  if (leftItem) return leftItem;
+  return null;
+}
 function isTreeArray(arr, options) {
-  if (!Array.isArray(arr) || arr.length === 0) return false;
+  if (!Array.isArray(arr) || arr.length === 0) {
+    return false;
+  }
   const requireNonEmpty = options?.requireNonEmptyChildren ?? false;
   let hasParent = false;
   for (const item of arr) {
-    if (typeof item !== 'object' || item === null) return false;
+    if (typeof item !== 'object' || item === null) {
+      return false;
+    }
     if ('children' in item) {
       const children = item.children;
-      if (!Array.isArray(children)) return false;
+      if (!Array.isArray(children)) {
+        // return false;
+        hasParent = false;
+      }
       if (requireNonEmpty) {
-        if (children.length > 0) hasParent = true;
+        if (children.length > 0) {
+          hasParent = true;
+        }
       } else {
         hasParent = true;
       }

package/package.json

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