es-grid-template 1.2.1 → 1.2.2

package/es/grid-component/type.d.ts

@@ -82,7 +82,7 @@ export type ToolbarClick = {
     item: any;
     column: any;
 };
-export type ColumnType<RecordType> = Omit<RcColumnType<RecordType>, 'headerTemplate'> & {
+export type ColumnType<RecordType> = Omit<RcColumnType<RecordType>, 'headerTemplate' | 'title'> & {
     field?: string;
     key?: any;
     type?: IColumnType;

package/lib/grid-component/GridStyle.js

@@ -9,4 +9,4 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 const GridStyle = exports.GridStyle = _styledComponents.default.div.withConfig({
   displayName: "GridStyle",
   componentId: "es-grid-template__sc-sueu2e-0"
-})([".ui-rc-table-container{min-height:", ";}.ui-rc-toolbar-bottom{position:relative;padding:.25rem 1rem;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;z-index:-1;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;z-index:-1;}.toolbar-button{border-radius:0;.ant-btn{border-radius:0;}}}.ui-rc-pagination{border-bottom:1px solid #e0e0e0;border-top:1px solid #e0e0e0;margin:0;padding:.75rem 1rem;.ui-rc-pagination-total-text{order:2;margin-left:auto;}&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;left:0;z-index:-1;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;visibility:visible;right:0;z-index:-1;}&.pagination-template{position:relative;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;z-index:-1;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;z-index:-1;}}}.react-resizable{position:relative;background-clip:padding-box;}.react-resizable-handle{position:absolute;right:0px;bottom:0;z-index:1;width:5px;height:100%;cursor:col-resize;&.none{cursor:auto;display:none;}}"], props => props.heightTable ? typeof props.heightTable === 'string' ? props.heightTable : `${props.heightTable}px` : undefined);
+})([".ui-rc-table-container{min-height:", ";}.ui-rc-toolbar-bottom{position:relative;padding:.25rem 1rem;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;z-index:-1;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;z-index:-1;}.toolbar-button{border-radius:0;.ant-btn{border-radius:0;}}}.ui-rc-pagination{border-bottom:1px solid #e0e0e0;border-top:1px solid #e0e0e0;margin:0;padding:.75rem 1rem;.ui-rc-pagination-total-text{order:2;margin-left:auto;}&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;left:0;z-index:-1;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:50px;bottom:0;visibility:visible;right:0;z-index:-1;}&.pagination-template{position:relative;&::before{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;left:0;z-index:-1;}&::after{content:\"\";position:absolute;border-left:1px solid #e0e0e0;height:100%;bottom:0;visibility:visible;right:0;z-index:-1;}}}.react-resizable{position:relative;background-clip:padding-box;}.rc-resizable-handle{position:absolute;right:0px;bottom:0;z-index:1;width:5px;height:100%;cursor:col-resize;&.none{cursor:auto;display:none;}}"], props => props.heightTable ? typeof props.heightTable === 'string' ? props.heightTable : `${props.heightTable}px` : undefined);

package/lib/grid-component/InternalTable.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import 'react-resizable/css/styles.css';
 import type { GridTableProps } from "./type";
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';

package/lib/grid-component/InternalTable.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = _interopRequireDefault(require("react"));
 var _reactResizable = require("react-resizable");
+require("react-resizable/css/styles.css");
 var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _hooks = require("./hooks");
 var _dayjs = _interopRequireDefault(require("dayjs"));
@@ -42,7 +43,7 @@ const ResizableTitle = props => {
       width: width,
       height: 0,
       handle: /*#__PURE__*/_react.default.createElement("span", {
-        className: "react-resizable-handle",
+        className: "rc-resizable-handle",
         onClick: e => {
           e.stopPropagation();
         }

package/lib/grid-component/TableGrid.js

@@ -15,7 +15,6 @@ require("dayjs/locale/vi");
 var _ContextMenu = _interopRequireDefault(require("./ContextMenu"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _hooks = require("./hooks");
-var _antd = require("antd");
 var _columns = require("./hooks/columns");
 var _pagination = _interopRequireDefault(require("rc-master-ui/es/pagination"));
 var _LoadingSpinner = _interopRequireDefault(require("./LoadingSpinner"));
@@ -23,6 +22,8 @@ var _ColumnsChoose = require("./ColumnsChoose");
 var _useMergedState = _interopRequireDefault(require("rc-util/lib/hooks/useMergedState"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// import {ConfigProvider} from "antd";
+
 const convertFilters = filters => {
   const result = [];
   filters.forEach(({
@@ -294,17 +295,7 @@ const TableGrid = props => {
   const handleChange = sorter => {
     onSorter?.(sorter);
   };
-  return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.ConfigProvider, {
-    theme: {
-      components: {
-        Table: {
-          rowHoverBg: '#eb461912',
-          rowSelectedBg: '#eb4619',
-          rowSelectedHoverBg: '#eb4619'
-        }
-      }
-    }
-  }, /*#__PURE__*/_react.default.createElement(_ContextMenu.default, {
+  return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(_ContextMenu.default, {
     open: menuVisible,
     pos: position,
     setOpen: setMenuVisible,
@@ -455,6 +446,6 @@ const TableGrid = props => {
     // @ts-ignore
     ,
     showTotal: (total, range) => `${range[0]}-${range[1]} / ${total} ${t ? t(pagination?.locale?.items ?? 'items') : 'items'}`
-  }, pagination)), bottomToolbar?.()));
+  }, pagination)), bottomToolbar?.());
 };
 var _default = exports.default = TableGrid;

package/lib/grid-component/hooks/content/HeaderContent.js

@@ -25,15 +25,14 @@ const HeaderContent = props => {
     headerTooltip,
     headerText,
     columnGroupText,
-    headerTemplate,
-    title
+    headerTemplate
   } = props.column ?? {};
   const text = _react.default.useMemo(() => {
-    return columnGroupText ?? headerText ?? title;
-  }, [columnGroupText, headerText, title]);
+    return columnGroupText ?? headerText;
+  }, [columnGroupText, headerText]);
   const tooltip = _react.default.useMemo(() => {
-    return headerTooltip ?? columnGroupText ?? headerText ?? title;
-  }, [columnGroupText, headerText, headerTooltip, title]);
+    return headerTooltip ?? columnGroupText ?? headerText;
+  }, [columnGroupText, headerText, headerTooltip]);
   const [isOpen, setIsOpen] = (0, _react.useState)(false);
   const {
     refs,
@@ -73,7 +72,7 @@ const HeaderContent = props => {
     // style={{flex: 1}}
     ,
     className: (0, _classnames.default)('', {})
-  }), headerTemplate ? (0, _utils.getTemplate)(headerTemplate) : t ? t(text) : text), isOpen && (headerTooltip !== false || headerTemplate || headerTooltip || columnGroupText || headerText || title) && /*#__PURE__*/_react.default.createElement(_react2.FloatingPortal, {
+  }), headerTemplate ? (0, _utils.getTemplate)(headerTemplate) : text), isOpen && (headerTooltip !== false || headerTemplate || headerTooltip || columnGroupText || headerText) && /*#__PURE__*/_react.default.createElement(_react2.FloatingPortal, {
     root: document.body
   }, /*#__PURE__*/_react.default.createElement(TooltipStyle, (0, _extends2.default)({
     className: "Tooltip",

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

@@ -167,7 +167,9 @@ const useColumns = config => {
           // title: t ? t(col.columnGroupText ?? col.headerText ?? col.title) : col.columnGroupText ?? col.headerText ?? col.title,
           // title: () => (<span>aaa</span>),
           title: () => /*#__PURE__*/React.createElement(_HeaderContent.default, {
-            column: col,
+            column: {
+              ...col
+            },
             t: t
           }),
           // title: () => (<span>{t ? t(col.columnGroupText ?? col.headerText ?? col.title) : col.columnGroupText ?? col.headerText ?? col.title}</span>),
@@ -192,7 +194,13 @@ const useColumns = config => {
         }
         if (col.key === 'command') {
           return {
-            ...transformedColumn
+            ...transformedColumn,
+            onCell: () => ({
+              className: 'cell-number',
+              style: {
+                padding: '2px 8px'
+              }
+            })
           };
         }
         return {

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

@@ -5,7 +5,7 @@ import type { ColumnEditType, ColumnsType, ColumnTable, GetRowKey } from "../typ
 import type { SelectionSettings } from "../type";
 import type { AnyObject } from "../type";
 import type { Key } from "react";
-import type { ColumnsTable } from "../type";
+import type { ColumnsTable } from "./../index";
 export declare const newGuid: () => any;
 export declare const sumDataByField: (data: any[], field: string) => any;
 export declare const checkThousandSeparator: (thousandSeparator: string | undefined, decimalSeparator: string | undefined) => string;
@@ -55,26 +55,6 @@ export declare const getFirstSelectCell: (selectCells: any) => {
     col: number;
 };
 export declare const getRowsPasteIndex: (pasteRows: any) => number[];
-export declare const mmm: (string | number | boolean)[][];
-export declare function cloneRows(array: any[], numRows: number): any[];
-export declare function addRows1(arr: any[], n: number): any[];
-export declare function addRows2(arr: any[], n: number): {
-    newArr: any[];
-    addedRows: any[];
-};
-export declare function addRows(arr: any[], n: number): {
-    newArr: any[];
-    addedRows: any[];
-};
-export declare function addRows4(arr: any[], n: number): {
-    newArr: any[];
-    addedRows: any[];
-};
-export declare function addRows6(arr: any, n: number): {
-    newArr: any[];
-    addedRows: any[];
-};
-export declare function addRows7(arr: any, n: number): any;
 export declare function addRows8(arr: any, n: number): {
     combined: any;
     addedRows: any[];
@@ -84,5 +64,5 @@ export declare function addRows8(arr: any, n: number): {
 };
 export declare const transformColumns: <RecordType>(cols: ColumnsTable<RecordType>, convertColumns: any[], t?: any) => ColumnsTable<RecordType>;
 export declare const transformColumns1: <RecordType>(cols: ColumnsTable<RecordType>, sortMultiple?: boolean) => ColumnsTable<RecordType>;
-export declare const removeColumns: <RecordType>(columns: ColumnsTable, groupColumns: string[]) => ColumnsTable<RecordType>;
+export declare const removeColumns: <RecordType>(columns: ColumnsTable<RecordType>, groupColumns: string[]) => ColumnsTable<RecordType>;
 export declare const convertFlatColumn: (array: ColumnsTable) => ColumnsTable[];

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

@@ -5,20 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.addRowIdArray = void 0;
-exports.addRows = addRows;
-exports.addRows1 = addRows1;
-exports.addRows2 = addRows2;
-exports.addRows4 = addRows4;
-exports.addRows6 = addRows6;
-exports.addRows7 = addRows7;
 exports.addRows8 = addRows8;
-exports.checkThousandSeparator = exports.checkFieldKey = exports.checkDecimalSeparator = void 0;
-exports.cloneRows = cloneRows;
-exports.customWeekStartEndFormat = exports.countItemsBeforeIndex = exports.convertLabelToTitle = exports.convertFlatColumn = exports.convertDayjsToDate = exports.convertDateToDayjs = exports.convertArrayWithIndent = void 0;
+exports.customWeekStartEndFormat = exports.countItemsBeforeIndex = exports.convertLabelToTitle = exports.convertFlatColumn = exports.convertDayjsToDate = exports.convertDateToDayjs = exports.convertArrayWithIndent = exports.checkThousandSeparator = exports.checkFieldKey = exports.checkDecimalSeparator = void 0;
 exports.findAllChildrenKeys = findAllChildrenKeys;
 exports.getFirstSelectCell = exports.getEditType = exports.getDefaultValue = exports.getDatepickerFormat = exports.getDateString = exports.getColumnsVisible = exports.getAllVisibleKeys = exports.genPresets = exports.flattenData = exports.flattenArray = exports.findItemByKey = void 0;
 exports.getHiddenParentKeys = getHiddenParentKeys;
-exports.updateData = exports.updateColumnsByGroup = exports.updateColumns = exports.updateArrayByKey = exports.transformColumns1 = exports.transformColumns = exports.totalFixedWidth = exports.sumDataByField = exports.removeColumns = exports.parseBooleanToValue = exports.newGuid = exports.mmm = exports.isObjEmpty = exports.isNullOrUndefined = exports.isNameColor = exports.isEmpty = exports.isDisable = exports.isColor = exports.getVisibleColumnKeys = exports.getTypeFilter = exports.getTemplate = exports.getRowsPasteIndex = exports.getRowNumber = exports.getLastSelectCell = void 0;
+exports.updateData = exports.updateColumnsByGroup = exports.updateColumns = exports.updateArrayByKey = exports.transformColumns1 = exports.transformColumns = exports.totalFixedWidth = exports.sumDataByField = exports.removeColumns = exports.parseBooleanToValue = exports.newGuid = exports.isObjEmpty = exports.isNullOrUndefined = exports.isNameColor = exports.isEmpty = exports.isDisable = exports.isColor = exports.getVisibleColumnKeys = exports.getTypeFilter = exports.getTemplate = exports.getRowsPasteIndex = exports.getRowNumber = exports.getLastSelectCell = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _moment = _interopRequireDefault(require("moment/moment"));
 var _uuid = require("uuid");
@@ -554,401 +546,7 @@ const getRowsPasteIndex = pasteRows => {
   const result = Array.from(pasteRows).map(item => parseInt(item.split("-")[0]));
   return [...new Set(result)];
 };
-
-// export const fff = [
-//   [1,'1998-11-03T18:20:45+07:00', "Fadel Groves", "C", true],
-// ]
-//
-// export const oooo = [
-//   [1,'1998-11-03T18:20:45+07:00', "Fadel Groves", "C", true],
-//   [1,'1998-11-04T18:20:45+07:00', "Fadel Groves", "C", true],
-//   [1,'1998-11-05T18:20:45+07:00', "Fadel Groves", "C", true],
-//   [1,'1998-11-06T18:20:45+07:00', "Fadel Groves", "C", true],
-// ]
-//
-// export const iii = [
-//   [1,'1998-11-03T18:20:45+07:00', "Fadel Groves", "C", true],
-//   [2,'1998-11-07T18:20:45+07:00', "Fahey Roads", "C", true],
-//   [3,'1998-11-19T18:20:45+07:00', "tess", "C", true],
-// ]
-//
-// export const jjj = [
-//   [1,'1998-11-03T18:20:45+07:00', "Fadel Groves", "C", true],
-//   [2,'1998-11-07T18:20:45+07:00', "Fahey Roads", "C", true],
-//   [3,'1998-11-19T18:20:45+07:00', "tess", "C", true],
-//
-//   [4,'1998-11-03T18:20:45+07:00', "Fadel Groves", "C", true],
-//   [5,'1998-11-07T18:20:45+07:00', "Fahey Roads", "C", true],
-//   [6,'1998-11-19T18:20:45+07:00', "tess", "C", true],
-// ]
-//
-//
 exports.getRowsPasteIndex = getRowsPasteIndex;
-const mmm = exports.mmm = [[1, '1998-11-03T18:20:45+07:00', "Fadel Groves", "C", true], [3, '1998-11-04T18:20:45+07:00', "Fahey Roads", "C", true], [5, '1998-11-05T18:20:45+07:00', "tess", "C", true]];
-//
-// export const nnn = [
-//   [1,'1998-11-03T18:20:45+07:00', "Fadel Groves", "C", true],
-//   [2,'1998-11-04T18:20:45+07:00', "Fahey Roads", "C", true],
-//   [3,'1998-11-05T18:20:45+07:00', "tess", "C", true],
-//
-//   [4,'1998-11-06T18:20:45+07:00', "Fadel Groves", "C", true],
-//   [5,'1998-11-07T18:20:45+07:00', "Fahey Roads", "C", true],
-//   [6,'1998-11-08T18:20:45+07:00', "tess", "C", true],
-// ]
-
-function cloneRows(array, numRows) {
-  const result = [...array]; // Sao chép mảng ban đầu
-
-  for (let i = 0; i < numRows; i++) {
-    const lastId = result[result.length - 1][0]; // Lấy ID cuối cùng hiện có
-
-    for (let j = 0; j < array.length - 1; j++) {
-      // Nhân bản trừ dòng cuối
-      const newRow = [lastId + j + 1, array[j][1]]; // Tăng ID và giữ nguyên giá trị cột 2
-      result.push(newRow);
-    }
-  }
-  return result;
-}
-function addRows1(arr, n) {
-  // const newArr = [...arr]; // Sao chép mảng gốc để không sửa đổi trực tiếp
-  // const baseIndex = arr[arr.length - 1][0]; // Lấy chỉ mục cuối cùng
-  //
-  // for (let i = 0; i < n; i++) {
-  //   const newIndex = baseIndex + 1 + i;
-  //   const newRow = [newIndex, ...arr[i % arr.length].slice(1)]; // Lặp lại các phần tử còn lại theo vòng tròn
-  //   newArr.push(newRow);
-  // }
-  //
-  // return newArr;
-
-  const newArr = [...arr]; // Sao chép mảng gốc để không sửa đổi trực tiếp
-
-  if (arr.length === 1) {
-    // Nếu chỉ có một phần tử, lặp lại phần tử đó n lần
-    for (let i = 0; i < n; i++) {
-      newArr.push([...arr[0]]);
-    }
-  } else {
-    const baseIndex = arr[arr.length - 1][0]; // Lấy chỉ mục cuối cùng
-
-    for (let i = 0; i < n; i++) {
-      const newIndex = baseIndex + 1 + i;
-      const newRow = [newIndex, ...arr[i % arr.length].slice(1)]; // Lặp lại các phần tử còn lại theo vòng tròn
-      newArr.push(newRow);
-    }
-  }
-  return newArr;
-}
-function addRows2(arr, n) {
-  const newArr = [...arr]; // Sao chép mảng gốc để không sửa đổi trực tiếp
-  const addedRows = [];
-  if (arr.length === 1) {
-    // Nếu chỉ có một phần tử, lặp lại phần tử đó n lần
-    for (let i = 0; i < n; i++) {
-      newArr.push([...arr[0]]);
-      addedRows.push([...arr[0]]);
-    }
-  } else {
-    const differences = [];
-    for (let i = 1; i < arr.length; i++) {
-      differences.push(arr[i][0] - arr[i - 1][0]);
-    }
-    const step = differences.reduce((a, b) => a + b, 0) / differences.length; // Tính khoảng cách trung bình
-
-    for (let i = 0; i < n; i++) {
-      const newIndex = newArr[newArr.length - 1][0] + step;
-      const newRow = [newIndex, ...arr[i % arr.length].slice(1)]; // Lặp lại nội dung theo vòng tròn
-      newArr.push(newRow);
-      addedRows.push(newRow);
-    }
-  }
-  return {
-    newArr,
-    addedRows
-  };
-}
-function addRows(arr, n) {
-  const newArr = [...arr]; // Sao chép mảng gốc để không sửa đổi trực tiếp
-  const addedRows = [];
-  if (arr.length === 1) {
-    for (let i = 0; i < n; i++) {
-      newArr.push([...arr[0]]);
-      addedRows.push([...arr[0]]);
-    }
-  } else {
-    const diffs = arr[0].map((_, colIndex) => {
-      if (typeof arr[0][colIndex] === 'number') {
-        return arr[1][colIndex] - arr[0][colIndex];
-      } else if (!isNaN(Date.parse(arr[0][colIndex]))) {
-        console.log('Date.parse(arr[0][colIndex])', Date.parse(arr[0][colIndex]));
-        console.log('arr[0][colIndex]', arr[0][colIndex]);
-        // @ts-ignore
-        return new Date(arr[1][colIndex]) - new Date(arr[0][colIndex]);
-      }
-      return null;
-    });
-    console.log('diffs', diffs);
-    for (let i = 0; i < n; i++) {
-      const lastRow = [...newArr[newArr.length - 1]];
-      const newRow = lastRow.map((value, colIndex) => {
-        if (typeof value === 'number' && diffs[colIndex] !== null) {
-          return value + diffs[colIndex];
-        } else if (!isNaN(Date.parse(value)) && diffs[colIndex] !== null) {
-          const lastDate = new Date(value);
-          return (0, _moment.default)(new Date(lastDate.getTime() + diffs[colIndex])).format();
-        } else return arr[i % arr.length][colIndex]; // Lặp lại nội dung theo vòng tròn
-        // arr[i % arr.length].slice(1)
-        // return value;
-      });
-      newArr.push(newRow);
-      addedRows.push(newRow);
-    }
-  }
-  return {
-    newArr,
-    addedRows
-  };
-}
-function addRows4(arr, n) {
-  const newArr = [...arr]; // Sao chép mảng gốc để không sửa đổi trực tiếp
-  const addedRows = [];
-  if (arr.length === 1) {
-    for (let i = 0; i < n; i++) {
-      newArr.push([...arr[0]]);
-      addedRows.push([...arr[0]]);
-    }
-  } else {
-    const diffs = arr[0].map((_, colIndex) => {
-      if (typeof arr[0][colIndex] === 'number') {
-        return arr[1][colIndex] - arr[0][colIndex];
-      } else if (!isNaN(Date.parse(arr[0][colIndex]))) {
-        // @ts-ignore
-        return new Date(arr[1][colIndex]) - new Date(arr[0][colIndex]);
-      }
-      return null;
-    });
-    for (let i = 0; i < n; i++) {
-      const lastRow = [...newArr[newArr.length - 1]];
-      const newRow = lastRow.map((value, colIndex) => {
-        if (typeof value === 'number' && diffs[colIndex] !== null) {
-          return value + diffs[colIndex];
-        } else if (!isNaN(Date.parse(value)) && diffs[colIndex] !== null) {
-          const lastDate = new Date(value);
-          return new Date(lastDate.getTime() + diffs[colIndex]).toISOString();
-        } else if (typeof value === 'string') {
-          return arr[(i + 1) % arr.length][colIndex]; // Lặp lại nội dung theo vòng tròn
-        }
-        return value;
-      });
-      newArr.push(newRow);
-      addedRows.push(newRow);
-    }
-  }
-  return {
-    newArr,
-    addedRows
-  };
-}
-function addRows6(arr, n) {
-  // const newArr = [...arr]; // Sao chép mảng gốc để không sửa đổi trực tiếp
-  // const addedRows = [];
-  //
-  // if (arr.length === 1) {
-  //   for (let i = 0; i < n; i++) {
-  //     newArr.push([...arr[0]]);
-  //     addedRows.push([...arr[0]]);
-  //   }
-  // } else {
-  //   const diffs = arr[0].map((_: any, colIndex: number) => {
-  //     if (typeof arr[0][colIndex] === 'number') {
-  //       return arr[1][colIndex] - arr[0][colIndex];
-  //     } else if (!isNaN(Date.parse(arr[0][colIndex])) && arr.length === 2) {
-  //       // @ts-ignore
-  //       return new Date(arr[1][colIndex]) - new Date(arr[0][colIndex]);
-  //     }
-  //     return null;
-  //   });
-  //
-  //   for (let i = 0; i < n; i++) {
-  //     const lastRow = [...newArr[newArr.length - 1]];
-  //
-  //     const newRow = lastRow.map((value, colIndex) => {
-  //       if (typeof value === 'number' && diffs[colIndex] !== null) {
-  //         return value + diffs[colIndex];
-  //       } else if (!isNaN(Date.parse(value))) {
-  //         if (arr.length > 2) {
-  //           return arr[(i) % arr.length][colIndex]; // Lặp lại nội dung theo vòng tròn
-  //         } else if (diffs[colIndex] !== null) {
-  //           const lastDate = new Date(value);
-  //           return new Date(lastDate.getTime() + diffs[colIndex]).toISOString();
-  //         }
-  //       } else if (typeof value === 'string') {
-  //         return arr[(i) % arr.length][colIndex]; // Lặp lại nội dung theo vòng tròn
-  //       }
-  //       return value;
-  //     });
-  //
-  //     newArr.push(newRow);
-  //     addedRows.push(newRow);
-  //   }
-  // }
-  //
-  // return { newArr, addedRows };
-
-  const newArr = [...arr]; // Sao chép mảng gốc để không sửa đổi trực tiếp
-  const addedRows = [];
-  if (arr.length === 1) {
-    for (let i = 0; i < n; i++) {
-      newArr.push([...arr[0]]);
-      addedRows.push([...arr[0]]);
-    }
-  } else {
-    const diffs = arr[0].map((_, colIndex) => {
-      if (typeof arr[0][colIndex] === 'number') {
-        return arr[1][colIndex] - arr[0][colIndex];
-      } else if (!isNaN(Date.parse(arr[0][colIndex]))) {
-        // @ts-ignore
-        const dateDiffs = arr.slice(1).map((row, i) => new Date(row[colIndex]) - new Date(arr[i][colIndex]));
-        const avgDiff = dateDiffs.reduce((a, b) => a + b, 0) / dateDiffs.length;
-        return avgDiff || null;
-      }
-      return null;
-    });
-    for (let i = 0; i < n; i++) {
-      const lastRow = [...newArr[newArr.length - 1]];
-      const newRow = lastRow.map((value, colIndex) => {
-        if (typeof value === 'number' && diffs[colIndex] !== null) {
-          return value + diffs[colIndex];
-        } else if (!isNaN(Date.parse(value)) && diffs[colIndex] !== null) {
-          const lastDate = new Date(value);
-          return new Date(lastDate.getTime() + diffs[colIndex]).toISOString();
-        } else {
-          return arr[i % arr.length][colIndex]; // Lặp lại nội dung theo vòng tròn
-        }
-      });
-      newArr.push(newRow);
-      addedRows.push(newRow);
-    }
-  }
-  return {
-    newArr,
-    addedRows
-  };
-}
-function addRows7(arr, n) {
-  if (!Array.isArray(arr) || arr.length === 0) return arr;
-  const m = arr.length;
-  const numCols = arr[0].length;
-  const newRows = [];
-
-  // Hàm kiểm tra kiểu date hợp lệ
-  const isValidDate = d => {
-    return !isNaN(Date.parse(d));
-  };
-
-  // Lấy giá trị mẫu của cột j từ hàng i (i thuộc [0, m-1])
-  const getSample = j => arr[0][j];
-
-  // Xác định cho mỗi cột chế độ xử lý:
-  // mode = 'number-stepping' | 'date-stepping' | 'cycle'
-  const modes = [];
-  const steps = []; // bước tăng, nếu có (cho number hoặc date)
-
-  for (let j = 0; j < numCols; j++) {
-    const sample = getSample(j);
-    if (m === 1) {
-      // Nếu mảng chỉ có 1 hàng: nếu là số thì giữ nguyên; nếu là date thì tăng 1 ngày; còn lại giữ nguyên.
-      if (typeof sample === "number") {
-        modes[j] = "number-constant";
-      } else if (isValidDate(sample)) {
-        modes[j] = "date-stepping";
-        steps[j] = 24 * 3600 * 1000; // 1 ngày = 86400000 ms
-      } else {
-        modes[j] = "cycle";
-      }
-    } else if (m === 2) {
-      // Nếu mảng có 2 hàng: nếu là số thì tính bước = row2 - row1, tương tự với date
-      const first = arr[0][j],
-        second = arr[1][j];
-      if (typeof first === "number" && typeof second === "number") {
-        modes[j] = "number-stepping";
-        steps[j] = second - first;
-      } else if (isValidDate(first) && isValidDate(second)) {
-        modes[j] = "date-stepping";
-        steps[j] = Date.parse(second) - Date.parse(first);
-      } else {
-        modes[j] = "cycle";
-      }
-    } else {
-      // mảng có >2 hàng
-      const first = arr[0][j],
-        second = arr[1][j],
-        third = arr[2][j];
-      if (typeof first === "number" && typeof second === "number" && typeof third === "number") {
-        const step1 = second - first;
-        const step2 = third - second;
-        if (step1 === step2) {
-          modes[j] = "number-stepping";
-          steps[j] = step1;
-        } else {
-          modes[j] = "cycle";
-        }
-      } else if (isValidDate(first) && isValidDate(second) && isValidDate(third)) {
-        const step1 = Date.parse(second) - Date.parse(first);
-        const step2 = Date.parse(third) - Date.parse(second);
-        if (step1 === step2) {
-          modes[j] = "date-stepping";
-          steps[j] = step1;
-        } else {
-          modes[j] = "cycle";
-        }
-      } else {
-        modes[j] = "cycle";
-      }
-    }
-  }
-
-  // Tạo các dòng mới (thêm n dòng)
-  // Với mỗi cột, nếu chế độ là stepping thì lấy giá trị cuối của mảng ban đầu, cộng thêm (i+1)*step
-  // Nếu chế độ là cycle thì dùng arr[i mod m][j]
-  for (let i = 0; i < n; i++) {
-    const newRow = [];
-    for (let j = 0; j < numCols; j++) {
-      let newValue;
-      switch (modes[j]) {
-        case "number-constant":
-          // mảng có 1 hàng, số giữ nguyên
-          newValue = arr[0][j];
-          break;
-        case "number-stepping":
-          {
-            // lấy giá trị cuối của cột j trong mảng ban đầu
-            const lastValue = arr[m - 1][j];
-            newValue = lastValue + (i + 1) * steps[j];
-          }
-          break;
-        case "date-stepping":
-          {
-            // lấy giá trị cuối, chuyển về date, cộng thêm (i+1)*step, convert về ISO string giữ định dạng ban đầu (nếu cần giữ định dạng như cũ)
-            const lastDate = new Date(arr[m - 1][j]);
-            const newTime = lastDate.getTime() + (i + 1) * steps[j];
-            // Giữ định dạng ISO với timezone tương tự nếu cần.
-            newValue = new Date(newTime).toISOString();
-          }
-          break;
-        case "cycle":
-        default:
-          // Lặp lại nội dung theo vòng tròn: dùng hàng thứ (i mod m)
-          newValue = arr[i % m][j];
-          break;
-      }
-      newRow.push(newValue);
-    }
-    newRows.push(newRow);
-  }
-  return arr.concat(newRows);
-}
 function addRows8(arr, n) {
   if (!Array.isArray(arr) || arr.length === 0) return {
     combined: arr,
@@ -1086,7 +684,7 @@ const transformColumns = (cols, convertColumns, t) => {
       return {
         ...column,
         key: column.field ?? column.dataIndex ?? column.key,
-        title: t ? t(column.headerText ?? column.title) : column.headerText ?? column.title,
+        title: t ? t(column.headerText) : column.headerText,
         ellipsis: column.ellipsis !== false,
         align: column.textAlign ?? column.align,
         children: transformColumns(column.children, convertColumns)
@@ -1147,8 +745,6 @@ const transformColumns1 = (cols, sortMultiple) => {
 exports.transformColumns1 = transformColumns1;
 const removeColumns = (columns, groupColumns) => {
   const ttt = [...columns];
-
-  // @ts-ignore
   return ttt.filter(column => !groupColumns.includes(column.field)).map(column => {
     const newCol = {
       ...column
@@ -1172,16 +768,4 @@ const convertFlatColumn = array => {
   });
   return result;
 };
-
-// export const getColumnsByKeys = (columns: ColumnsTable, keys: string[]) => {
-//   if (!columns || !keys) {
-//     return[]
-//   }
-//
-//   return flatColumns2(columns).filter((column) => keys.includes(column.field as string)).map((it) => {
-//     return {...it, value: it.field, label: it.headerText}
-//   })
-//
-//
-// }
 exports.convertFlatColumn = convertFlatColumn;