es-grid-template 1.8.25 → 1.8.27

package/lib/table-component/TableContainerEdit.js

@@ -1171,7 +1171,7 @@ const TableContainerEdit = props => {
       // const newData = [...dataSource]
       const newData = [...originData];
       let newElement;
-      if (!record.children || record.children.length === 0) {
+      if (!record?.children || record?.children && record.children.length === 0) {
         newElement = {
           ...record,
           children: [{

package/lib/table-component/body/TableBodyCell.js

@@ -281,6 +281,8 @@ const TableBodyCell = props => {
         // maxWidth: cell.column.getSize(),
         ...(0, _utils.getCommonPinningStyles)(cell.column)
       }
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)('ui-rc_cell-content', {})
     }, cell.column.getIndex() === expandIconColumnIndex && isDataTree && /*#__PURE__*/_react.default.createElement("div", {
       className: "ui-rc-table-row-expand-trigger",
       style: {
@@ -323,7 +325,7 @@ const TableBodyCell = props => {
       isDataTree,
       setExpanded,
       expandIconColumnIndex
-    }));
+    })));
   }
   return /*#__PURE__*/_react.default.createElement("div", {
     key: cell.id,
@@ -369,8 +371,11 @@ const TableBodyCell = props => {
       if (e.target.firstChild?.clientWidth < e.target.firstChild?.scrollWidth) {
         setIsOpenTooltip(true);
       }
-    },
-    onMouseUp: () => {},
+    }
+
+    // onMouseUp={() => { }}
+    ,
+
     onKeyDown: e => {
       const flatRows = table.getRowModel().flatRows;
       if (e.key === 'ArrowDown' && rowNumber < flatRows.length - 1) {
@@ -413,12 +418,15 @@ const TableBodyCell = props => {
     onDoubleClick: () => {},
     onClick: e => {
       if (selectionSettings?.checkboxOnly !== true) {
-        cell.row.getToggleSelectedHandler()(e);
-        setIsSelectionChange({
-          isChange: true,
-          type: 'rowSelected',
-          rowData: cell.row.original
-        });
+        const isInsideCell = e.target.closest(".ui-rc-grid-cell");
+        if (isInsideCell) {
+          cell.row.getToggleSelectedHandler()(e);
+          setIsSelectionChange({
+            isChange: true,
+            type: 'rowSelected',
+            rowData: cell.row.original
+          });
+        }
       }
     }
   }, /*#__PURE__*/_react.default.createElement("div", {

package/lib/table-component/body/TableBodyRow.js

@@ -70,8 +70,8 @@ const TableBodyRow = ({
       // height: isEditing ? '36px' : undefined,
       gridTemplateColumns: `${templateColumns.map(n => `${n}fr`).join(" ")}`,
       // gridTemplateColumns: `repeat(${centerCOlumns.length + fixedLeftColumns.length + fixedRightColumns.length}, minmax(0, 1fr))`,
-      height: isEditing ? virtualRow.size : undefined
-      // minHeight: isEditing ? undefined : virtualRow.size
+      height: isEditing ? virtualRow.size : undefined,
+      minHeight: isEditing ? undefined : virtualRow.size
     },
     onDoubleClick: e => {
       recordDoubleClick?.({

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

@@ -153,7 +153,10 @@ const TableHeadCell2 = props => {
     destroyPopupOnHide: true,
     dropdownRender: () => {
       const type = (0, _utils.getTypeFilter)(originalColumn);
-      const operatorValue = column.getFilterOperator() ?? (0, _utils.getDefaultOperator)(originalColumn);
+
+      // const operatorValue = (column.getFilterOperator() ?? getDefaultOperator(originalColumn)) as string
+
+      const operatorValue = header.column.getFilterOperator() ?? (0, _utils.getDefaultOperator)(column.columnDef?.meta ?? {});
       const operatorOptions = ['Checkbox', 'Dropdown', 'DropTree', 'CheckboxDropdown'].includes(type) ? _constant.booleanOperator : !type || type === 'Text' ? _constant.stringOperator : _constant.numberOperator;
       return /*#__PURE__*/_react.default.createElement("div", {
         // className='ui-rc-table-filter-dropdown'
@@ -165,7 +168,7 @@ const TableHeadCell2 = props => {
           minWidth: 275,
           padding: '8px'
         }
-      }, /*#__PURE__*/_react.default.createElement("div", null), column.meta?.showOperator !== false && column.meta?.typeFilter !== 'DateRange' && column.meta?.typeFilter !== 'NumberRange' && /*#__PURE__*/_react.default.createElement("div", {
+      }, /*#__PURE__*/_react.default.createElement("div", null), column.columnDef.meta?.showOperator !== false && column.columnDef.meta?.typeFilter !== 'DateRange' && column.columnDef.meta?.typeFilter !== 'NumberRange' && /*#__PURE__*/_react.default.createElement("div", {
         className: 'mb-1'
       }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Select, {
         options: (0, _constant.translateOption)(operatorOptions, t),
@@ -182,7 +185,7 @@ const TableHeadCell2 = props => {
           marginBottom: 8
         }
       }, (0, _renderFilter.renderFilter)({
-        column: column,
+        column: column.columnDef,
         selectedKeys,
         setSelectedKeys
         // selectedKeys: (column.getFilterValue() ?? []) as string[],

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

@@ -220,16 +220,16 @@ const optionFontSize = exports.optionFontSize = [{
   label: '48'
 }];
 
-/**
- * Sort order for BaseTable
+/**
+ * Sort order for BaseTable
  */
 const SortOrder = {
-  /**
-   * Sort data in ascending order
+  /**
+   * Sort data in ascending order
    */
   ascend: 'Ascending',
-  /**
-   * Sort data in descending order
+  /**
+   * Sort data in descending order
    */
   descend: 'Descending'
 };

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

@@ -107,7 +107,8 @@ function convertToTanStackColumns({
       allowResizing,
       minWidth,
       template,
-      allowSorter
+      allowSorter,
+      allowFiltering
     } = col;
     const {
       children,
@@ -159,7 +160,9 @@ function convertToTanStackColumns({
       sortDescFirst: false,
       minSize: minWidth,
       // maxSize: maxWidth,
-      enableSorting: allowSorter !== false || col.sorter !== false
+      enableSorting: allowSorter !== false || col.sorter !== false,
+      // enableColumnFilter: allowFiltering !== false && !nonActionColumn.includes(field)
+      enableColumnFilter: allowFiltering !== false
     };
     if (children) {
       // @ts-ignore

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

@@ -137,7 +137,7 @@ export declare const convertToObjTrue: (arr: 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[]): boolean;
+export declare function isTreeArray(arr: any[], options?: any): boolean;
 export declare function updateColumnWidthsRecursive(columns: any[], sizing: Record<string, number>): any[];
 export declare function updateWidthsByOther(source: any[], target: any[]): any[];
 export declare function findAllChildrenKeys2<RecordType>(data: readonly RecordType[], rowKey: any, childrenColumnName: string): Key[];

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

@@ -2042,14 +2042,49 @@ function findFirst(items) {
   if (leftItem) return leftItem;
   return null;
 }
-function isTreeArray(arr) {
-  if (!Array.isArray(arr)) return false;
-  return arr.every(item => {
-    if ("children" in item) {
-      return Array.isArray(item.children) && item.children.length > 0;
+
+// export function isTreeArray(arr: any[]): boolean {
+
+// // if (!Array.isArray(arr)) 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 (!Array.isArray(arr)) return false;
+
+//   return arr.every(item => {
+//     if (typeof item !== "object" || item === null) return false;
+
+//     if ("children" in item) {
+//       return Array.isArray(item.children);
+//     }
+
+//     return false; // node lá thì hợp lệ
+//   });
+
+// }
+
+function isTreeArray(arr, options) {
+  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 ('children' in item) {
+      const children = item.children;
+      if (!Array.isArray(children)) return false;
+      if (requireNonEmpty) {
+        if (children.length > 0) hasParent = true;
+      } else {
+        hasParent = true;
+      }
     }
-    return true; // node lá thì hợp lệ
-  });
+  }
+  return hasParent;
 }
 function updateColumnWidthsRecursive(columns, sizing) {
   return columns.map(col => {