es-grid-template 1.9.52 → 1.9.53

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

@@ -166,7 +166,7 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
     haveSum?: boolean;
     isSummary?: boolean;
     sumGroup?: boolean;
-    summaryTemplate?: (data: number, key: string) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
+    summaryTemplate?: (data: number, key: string) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode;
     sorter?: boolean;
     allowFiltering?: boolean;
     allowSortering?: boolean;
@@ -178,26 +178,26 @@ export declare const fixColumnsLeft: <RecordType>(columns: ColumnTable<RecordTyp
     showFilterSearch?: boolean;
     hidden?: boolean;
     visible?: boolean;
-    headerTooltip?: string | boolean | (() => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
+    headerTooltip?: string | boolean | (() => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
     columnGroupText?: string;
     headerTextAlign?: import("./../../grid-component/type").ITextAlign;
-    headerTemplate?: import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | ((column: ColumnTable<RecordType>) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
+    headerTemplate?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode | ((column: ColumnTable<RecordType>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
     fixedType?: import("./../../grid-component/type").FixedType;
     headerTextWrap?: boolean;
     ellipsis?: boolean;
     allowResizing?: boolean;
     align?: import("./../../grid-component/type").ITextAlign;
     textAlign?: import("./../../grid-component/type").ITextAlign;
-    template?: import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | ((args: import("./../../grid-component/type").ColumnTemplate<RecordType>) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
+    template?: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode | ((args: import("./../../grid-component/type").ColumnTemplate<RecordType>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
     showTooltip?: boolean;
     tooltipDescription?: string | ((args: {
         value: any;
         rowData: RecordType;
-    }) => import("react").ReactNode | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>);
-    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">);
+    }) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNode);
+    onCellStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
+    onCellHeaderStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
     onCell?: (rowData: RecordType, index: number) => import("react").TdHTMLAttributes<HTMLTableCellElement>;
-    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">);
+    onCellFooterStyles?: Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "width" | "minWidth" | "left" | "right" | "position" | "display">);
     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/hook/useColumns.js

@@ -39,7 +39,6 @@ export const renderValueCell = (column, value, record, rowIndex, colIndex, forma
       return value ? dayjs(value).format(format?.dateFormat ?? 'DD/MM/YYYY') : '';
     case 'time':
       const timeFormat = format?.timeFormat;
-      console.log('timeFormat', timeFormat);
       const abc = convertToDate(value, timeFormat);
       const timeValue = value ? dayjs(abc).format(timeFormat ?? 'HH:mm') : '';
       return timeValue ?? '';

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

@@ -620,7 +620,9 @@ export function getColIdsBetween(table, a, b) {
 }
 export function getRowIdsBetween(table, a, b) {
   // const ids = table.getRowModel().rows.map(r => r.id);
-  const ids = table.getRowModel().flatRows.map(r => r.id);
+  const flatRows = table.getRowModel().flatRows;
+  const allRows = flatRows.filter((item, index, self) => index === self.findIndex(x => x.id === item.id));
+  const ids = allRows.map(r => r.id);
   const [start, end] = [ids.indexOf(a), ids.indexOf(b)].sort((x, y) => x - y);
   return ids.slice(start, end + 1);
 }
@@ -1366,7 +1368,10 @@ export const getSelectedCellMatrix = (table, startCell, endCell) => {
   };
 
   // const rowIds = table.getRowModel().rows.map(r => r.id);
-  const rowIds = table.getRowModel().flatRows.map(r => r.id);
+
+  const flatRows = table.getRowModel().flatRows;
+  const allRows = flatRows.filter((item, index, self) => index === self.findIndex(x => x.id === item.id));
+  const rowIds = allRows.map(r => r.id);
   const colIds = table.getVisibleLeafColumns().map(c => c.id);
 
   // const colIds = table.getAllLeafColumns().map(c => c.id);

package/es/table-virtuoso/InternalTable.js

@@ -197,6 +197,8 @@ const InternalTable = props => {
       });
     }
   };
+  console.log('tableData', tableData);
+  console.log('isDataTree', isDataTree);
   const table = useReactTable({
     _features: [OperatorFeature],
     data: tableData,

package/es/table-virtuoso/body/TableBodyCell.js

@@ -1,5 +1,5 @@
 import Space from "rc-master-ui/es/space";
-import { getCommonPinningStyles } from "../hook/utils";
+import { getCommonPinningStyles, getFormat } from "../hook/utils";
 import Checkbox from "rc-master-ui/es/checkbox/Checkbox";
 import classNames from "classnames";
 import React from "react";
@@ -9,9 +9,10 @@ import { renderValueCell, toggleRowSelection } from "../../table-component/hook/
 const renderCellIndex = props => {
   const {
     cell,
-    pagination
+    pagination,
+    isDataTree
   } = props;
-  const parrents = cell.row.getParentRows();
+  const parrents = cell.row.parentId && isDataTree ? cell.row.getParentRows?.() : undefined;
   if (parrents && parrents.length > 0) {
     return /*#__PURE__*/React.createElement("span", {
       className: "ui-rc_cell-content"
@@ -250,10 +251,12 @@ const TableBodyCell = props => {
       className: "ui-rc_cell-content"
     }, renderCellIndex({
       cell,
-      pagination
+      pagination,
+      isDataTree
     })) : renderCellIndex({
       cell,
-      pagination
+      pagination,
+      isDataTree
     }));
   }
   if (cell.column.id === "command") {
@@ -313,8 +316,10 @@ const TableBodyCell = props => {
     })));
   }
   const cellValue = cell.getValue();
+  const colFormat = typeof columnMeta.format === 'function' ? columnMeta.format(record) : columnMeta.format;
+  const cellFormat = getFormat(colFormat, format);
   const rowIndex = cell.row.index;
-  const fomatedValue = renderValueCell(columnMeta, cellValue, record, rowIndex, colIndex, format, false);
+  const fomatedValue = renderValueCell(columnMeta, cellValue, record, rowIndex, colIndex, cellFormat, false);
   const cellContent = columnMeta.template ? typeof columnMeta.template === 'function' ? columnMeta.template({
     field: columnMeta.field,
     index: cell.row.index,

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

@@ -49,7 +49,6 @@ const renderValueCell = (column, value, record, rowIndex, colIndex, format, edit
       return value ? (0, _dayjs.default)(value).format(format?.dateFormat ?? 'DD/MM/YYYY') : '';
     case 'time':
       const timeFormat = format?.timeFormat;
-      console.log('timeFormat', timeFormat);
       const abc = (0, _utils.convertToDate)(value, timeFormat);
       const timeValue = value ? (0, _dayjs.default)(abc).format(timeFormat ?? 'HH:mm') : '';
       return timeValue ?? '';

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

@@ -715,7 +715,9 @@ function getColIdsBetween(table, a, b) {
 }
 function getRowIdsBetween(table, a, b) {
   // const ids = table.getRowModel().rows.map(r => r.id);
-  const ids = table.getRowModel().flatRows.map(r => r.id);
+  const flatRows = table.getRowModel().flatRows;
+  const allRows = flatRows.filter((item, index, self) => index === self.findIndex(x => x.id === item.id));
+  const ids = allRows.map(r => r.id);
   const [start, end] = [ids.indexOf(a), ids.indexOf(b)].sort((x, y) => x - y);
   return ids.slice(start, end + 1);
 }
@@ -1487,7 +1489,10 @@ const getSelectedCellMatrix = (table, startCell, endCell) => {
   };
 
   // const rowIds = table.getRowModel().rows.map(r => r.id);
-  const rowIds = table.getRowModel().flatRows.map(r => r.id);
+
+  const flatRows = table.getRowModel().flatRows;
+  const allRows = flatRows.filter((item, index, self) => index === self.findIndex(x => x.id === item.id));
+  const rowIds = allRows.map(r => r.id);
   const colIds = table.getVisibleLeafColumns().map(c => c.id);
 
   // const colIds = table.getAllLeafColumns().map(c => c.id);

package/lib/table-virtuoso/InternalTable.js

@@ -207,6 +207,8 @@ const InternalTable = props => {
       });
     }
   };
+  console.log('tableData', tableData);
+  console.log('isDataTree', isDataTree);
   const table = (0, _reactTable.useReactTable)({
     _features: [_operator.OperatorFeature],
     data: tableData,

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

@@ -16,9 +16,10 @@ var _useColumns = require("../../table-component/hook/useColumns");
 const renderCellIndex = props => {
   const {
     cell,
-    pagination
+    pagination,
+    isDataTree
   } = props;
-  const parrents = cell.row.getParentRows();
+  const parrents = cell.row.parentId && isDataTree ? cell.row.getParentRows?.() : undefined;
   if (parrents && parrents.length > 0) {
     return /*#__PURE__*/_react.default.createElement("span", {
       className: "ui-rc_cell-content"
@@ -257,10 +258,12 @@ const TableBodyCell = props => {
       className: "ui-rc_cell-content"
     }, renderCellIndex({
       cell,
-      pagination
+      pagination,
+      isDataTree
     })) : renderCellIndex({
       cell,
-      pagination
+      pagination,
+      isDataTree
     }));
   }
   if (cell.column.id === "command") {
@@ -320,8 +323,10 @@ const TableBodyCell = props => {
     })));
   }
   const cellValue = cell.getValue();
+  const colFormat = typeof columnMeta.format === 'function' ? columnMeta.format(record) : columnMeta.format;
+  const cellFormat = (0, _utils.getFormat)(colFormat, format);
   const rowIndex = cell.row.index;
-  const fomatedValue = (0, _useColumns.renderValueCell)(columnMeta, cellValue, record, rowIndex, colIndex, format, false);
+  const fomatedValue = (0, _useColumns.renderValueCell)(columnMeta, cellValue, record, rowIndex, colIndex, cellFormat, false);
   const cellContent = columnMeta.template ? typeof columnMeta.template === 'function' ? columnMeta.template({
     field: columnMeta.field,
     index: cell.row.index,

package/package.json

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