es-grid-template 1.4.1 → 1.4.3

package/es/grid-component/TableGrid.js

@@ -355,9 +355,7 @@ const TableGrid = props => {
   }), /*#__PURE__*/React.createElement(Table, _extends({
     ref: tableRef
   }, rest, {
-    tableLayout: 'fixed'
-    // id={newGuid()}
-    ,
+    tableLayout: 'fixed',
     locale: {
       ...locale,
       emptyText: showEmptyText !== false ? /*#__PURE__*/React.createElement(Empty, {
@@ -371,10 +369,7 @@ const TableGrid = props => {
     }
     // dataSource={columns && columns.length > 0 ? filterDataByColumns3(dataSource, filterStates) : []}
     ,
-    dataSource: columns && columns.length > 0 ? filterDataByColumns4(dataSource, filterStates) : []
-    // dataSource={columns && columns.length > 0 && loading !== true ? dataSource : []}
-    // className={styles.customTable}
-    ,
+    dataSource: columns && columns.length > 0 ? filterDataByColumns4(dataSource, filterStates) : [],
     className: classNames(className, {
       'table-none-column-select': selectionSettings?.mode === undefined && selectionSettings?.type !== 'multiple'
     }, styles.customTable),

package/es/grid-component/hooks/columns/index.d.ts

@@ -3,7 +3,7 @@ import React from "react";
 import type { TableLocale } from "rc-master-ui/lib/table/interface";
 import type { ColumnsTable } from "../../type";
 export declare function flatColumns<RecordType>(columns: ColumnsTable<RecordType>, parentKey?: string): ColumnsTable<RecordType>;
-export declare function flatColumns2<RecordType>(columns: ColumnsTable<RecordType>): ColumnsTable<RecordType>;
+export declare const flatColumns2: <RecordType>(columns: ColumnsTable<RecordType>) => ColumnsTable<RecordType>;
 export declare const getValueCell: <T>(column: ColumnTable<T>, value: any, format?: IFormat) => any;
 export declare const renderContent: <T>(column: ColumnTable<T>, value: any, record: any, index: number, format?: IFormat) => React.JSX.Element;
 export declare const renderFilter: <RecordType>(column: ColumnTable<RecordType>, selectedKeys: string[], setSelectedKeys: any, confirm: any, visible: boolean, searchValue: string, setSearchValue: any, dataSourceFilter: any[], buddhistLocale: any, locale?: TableLocale, t?: any, format?: IFormat) => React.JSX.Element;

package/es/grid-component/hooks/columns/index.js

@@ -38,16 +38,8 @@ export function flatColumns(columns, parentKey = 'key') {
     }];
   }, []);
 }
-export function flatColumns2(columns
-// parentKey = 'key'
-) {
-  // @ts-ignore
+export const flatColumns2 = columns => {
   return columns.reduce((list, column) => {
-    // const { fixed } = column
-    // Convert `fixed='true'` to `fixed='left'` instead
-    // const parsedFixed = fixed === true ? 'left' : fixed
-    // const mergedKey = `${parentKey}-${index}`
-
     const subColumns = column.children;
     if (column === SELECTION_COLUMN) {
       return [...list, {
@@ -55,18 +47,16 @@ export function flatColumns2(columns
       }];
     }
     if (subColumns && subColumns.length > 0) {
-      return [...list, ...flatColumns(subColumns).map(subColum => ({
+      return [...list, ...flatColumns2(subColumns).map(subColum => ({
         // fixed: parsedFixed,
         ...subColum
       }))];
     }
     return [...list, {
-      // key: mergedKey,
       ...column
-      // fixed: parsedFixed
     }];
   }, []);
-}
+};
 export const getValueCell = (column, value, format) => {
   switch (column?.type) {
     case 'number':

package/es/grid-component/hooks/useColumns.js

@@ -262,12 +262,14 @@ const useColumns = config => {
             })));
           },
           onHeaderCell: () => ({
+            id: `${col.field}`,
             width: col.width,
             onResize: handleResize?.(col),
             className: col.headerTextAlign === 'center' ? 'head-align-center' : col.headerTextAlign === 'right' ? 'head-align-right' : ''
           }),
           onCell: (data, index) => {
             return {
+              id: `${col.field}`,
               colSpan: groupColumns && data.children && col.field === firstNonGroupColumn?.field ? 2 : groupColumns && data.children && nonGroupColumns[1].field === col.field ? 0 : 1,
               zIndex: data.children && col.field === firstNonGroupColumn?.field ? 11 : undefined,
               ...transformedColumn?.onCell?.(data, index),

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

@@ -93,7 +93,7 @@ export declare const checkChild: (inputArray: any[]) => boolean;
 export declare const isEditable: <RecordType>(column: ColumnTable, rowData: RecordType) => boolean | ((rowData: any) => boolean);
 export declare const isArraysEqual: (arr1: any[], arr2: any[]) => boolean;
 export declare const editAbleColumns: <T>(columns: ColumnsTable<T>) => ColumnTable<T>[];
-export declare const findItemPath: (tree: any[], targetItem: any, rowKey: any) => any;
+export declare const findItemPath: (tree: any[], targetItem: any, rowKey: any, currentPage?: number, pageSize?: number) => any;
 export declare const filterDataByColumns: (data: any[], queries: any) => any[];
 export declare const filterDataByColumns2: (data: any[], queries: any) => any[];
 export declare const removeFieldRecursive: (data: any[], field: string) => any[];

package/es/grid-component/hooks/utils.js

@@ -949,11 +949,11 @@ export const isArraysEqual = (arr1, arr2) => {
 export const editAbleColumns = columns => {
   return columns.filter(col => col.field !== '#' && col.field !== 'index' && col.field !== 'command' && col.visible !== false);
 };
-export const findItemPath = (tree, targetItem, rowKey) => {
+export const findItemPath = (tree, targetItem, rowKey, currentPage, pageSize) => {
   let result = null;
   function dfs(nodes, path = []) {
     for (let i = 0; i < nodes.length; i++) {
-      const currentPath = [...path, i + 1];
+      const currentPath = currentPage && pageSize ? [...path, i + 1 + (currentPage - 1) * pageSize] : [...path, i + 1];
       const node = nodes[i];
       if (node?.[rowKey] === targetItem?.[rowKey]) {
         result = currentPath.join('.');
@@ -1614,7 +1614,7 @@ export const onAddBorderSelectedCell = (selectedCells, id) => {
   if (cell) {
     cell.style.zIndex = 1;
   }
-  if (cell && cell.classList.contains('ui-rc-table-cell-fix-left')) {
+  if (cell && (cell.classList.contains('ui-rc-table-cell-fix-left') || cell.classList.contains('ui-rc-table-cell-fix-right'))) {
     cell.style.zIndex = 3;
   }