es-grid-template 1.9.50 → 1.9.51

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

@@ -194,10 +194,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, "left" | "right" | "position" | "display" | "minWidth" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Cell<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "position" | "display" | "minWidth" | "width">);
-    onCellHeaderStyles?: Omit<CSSProperties, "left" | "right" | "position" | "display" | "minWidth" | "width"> | ((cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "position" | "display" | "minWidth" | "width">);
+    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, "left" | "right" | "position" | "display" | "minWidth" | "width"> | ((cellValue: any, cell: import("@tanstack/react-table").Header<RecordType, unknown>) => Omit<CSSProperties, "left" | "right" | "position" | "display" | "minWidth" | "width">);
+    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/TableContainerEdit.js

@@ -416,11 +416,14 @@ const TableContainerEdit = props => {
               }
             } else if (columnOri.type === 'data' || columnOri.type === 'datatime' || columnOri.editType === 'date' || columnOri.editType === 'datetime') {
               const isDate = isDateValue(cellValue.trim());
-              const colFormat = typeof columnOri?.format === 'function' ? columnOri?.format(record) : columnOri?.format;
-              const cellFormat = getFormat(colFormat, format);
-              const editType = getEditType(columnOri);
-              const dateFormat = getDatepickerFormat(editType, cellFormat);
-              const date = isDate && !isEmpty(cellValue.trim()) ? moment(cellValue.trim(), dateFormat).format("YYYY-MM-DDTHH:mm:ssZ") : null;
+
+              // const colFormat = typeof columnOri?.format === 'function' ? columnOri?.format(record) : columnOri?.format
+              // const cellFormat = getFormat(colFormat, format)
+              // const editType = getEditType(columnOri as any)
+              // const dateFormat = getDatepickerFormat(editType, cellFormat)
+              // const date = isDate && !isEmpty(cellValue.trim()) ? moment(cellValue.trim(), dateFormat, true).format() : null
+
+              const date = isDate && !isEmpty(cellValue.trim()) ? moment(cellValue.trim()).format() : null;
               newData[targetRow] = {
                 ...newData[targetRow],
                 [columnKey]: date
@@ -600,6 +603,8 @@ const TableContainerEdit = props => {
       handlePasted(rowsPasted);
     }
   }, [handlePasted, onCellPaste?.maxRowsPaste, startCell]);
+
+  // Copy
   React.useEffect(() => {
     const handleKeyDown = e => {
       if (e.ctrlKey && e.key === 'c' && startCell && endCell && !editingKey) {
@@ -610,6 +615,8 @@ const TableContainerEdit = props => {
     document.addEventListener('keydown', handleKeyDown);
     return () => document.removeEventListener('keydown', handleKeyDown);
   }, [startCell, endCell, table, copySelectionToClipboard, editingKey]);
+
+  // Paste
   React.useEffect(() => {
     const handlePaste = e => {
       if (startCell && !editingKey) {

package/es/table-component/body/EditableCell.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
 import type { EditType } from "rc-master-ui";
 import type { ColumnTable, IFormat } from "../../grid-component/type";
+import type { Column } from "@tanstack/react-table";
 interface EditableCellProps<DataType> extends React.HTMLAttributes<HTMLElement> {
     t?: any;
     dataIndex: string;
@@ -11,6 +12,8 @@ interface EditableCellProps<DataType> extends React.HTMLAttributes<HTMLElement>
     indexRow: number;
     indexCol: number;
     cellEditing?: any;
+    visibleColumns?: Column<DataType>[];
+    handleNextCell?: () => void;
 }
 declare const EditableCell: <T>(props: EditableCellProps<T>) => JSX.Element;
 export default EditableCell;

package/es/table-component/body/EditableCell.js

@@ -43,7 +43,9 @@ const EditableCell = props => {
     // children,
     column,
     indexRow,
-    indexCol
+    indexCol,
+    // visibleColumns,
+    handleNextCell
     // cellEditing,
     // ...restProps
   } = props;
@@ -61,8 +63,7 @@ const EditableCell = props => {
   } = useContext(TableContext);
   const datePickerRef = React.useRef(null);
   const dateTimePickerRef = React.useRef(null);
-  // const timePickerRef = React.useRef(null);
-
+  const timePickerRef = React.useRef(null);
   const colFormat = typeof column?.format === 'function' ? column?.format(record) : column?.format;
   const cellFormat = getFormat(colFormat, format);
   const inputNode = (value, onChange) => {
@@ -99,7 +100,24 @@ const EditableCell = props => {
     const options = validateOption ? validateOption(record, column.field) : selectOptions ?? [];
     const optionsTree = validateOption ? convertArrayWithIndent(validateOption(record, column.field)) : selectOptions ? convertArrayWithIndent(selectOptions) : [];
 
-    // const currt = flatColumns2()
+    // const focusToken = (token: FormatToken, fmt: string) => {
+    //   const input: HTMLInputElement | null =
+    //     timePickerRef.current?.nativeElement?.querySelector('input') ??
+    //     timePickerRef.current?.input;
+
+    //   if (!input) return;
+
+    //   const start = fmt.indexOf(token);
+    //   if (start === -1) return;
+
+    //   input.focus();
+
+    //   input.setSelectionRange(start, start + token.length - 1);
+
+    //   requestAnimationFrame(() => {
+    //     input.setSelectionRange(start, start + token.length);
+    //   });
+    // };
 
     switch (editType) {
       case 'date':
@@ -324,6 +342,7 @@ const EditableCell = props => {
         const maxTime = maxTimeValue ? dayjs(maxTimeValue, timeFormat) : undefined;
         const minTime = minTimeValue ? dayjs(minTimeValue, timeFormat) : undefined;
         return /*#__PURE__*/React.createElement(TimePicker, {
+          ref: timePickerRef,
           format: {
             format: timeFormat,
             type: 'mask'
@@ -344,8 +363,79 @@ const EditableCell = props => {
           "data-tooltip-content": message,
           "data-tooltip-id": `${id}-tooltip-error`,
           autoFocus: column.field === startCell?.colId,
-          defaultOpen: column.field === startCell?.colId,
-          onChange: (newDate, dateString) => {
+          defaultOpen: column.field === startCell?.colId
+
+          // onChange={(newDate, dateString) => {
+
+          //   if (typeTime === 'time') {
+
+          //     onChange(dateString)
+
+          //   } else {
+
+          //     // const datetime = dayjs(dateString as string, timeFormat, true);
+
+          //     const newVal =  newDate ? moment(newDate.toDate()).format() : undefined
+
+          //     // const newVal = datetime.isValid() ? moment(datetime.toDate()).format() : ''
+          //     onChange(newVal)
+
+          //   }
+
+          //   setTimeout(() => {
+          //     // @ts-ignore
+          //     dateTimePickerRef.current?.focus()
+          //   }, 0)
+
+          // }}
+
+          // onBlur={() => {
+          //   const formState = getValues()
+          //   const itemState = getValues(dataIndex)
+          //   // @ts-ignore
+          //   const prevState = record[dataIndex]
+          //   const newState = itemState
+
+          //   let newValue = newState
+
+          //   if (typeTime === 'time') {
+
+          //     newValue = newState
+
+          //   } else {
+
+          //     const datetime = dayjs(newState as string, timeFormat, true);
+
+          //     const newVal = datetime.isValid() ? moment(datetime.toDate()).format() : undefined
+          //     onChange(newVal)
+
+          //     newValue = newVal
+
+          //   }
+
+          //   if (prevState !== newState) {
+          //     handleCellChange?.({
+          //       key: key as any,
+          //       field: column.field ?? column.field as any,
+          //       record: formState,
+          //       prevState,
+          //       newState: newValue,
+          //       option: newValue,
+          //       indexCol,
+          //       indexRow,
+          //       type: 'blur'
+          //     })
+          //   }
+          // }}
+
+          //  needConfirm={false}
+          ,
+
+          onCalendarChange: (newDate, dateString) => {
+            // const newDateValue = dateString ? moment(convertDayjsToDate(dateString as string, dateFormat)).format() : null
+
+            // onChange(newDateValue)
+
             if (typeTime === 'time') {
               onChange(dateString);
             } else {
@@ -358,38 +448,34 @@ const EditableCell = props => {
             }
             setTimeout(() => {
               // @ts-ignore
-              dateTimePickerRef.current?.focus();
-            }, 0);
+              timePickerRef.current?.focus();
+            });
           },
-          onBlur: () => {
-            console.log('22222222222');
-            const formState = getValues();
-            const itemState = getValues(dataIndex);
-            // @ts-ignore
-            const prevState = record[dataIndex];
-            const newState = itemState;
-            let newValue = newState;
-            if (typeTime === 'time') {
-              newValue = newState;
-            } else {
-              const datetime = dayjs(newState, timeFormat, true);
-              const newVal = datetime.isValid() ? moment(datetime.toDate()).format() : undefined;
-              onChange(newVal);
-              newValue = newVal;
+          onOpenChange: open => {
+            if (!open) {
+              const formState = getValues();
+              const itemState = getValues(dataIndex);
+              // @ts-ignore
+              const prevState = record[dataIndex];
+              const newState = itemState;
+              if (prevState !== newState) {
+                handleCellChange?.({
+                  key: key,
+                  field: column.field ?? column.field,
+                  record: formState,
+                  prevState,
+                  newState,
+                  option: newState,
+                  indexCol,
+                  indexRow,
+                  type: 'blur'
+                });
+              }
             }
-            console.log('newValue', newValue);
-            if (prevState !== newState) {
-              handleCellChange?.({
-                key: key,
-                field: column.field ?? column.field,
-                record: formState,
-                prevState,
-                newState: newValue,
-                option: newValue,
-                indexCol,
-                indexRow,
-                type: 'blur'
-              });
+          },
+          onKeyDown: e => {
+            if (e?.code === "Tab") {
+              handleNextCell?.();
             }
           }
         });

package/es/table-component/body/TableBodyCellEdit.js

@@ -1,6 +1,6 @@
 import Space from "rc-master-ui/es/space";
 import Command from "../components/command/Command";
-import { addRowsDown, addRowsDownWithCtrl, addRowsUp, addRowsUpWithCtrl, findFirst, flattenArray, flattenData, getColIdsBetween, getCommonPinningStyles, getEditType, getFormat, getRowIdsBetween, getSelectedCellMatrix, isEditable, isObjEmpty, isObjEqual, newGuid, unFlattenData, updateOrInsert } from "../hook/utils";
+import { addRowsDown, addRowsDownWithCtrl, addRowsUp, addRowsUpWithCtrl, findFirst, flattenArray, flattenData, getColIdsBetween, getCommonPinningStyles, getEditType, getFormat, getNextEditableColumn, getRowIdsBetween, getSelectedCellMatrix, isEditable, isObjEmpty, isObjEqual, newGuid, unFlattenData, updateOrInsert } from "../hook/utils";
 import Checkbox from "rc-master-ui/es/checkbox/Checkbox";
 import classNames from "classnames";
 import React from "react";
@@ -232,6 +232,7 @@ const TableBodyCellEdit = props => {
     format
   } = React.useContext(TableContext);
   const expandIconColumnIndex = expandable?.expandIconColumnIndex;
+  const visibleColumns = table.getVisibleLeafColumns();
   const record = cell.row.original;
   const columnMeta = cell.column.columnDef.meta ?? {};
   const [isOpenTooltip, setIsOpenTooltip] = React.useState(false);
@@ -309,7 +310,9 @@ const TableBodyCellEdit = props => {
     }
   }, [cell, columnMeta, isOpenTooltip, record, valueCellString]);
   const triggerDragPaste = (pasteState, ctrlKey) => {
-    const tmpCols = table.getVisibleLeafColumns();
+    const tmpCols = {
+      ...visibleColumns
+    };
     const rowPasteIds = getRowIdsBetween(table, startPasteCell?.rowId ?? '', endPasteCell?.rowId ?? '');
     const colPasteds = getColIdsBetween(table, startPasteCell?.colId ?? '', endPasteCell?.colId ?? '');
     const rowSelectIds = getRowIdsBetween(table, startCell?.rowId ?? '', endCell?.rowId ?? '');
@@ -383,7 +386,9 @@ const TableBodyCellEdit = props => {
     setRangePasteState?.(undefined);
   };
   const triggerPointPaste = (pasteState, cellStart, cellEnd, ctrlKey) => {
-    const tmpCols = table.getVisibleLeafColumns();
+    const tmpCols = {
+      ...visibleColumns
+    };
     const rowPasteIds = getRowIdsBetween(table, cellStart?.rowId ?? '', cellEnd?.rowId ?? '');
     const colPasteds = getColIdsBetween(table, cellStart?.colId ?? '', cellEnd?.colId ?? '');
     const rowSelectIds = getRowIdsBetween(table, startCell?.rowId ?? '', endCell?.rowId ?? '');
@@ -584,7 +589,9 @@ const TableBodyCellEdit = props => {
   function handleKeyDown(e, rowId, colId) {
     if (e.key === 'Tab') {
       e.preventDefault();
-      const allCols = table.getVisibleLeafColumns();
+      const allCols = {
+        ...visibleColumns
+      };
       const currentColIndex = table.getColumn(colId)?.getIndex() ?? 0;
       const nextCol = allCols[currentColIndex + 1];
       if (nextCol) {
@@ -648,7 +655,7 @@ const TableBodyCellEdit = props => {
     if (e.key === 'ArrowRight') {
       e.preventDefault();
       e.stopPropagation();
-      const allCols = table.getVisibleLeafColumns().filter(it => !nonActionColumn.includes(it.id));
+      const allCols = visibleColumns.filter(it => !nonActionColumn.includes(it.id));
       const currentColIndex = allCols.findIndex(it => it.id === cell.column.id);
       const nextCol = allCols[currentColIndex + 1];
       if (nextCol) {
@@ -679,7 +686,7 @@ const TableBodyCellEdit = props => {
     }
     if (e.key === 'ArrowLeft') {
       e.preventDefault();
-      const allCols = table.getVisibleLeafColumns().filter(it => !nonActionColumn.includes(it.id));
+      const allCols = visibleColumns.filter(it => !nonActionColumn.includes(it.id));
 
       // const currentColIndex = table.getColumn(colId)?.getIndex() ?? 0;
       const currentColIndex = allCols.findIndex(it => it.id === cell.column.id);
@@ -827,7 +834,7 @@ const TableBodyCellEdit = props => {
   }
   const handleMouseDownIndex = rowId => {
     setIsSelecting?.(true);
-    const allColumns = table.getVisibleLeafColumns().filter(it => !nonActionColumn.includes(it.id));
+    const allColumns = visibleColumns.filter(it => !nonActionColumn.includes(it.id));
     const firstCOlSpin = findFirst(allColumns);
     const startCol = allColumns[0].id;
     const endCol = allColumns[allColumns.length - 1].id;
@@ -861,7 +868,7 @@ const TableBodyCellEdit = props => {
   };
   const handleMouseEnterIndex = rowId => {
     if (isSelecting) {
-      const allColumns = table.getVisibleLeafColumns().filter(it => !nonActionColumn.includes(it.id));
+      const allColumns = visibleColumns.filter(it => !nonActionColumn.includes(it.id));
 
       // const firstCOl = findFirst(allColumns)
 
@@ -1111,6 +1118,58 @@ const TableBodyCellEdit = props => {
       }, 100);
     }
   };
+  const handleNextCell = () => {
+    const allCols = visibleColumns;
+
+    // const colId = cell.column.id
+    const rowId = cell.row.id;
+
+    // const currentColIndex = table.getColumn(colId)?.getIndex() ?? 0;
+    // const currentColIndex = indexCol;
+
+    const isNextCol = allCols[colIndex + 1];
+    const nextCol = getNextEditableColumn(visibleColumns, colIndex, record);
+    if (isNextCol && nextCol) {
+      setFocusedCell?.({
+        rowId,
+        colId: nextCol.id
+      });
+      setStartCell?.({
+        rowId,
+        colId: nextCol.id
+      });
+      setEndCell?.({
+        rowId,
+        colId: nextCol.id
+      });
+      setRangeState?.(getSelectedCellMatrix(table, {
+        rowId,
+        colId: nextCol.id
+      }, {
+        rowId,
+        colId: nextCol.id
+      }));
+      columnVirtualizer.scrollToIndex(nextCol.getIndex(), {
+        align: 'center'
+      });
+      const nextItem = document.querySelector(`.ui-rc-grid-row .cell-editing[data-row-key="${rowId}"].cell-editing[data-col-key="${nextCol.id}"] input`);
+
+      // const input = document.querySelector(`.ui-rc-table-row .cell-editing[data-row-index="${startSelectedCells.current.row}"].cell-editing[data-col-index="${startSelectedCells.current.col}"] input`) as HTMLInputElement
+      // const textarea = document.querySelector(`.ui-rc-table-row .cell-editing[data-row-index="${rowNumber}"].cell-editing[data-col-index="${startSelectedCells.current.col}"] textarea`) as any
+
+      const textarea = document.querySelector(`.ui-rc-grid-row .cell-editing[data-row-key="${rowId}"].cell-editing[data-col-key="${nextCol.id}"] textarea`);
+      setTimeout(() => {
+        if (textarea) {
+          textarea.focus();
+          textarea.setSelectionRange(textarea.value.length, textarea.value.length);
+          return;
+        }
+        if (nextItem) {
+          nextItem.focus();
+        }
+      });
+    }
+  };
   const cellValue = cell.getValue();
   const rowIndex = cell.row.index;
   const colFormat = typeof columnMeta?.format === 'function' ? columnMeta?.format(record) : columnMeta?.format;
@@ -1246,7 +1305,9 @@ const TableBodyCellEdit = props => {
     editType: getEditType(cell.column.columnDef.meta, record),
     indexCol: cell.column.getIndex(),
     indexRow: cell.row.index,
-    record: record
+    record: record,
+    visibleColumns: visibleColumns,
+    handleNextCell: handleNextCell
     // rowKey={rowKey}
   }) : /*#__PURE__*/React.createElement("div", {
     className: classNames('ui-rc_cell-content', {

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

@@ -38,9 +38,9 @@ export const renderValueCell = (column, value, record, rowIndex, colIndex, forma
     case 'date':
       return value ? dayjs(value).format(format?.dateFormat ?? 'DD/MM/YYYY') : '';
     case 'time':
-      const timeFormat = format?.timeFormat ?? 'HH:mm';
+      const timeFormat = format?.timeFormat;
       const abc = convertToDate(value, timeFormat);
-      const timeValue = value ? dayjs(abc).format(timeFormat) : '';
+      const timeValue = value ? dayjs(abc).format(timeFormat ?? 'HH:mm') : '';
       return timeValue ?? '';
     case 'year':
       const year = value ? moment(value).format('yyyy') : '';

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

@@ -81,6 +81,7 @@ export declare function sortData(data: any[], sorter: Sorter[]): any[];
 export declare function filterDataByColumns(data: any[], queries: FilterItem[] | undefined, sorter: Sorter[] | undefined, keysFilter: string[] | undefined, ignoreAccents?: boolean): any[];
 export declare const getAllRowKey: (data: any[]) => any[];
 export declare const isEditable: <RecordType>(column: ColumnTable, rowData: RecordType) => boolean | ((rowData: any) => boolean);
+export declare const getNextEditableColumn: (columns: any[], currentIndex: number, rowData: any) => any;
 export declare const checkFieldKey: (key: string | undefined) => string;
 export declare const convertArrayWithIndent: (inputArray: any[], parentIndent?: number) => any[];
 export declare const convertLabelToTitle: (data: any[]) => any[];
@@ -167,3 +168,5 @@ export declare const removeColumns: <RecordType>(columns: ColumnTable<RecordType
 export declare function sumFields(columns: ColumnTable[], data: any[], childrenKey?: string): any;
 export declare function sumNumberFields(columns: ColumnTable[], data: any[], childrenKey?: string): any;
 export declare const getTreeDepth: (rows: any[]) => number;
+export type FormatToken = 'YYYY' | 'MM' | 'DD' | 'HH' | 'mm' | 'ss';
+export declare const isDateChanged: (oldDate: string | Date, newDate: string | Date, format: string) => FormatToken | null;

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

@@ -177,6 +177,9 @@ export function getDateValueType(value) {
   }
   const datetimeRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2})?(\.\d+)?(Z|[+-]\d{2}:\d{2})?$/;
   const timeRegex = /^\d{2}:\d{2}(:\d{2})?$/;
+
+  // const timeRegex = /^(?:[01]\d|2[0-3])\s*:\s*[0-5]\d(?:\s*:\s*[0-5]\d)?$/;
+
   if (datetimeRegex.test(value)) {
     return 'datetime';
   }
@@ -191,7 +194,7 @@ export const convertToDate = (value, format) => {
   }
   const valueType = getDateValueType(value);
   if (valueType === 'time') {
-    const date = dayjs(value, format, true);
+    const date = dayjs(value, format ?? ['HH:mm:ss', 'HH:mm'], true);
     return date.isValid() ? moment(date.toDate()).format() : '';
   }
   if (valueType === 'datetime') {
@@ -1230,6 +1233,14 @@ export const isEditable = (column, rowData) => {
   }
   return column?.editEnable;
 };
+export const getNextEditableColumn = (columns, currentIndex, rowData) => {
+  for (let i = currentIndex + 1; i < columns.length; i++) {
+    if (isEditable(columns[i].columnDef.meta, rowData)) {
+      return columns[i];
+    }
+  }
+  return undefined;
+};
 export const checkFieldKey = key => {
   if (key) {
     return key;
@@ -2718,4 +2729,24 @@ export function sumNumberFields(columns, data, childrenKey = 'children') {
 export const getTreeDepth = rows => {
   if (!rows?.length) return 0;
   return 1 + Math.max(0, ...rows.map(r => getTreeDepth(r.children)));
+};
+const TOKEN_MAP = {
+  YYYY: 'year',
+  MM: 'month',
+  DD: 'day',
+  HH: 'hour',
+  mm: 'minute',
+  ss: 'second'
+};
+export const isDateChanged = (oldDate, newDate, format) => {
+  const prev = dayjs(oldDate, format, true);
+  const next = dayjs(newDate, format, true);
+  const tokens = ['YYYY', 'MM', 'DD', 'HH', 'mm', 'ss'];
+  for (const token of tokens) {
+    if (!format.includes(token)) continue;
+    if (!prev.isSame(next, TOKEN_MAP[token])) {
+      return token;
+    }
+  }
+  return null;
 };

package/es/table-component/style.scss

@@ -1195,4 +1195,10 @@ $cell-index-focus-bg-Dark: #E6EFFD !default;
   .ui-rc-toolbar-bottom_border-bottom {
     border-bottom-color: $tableBorderColorDark;
   }
+}
+
+.ui-rc-checkbox {
+  &:has(input:focus) span {
+  border-color: red;
+}
 }

package/lib/table-component/TableContainerEdit.js

@@ -417,11 +417,14 @@ const TableContainerEdit = props => {
               }
             } else if (columnOri.type === 'data' || columnOri.type === 'datatime' || columnOri.editType === 'date' || columnOri.editType === 'datetime') {
               const isDate = (0, _utils.isDateValue)(cellValue.trim());
-              const colFormat = typeof columnOri?.format === 'function' ? columnOri?.format(record) : columnOri?.format;
-              const cellFormat = (0, _utils.getFormat)(colFormat, format);
-              const editType = (0, _utils.getEditType)(columnOri);
-              const dateFormat = (0, _utils.getDatepickerFormat)(editType, cellFormat);
-              const date = isDate && !(0, _utils.isEmpty)(cellValue.trim()) ? (0, _moment.default)(cellValue.trim(), dateFormat).format("YYYY-MM-DDTHH:mm:ssZ") : null;
+
+              // const colFormat = typeof columnOri?.format === 'function' ? columnOri?.format(record) : columnOri?.format
+              // const cellFormat = getFormat(colFormat, format)
+              // const editType = getEditType(columnOri as any)
+              // const dateFormat = getDatepickerFormat(editType, cellFormat)
+              // const date = isDate && !isEmpty(cellValue.trim()) ? moment(cellValue.trim(), dateFormat, true).format() : null
+
+              const date = isDate && !(0, _utils.isEmpty)(cellValue.trim()) ? (0, _moment.default)(cellValue.trim()).format() : null;
               newData[targetRow] = {
                 ...newData[targetRow],
                 [columnKey]: date
@@ -601,6 +604,8 @@ const TableContainerEdit = props => {
       handlePasted(rowsPasted);
     }
   }, [handlePasted, onCellPaste?.maxRowsPaste, startCell]);
+
+  // Copy
   _react.default.useEffect(() => {
     const handleKeyDown = e => {
       if (e.ctrlKey && e.key === 'c' && startCell && endCell && !editingKey) {
@@ -611,6 +616,8 @@ const TableContainerEdit = props => {
     document.addEventListener('keydown', handleKeyDown);
     return () => document.removeEventListener('keydown', handleKeyDown);
   }, [startCell, endCell, table, copySelectionToClipboard, editingKey]);
+
+  // Paste
   _react.default.useEffect(() => {
     const handlePaste = e => {
       if (startCell && !editingKey) {

package/lib/table-component/body/EditableCell.d.ts

@@ -1,6 +1,7 @@
 import React from "react";
 import type { EditType } from "rc-master-ui";
 import type { ColumnTable, IFormat } from "../../grid-component/type";
+import type { Column } from "@tanstack/react-table";
 interface EditableCellProps<DataType> extends React.HTMLAttributes<HTMLElement> {
     t?: any;
     dataIndex: string;
@@ -11,6 +12,8 @@ interface EditableCellProps<DataType> extends React.HTMLAttributes<HTMLElement>
     indexRow: number;
     indexCol: number;
     cellEditing?: any;
+    visibleColumns?: Column<DataType>[];
+    handleNextCell?: () => void;
 }
 declare const EditableCell: <T>(props: EditableCellProps<T>) => JSX.Element;
 export default EditableCell;

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

@@ -51,7 +51,9 @@ const EditableCell = props => {
     // children,
     column,
     indexRow,
-    indexCol
+    indexCol,
+    // visibleColumns,
+    handleNextCell
     // cellEditing,
     // ...restProps
   } = props;
@@ -69,8 +71,7 @@ const EditableCell = props => {
   } = (0, _react.useContext)(_useContext.TableContext);
   const datePickerRef = _react.default.useRef(null);
   const dateTimePickerRef = _react.default.useRef(null);
-  // const timePickerRef = React.useRef(null);
-
+  const timePickerRef = _react.default.useRef(null);
   const colFormat = typeof column?.format === 'function' ? column?.format(record) : column?.format;
   const cellFormat = (0, _utils.getFormat)(colFormat, format);
   const inputNode = (value, onChange) => {
@@ -107,7 +108,24 @@ const EditableCell = props => {
     const options = validateOption ? validateOption(record, column.field) : selectOptions ?? [];
     const optionsTree = validateOption ? (0, _utils.convertArrayWithIndent)(validateOption(record, column.field)) : selectOptions ? (0, _utils.convertArrayWithIndent)(selectOptions) : [];
 
-    // const currt = flatColumns2()
+    // const focusToken = (token: FormatToken, fmt: string) => {
+    //   const input: HTMLInputElement | null =
+    //     timePickerRef.current?.nativeElement?.querySelector('input') ??
+    //     timePickerRef.current?.input;
+
+    //   if (!input) return;
+
+    //   const start = fmt.indexOf(token);
+    //   if (start === -1) return;
+
+    //   input.focus();
+
+    //   input.setSelectionRange(start, start + token.length - 1);
+
+    //   requestAnimationFrame(() => {
+    //     input.setSelectionRange(start, start + token.length);
+    //   });
+    // };
 
     switch (editType) {
       case 'date':
@@ -332,6 +350,7 @@ const EditableCell = props => {
         const maxTime = maxTimeValue ? (0, _dayjs.default)(maxTimeValue, timeFormat) : undefined;
         const minTime = minTimeValue ? (0, _dayjs.default)(minTimeValue, timeFormat) : undefined;
         return /*#__PURE__*/_react.default.createElement(_rcMasterUi.TimePicker, {
+          ref: timePickerRef,
           format: {
             format: timeFormat,
             type: 'mask'
@@ -352,8 +371,79 @@ const EditableCell = props => {
           "data-tooltip-content": message,
           "data-tooltip-id": `${id}-tooltip-error`,
           autoFocus: column.field === startCell?.colId,
-          defaultOpen: column.field === startCell?.colId,
-          onChange: (newDate, dateString) => {
+          defaultOpen: column.field === startCell?.colId
+
+          // onChange={(newDate, dateString) => {
+
+          //   if (typeTime === 'time') {
+
+          //     onChange(dateString)
+
+          //   } else {
+
+          //     // const datetime = dayjs(dateString as string, timeFormat, true);
+
+          //     const newVal =  newDate ? moment(newDate.toDate()).format() : undefined
+
+          //     // const newVal = datetime.isValid() ? moment(datetime.toDate()).format() : ''
+          //     onChange(newVal)
+
+          //   }
+
+          //   setTimeout(() => {
+          //     // @ts-ignore
+          //     dateTimePickerRef.current?.focus()
+          //   }, 0)
+
+          // }}
+
+          // onBlur={() => {
+          //   const formState = getValues()
+          //   const itemState = getValues(dataIndex)
+          //   // @ts-ignore
+          //   const prevState = record[dataIndex]
+          //   const newState = itemState
+
+          //   let newValue = newState
+
+          //   if (typeTime === 'time') {
+
+          //     newValue = newState
+
+          //   } else {
+
+          //     const datetime = dayjs(newState as string, timeFormat, true);
+
+          //     const newVal = datetime.isValid() ? moment(datetime.toDate()).format() : undefined
+          //     onChange(newVal)
+
+          //     newValue = newVal
+
+          //   }
+
+          //   if (prevState !== newState) {
+          //     handleCellChange?.({
+          //       key: key as any,
+          //       field: column.field ?? column.field as any,
+          //       record: formState,
+          //       prevState,
+          //       newState: newValue,
+          //       option: newValue,
+          //       indexCol,
+          //       indexRow,
+          //       type: 'blur'
+          //     })
+          //   }
+          // }}
+
+          //  needConfirm={false}
+          ,
+
+          onCalendarChange: (newDate, dateString) => {
+            // const newDateValue = dateString ? moment(convertDayjsToDate(dateString as string, dateFormat)).format() : null
+
+            // onChange(newDateValue)
+
             if (typeTime === 'time') {
               onChange(dateString);
             } else {
@@ -366,38 +456,34 @@ const EditableCell = props => {
             }
             setTimeout(() => {
               // @ts-ignore
-              dateTimePickerRef.current?.focus();
-            }, 0);
+              timePickerRef.current?.focus();
+            });
           },
-          onBlur: () => {
-            console.log('22222222222');
-            const formState = getValues();
-            const itemState = getValues(dataIndex);
-            // @ts-ignore
-            const prevState = record[dataIndex];
-            const newState = itemState;
-            let newValue = newState;
-            if (typeTime === 'time') {
-              newValue = newState;
-            } else {
-              const datetime = (0, _dayjs.default)(newState, timeFormat, true);
-              const newVal = datetime.isValid() ? (0, _moment.default)(datetime.toDate()).format() : undefined;
-              onChange(newVal);
-              newValue = newVal;
+          onOpenChange: open => {
+            if (!open) {
+              const formState = getValues();
+              const itemState = getValues(dataIndex);
+              // @ts-ignore
+              const prevState = record[dataIndex];
+              const newState = itemState;
+              if (prevState !== newState) {
+                handleCellChange?.({
+                  key: key,
+                  field: column.field ?? column.field,
+                  record: formState,
+                  prevState,
+                  newState,
+                  option: newState,
+                  indexCol,
+                  indexRow,
+                  type: 'blur'
+                });
+              }
             }
-            console.log('newValue', newValue);
-            if (prevState !== newState) {
-              handleCellChange?.({
-                key: key,
-                field: column.field ?? column.field,
-                record: formState,
-                prevState,
-                newState: newValue,
-                option: newValue,
-                indexCol,
-                indexRow,
-                type: 'blur'
-              });
+          },
+          onKeyDown: e => {
+            if (e?.code === "Tab") {
+              handleNextCell?.();
             }
           }
         });

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

@@ -239,6 +239,7 @@ const TableBodyCellEdit = props => {
     format
   } = _react.default.useContext(_useContext.TableContext);
   const expandIconColumnIndex = expandable?.expandIconColumnIndex;
+  const visibleColumns = table.getVisibleLeafColumns();
   const record = cell.row.original;
   const columnMeta = cell.column.columnDef.meta ?? {};
   const [isOpenTooltip, setIsOpenTooltip] = _react.default.useState(false);
@@ -316,7 +317,9 @@ const TableBodyCellEdit = props => {
     }
   }, [cell, columnMeta, isOpenTooltip, record, valueCellString]);
   const triggerDragPaste = (pasteState, ctrlKey) => {
-    const tmpCols = table.getVisibleLeafColumns();
+    const tmpCols = {
+      ...visibleColumns
+    };
     const rowPasteIds = (0, _utils.getRowIdsBetween)(table, startPasteCell?.rowId ?? '', endPasteCell?.rowId ?? '');
     const colPasteds = (0, _utils.getColIdsBetween)(table, startPasteCell?.colId ?? '', endPasteCell?.colId ?? '');
     const rowSelectIds = (0, _utils.getRowIdsBetween)(table, startCell?.rowId ?? '', endCell?.rowId ?? '');
@@ -390,7 +393,9 @@ const TableBodyCellEdit = props => {
     setRangePasteState?.(undefined);
   };
   const triggerPointPaste = (pasteState, cellStart, cellEnd, ctrlKey) => {
-    const tmpCols = table.getVisibleLeafColumns();
+    const tmpCols = {
+      ...visibleColumns
+    };
     const rowPasteIds = (0, _utils.getRowIdsBetween)(table, cellStart?.rowId ?? '', cellEnd?.rowId ?? '');
     const colPasteds = (0, _utils.getColIdsBetween)(table, cellStart?.colId ?? '', cellEnd?.colId ?? '');
     const rowSelectIds = (0, _utils.getRowIdsBetween)(table, startCell?.rowId ?? '', endCell?.rowId ?? '');
@@ -591,7 +596,9 @@ const TableBodyCellEdit = props => {
   function handleKeyDown(e, rowId, colId) {
     if (e.key === 'Tab') {
       e.preventDefault();
-      const allCols = table.getVisibleLeafColumns();
+      const allCols = {
+        ...visibleColumns
+      };
       const currentColIndex = table.getColumn(colId)?.getIndex() ?? 0;
       const nextCol = allCols[currentColIndex + 1];
       if (nextCol) {
@@ -655,7 +662,7 @@ const TableBodyCellEdit = props => {
     if (e.key === 'ArrowRight') {
       e.preventDefault();
       e.stopPropagation();
-      const allCols = table.getVisibleLeafColumns().filter(it => !_hooks.nonActionColumn.includes(it.id));
+      const allCols = visibleColumns.filter(it => !_hooks.nonActionColumn.includes(it.id));
       const currentColIndex = allCols.findIndex(it => it.id === cell.column.id);
       const nextCol = allCols[currentColIndex + 1];
       if (nextCol) {
@@ -686,7 +693,7 @@ const TableBodyCellEdit = props => {
     }
     if (e.key === 'ArrowLeft') {
       e.preventDefault();
-      const allCols = table.getVisibleLeafColumns().filter(it => !_hooks.nonActionColumn.includes(it.id));
+      const allCols = visibleColumns.filter(it => !_hooks.nonActionColumn.includes(it.id));
 
       // const currentColIndex = table.getColumn(colId)?.getIndex() ?? 0;
       const currentColIndex = allCols.findIndex(it => it.id === cell.column.id);
@@ -834,7 +841,7 @@ const TableBodyCellEdit = props => {
   }
   const handleMouseDownIndex = rowId => {
     setIsSelecting?.(true);
-    const allColumns = table.getVisibleLeafColumns().filter(it => !_hooks.nonActionColumn.includes(it.id));
+    const allColumns = visibleColumns.filter(it => !_hooks.nonActionColumn.includes(it.id));
     const firstCOlSpin = (0, _utils.findFirst)(allColumns);
     const startCol = allColumns[0].id;
     const endCol = allColumns[allColumns.length - 1].id;
@@ -868,7 +875,7 @@ const TableBodyCellEdit = props => {
   };
   const handleMouseEnterIndex = rowId => {
     if (isSelecting) {
-      const allColumns = table.getVisibleLeafColumns().filter(it => !_hooks.nonActionColumn.includes(it.id));
+      const allColumns = visibleColumns.filter(it => !_hooks.nonActionColumn.includes(it.id));
 
       // const firstCOl = findFirst(allColumns)
 
@@ -1118,6 +1125,58 @@ const TableBodyCellEdit = props => {
       }, 100);
     }
   };
+  const handleNextCell = () => {
+    const allCols = visibleColumns;
+
+    // const colId = cell.column.id
+    const rowId = cell.row.id;
+
+    // const currentColIndex = table.getColumn(colId)?.getIndex() ?? 0;
+    // const currentColIndex = indexCol;
+
+    const isNextCol = allCols[colIndex + 1];
+    const nextCol = (0, _utils.getNextEditableColumn)(visibleColumns, colIndex, record);
+    if (isNextCol && nextCol) {
+      setFocusedCell?.({
+        rowId,
+        colId: nextCol.id
+      });
+      setStartCell?.({
+        rowId,
+        colId: nextCol.id
+      });
+      setEndCell?.({
+        rowId,
+        colId: nextCol.id
+      });
+      setRangeState?.((0, _utils.getSelectedCellMatrix)(table, {
+        rowId,
+        colId: nextCol.id
+      }, {
+        rowId,
+        colId: nextCol.id
+      }));
+      columnVirtualizer.scrollToIndex(nextCol.getIndex(), {
+        align: 'center'
+      });
+      const nextItem = document.querySelector(`.ui-rc-grid-row .cell-editing[data-row-key="${rowId}"].cell-editing[data-col-key="${nextCol.id}"] input`);
+
+      // const input = document.querySelector(`.ui-rc-table-row .cell-editing[data-row-index="${startSelectedCells.current.row}"].cell-editing[data-col-index="${startSelectedCells.current.col}"] input`) as HTMLInputElement
+      // const textarea = document.querySelector(`.ui-rc-table-row .cell-editing[data-row-index="${rowNumber}"].cell-editing[data-col-index="${startSelectedCells.current.col}"] textarea`) as any
+
+      const textarea = document.querySelector(`.ui-rc-grid-row .cell-editing[data-row-key="${rowId}"].cell-editing[data-col-key="${nextCol.id}"] textarea`);
+      setTimeout(() => {
+        if (textarea) {
+          textarea.focus();
+          textarea.setSelectionRange(textarea.value.length, textarea.value.length);
+          return;
+        }
+        if (nextItem) {
+          nextItem.focus();
+        }
+      });
+    }
+  };
   const cellValue = cell.getValue();
   const rowIndex = cell.row.index;
   const colFormat = typeof columnMeta?.format === 'function' ? columnMeta?.format(record) : columnMeta?.format;
@@ -1253,7 +1312,9 @@ const TableBodyCellEdit = props => {
     editType: (0, _utils.getEditType)(cell.column.columnDef.meta, record),
     indexCol: cell.column.getIndex(),
     indexRow: cell.row.index,
-    record: record
+    record: record,
+    visibleColumns: visibleColumns,
+    handleNextCell: handleNextCell
     // rowKey={rowKey}
   }) : /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('ui-rc_cell-content', {

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

@@ -48,9 +48,9 @@ const renderValueCell = (column, value, record, rowIndex, colIndex, format, edit
     case 'date':
       return value ? (0, _dayjs.default)(value).format(format?.dateFormat ?? 'DD/MM/YYYY') : '';
     case 'time':
-      const timeFormat = format?.timeFormat ?? 'HH:mm';
+      const timeFormat = format?.timeFormat;
       const abc = (0, _utils.convertToDate)(value, timeFormat);
-      const timeValue = value ? (0, _dayjs.default)(abc).format(timeFormat) : '';
+      const timeValue = value ? (0, _dayjs.default)(abc).format(timeFormat ?? 'HH:mm') : '';
       return timeValue ?? '';
     case 'year':
       const year = value ? (0, _moment.default)(value).format('yyyy') : '';

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

@@ -81,6 +81,7 @@ export declare function sortData(data: any[], sorter: Sorter[]): any[];
 export declare function filterDataByColumns(data: any[], queries: FilterItem[] | undefined, sorter: Sorter[] | undefined, keysFilter: string[] | undefined, ignoreAccents?: boolean): any[];
 export declare const getAllRowKey: (data: any[]) => any[];
 export declare const isEditable: <RecordType>(column: ColumnTable, rowData: RecordType) => boolean | ((rowData: any) => boolean);
+export declare const getNextEditableColumn: (columns: any[], currentIndex: number, rowData: any) => any;
 export declare const checkFieldKey: (key: string | undefined) => string;
 export declare const convertArrayWithIndent: (inputArray: any[], parentIndent?: number) => any[];
 export declare const convertLabelToTitle: (data: any[]) => any[];
@@ -167,3 +168,5 @@ export declare const removeColumns: <RecordType>(columns: ColumnTable<RecordType
 export declare function sumFields(columns: ColumnTable[], data: any[], childrenKey?: string): any;
 export declare function sumNumberFields(columns: ColumnTable[], data: any[], childrenKey?: string): any;
 export declare const getTreeDepth: (rows: any[]) => number;
+export type FormatToken = 'YYYY' | 'MM' | 'DD' | 'HH' | 'mm' | 'ss';
+export declare const isDateChanged: (oldDate: string | Date, newDate: string | Date, format: string) => FormatToken | null;

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

@@ -39,12 +39,12 @@ exports.getFormat = exports.getFixedFields = exports.getEditType = exports.getDi
 exports.getHiddenParentKeys = getHiddenParentKeys;
 exports.getHiddenParentKeys1 = getHiddenParentKeys1;
 exports.getInvisibleColumns = getInvisibleColumns;
-exports.getNewItemsOnly = exports.getLastSelectCell = void 0;
+exports.getNextEditableColumn = exports.getNewItemsOnly = exports.getLastSelectCell = void 0;
 exports.getRowIdsBetween = getRowIdsBetween;
 exports.getVisibleColumnKeys1 = exports.getVisibleColumnKeys = exports.getTypeFilter = exports.getTreeDepth = exports.getTableHeight = exports.getSelectedCellMatrix = void 0;
 exports.getVisibleFields = getVisibleFields;
 exports.groupArrayByColumns = groupArrayByColumns;
-exports.isColor = void 0;
+exports.isDateChanged = exports.isColor = void 0;
 exports.isDateString = isDateString;
 exports.isEmpty = exports.isEditable = exports.isDisable = exports.isDateValue = void 0;
 exports.isEqualSet = isEqualSet;
@@ -260,6 +260,9 @@ function getDateValueType(value) {
   }
   const datetimeRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(:\d{2})?(\.\d+)?(Z|[+-]\d{2}:\d{2})?$/;
   const timeRegex = /^\d{2}:\d{2}(:\d{2})?$/;
+
+  // const timeRegex = /^(?:[01]\d|2[0-3])\s*:\s*[0-5]\d(?:\s*:\s*[0-5]\d)?$/;
+
   if (datetimeRegex.test(value)) {
     return 'datetime';
   }
@@ -274,7 +277,7 @@ const convertToDate = (value, format) => {
   }
   const valueType = getDateValueType(value);
   if (valueType === 'time') {
-    const date = (0, _dayjs.default)(value, format, true);
+    const date = (0, _dayjs.default)(value, format ?? ['HH:mm:ss', 'HH:mm'], true);
     return date.isValid() ? (0, _moment.default)(date.toDate()).format() : '';
   }
   if (valueType === 'datetime') {
@@ -1336,6 +1339,15 @@ const isEditable = (column, rowData) => {
   return column?.editEnable;
 };
 exports.isEditable = isEditable;
+const getNextEditableColumn = (columns, currentIndex, rowData) => {
+  for (let i = currentIndex + 1; i < columns.length; i++) {
+    if (isEditable(columns[i].columnDef.meta, rowData)) {
+      return columns[i];
+    }
+  }
+  return undefined;
+};
+exports.getNextEditableColumn = getNextEditableColumn;
 const checkFieldKey = key => {
   if (key) {
     return key;
@@ -2853,4 +2865,25 @@ const getTreeDepth = rows => {
   if (!rows?.length) return 0;
   return 1 + Math.max(0, ...rows.map(r => getTreeDepth(r.children)));
 };
-exports.getTreeDepth = getTreeDepth;
+exports.getTreeDepth = getTreeDepth;
+const TOKEN_MAP = {
+  YYYY: 'year',
+  MM: 'month',
+  DD: 'day',
+  HH: 'hour',
+  mm: 'minute',
+  ss: 'second'
+};
+const isDateChanged = (oldDate, newDate, format) => {
+  const prev = (0, _dayjs.default)(oldDate, format, true);
+  const next = (0, _dayjs.default)(newDate, format, true);
+  const tokens = ['YYYY', 'MM', 'DD', 'HH', 'mm', 'ss'];
+  for (const token of tokens) {
+    if (!format.includes(token)) continue;
+    if (!prev.isSame(next, TOKEN_MAP[token])) {
+      return token;
+    }
+  }
+  return null;
+};
+exports.isDateChanged = isDateChanged;

package/lib/table-component/style.scss

@@ -1195,4 +1195,10 @@ $cell-index-focus-bg-Dark: #E6EFFD !default;
   .ui-rc-toolbar-bottom_border-bottom {
     border-bottom-color: $tableBorderColorDark;
   }
+}
+
+.ui-rc-checkbox {
+  &:has(input:focus) span {
+  border-color: red;
+}
 }

package/package.json

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