es-grid-template 1.1.7 → 1.2.0

package/lib/grid-component/InternalTable.js

@@ -89,8 +89,6 @@ const InternalTable = props => {
   //   },
   // );
 
-  // console.log('mergedColumns', mergedColumns)
-
   const tableRef = (0, _react.useRef)(null);
   const [data, setData] = (0, _react.useState)([]);
   const [columns, setColumns] = (0, _react.useState)([]);
@@ -98,7 +96,7 @@ const InternalTable = props => {
   // const [expandKeys, setExpandKeys] = useState<string[]>([]);
   const [dataSourceFilter, setDataSourceFilter] = (0, _react.useState)(propDataSourceFilter ?? []);
   (0, _react.useEffect)(() => {
-    const rs = propsColumns ? [_rcMasterUi.Table.SELECTION_COLUMN, ...propsColumns] : [];
+    const rs = propsColumns && propsColumns.length > 0 ? [_rcMasterUi.Table.SELECTION_COLUMN, ...propsColumns] : [];
     // const  rs = propsColumns ? [...propsColumns] : []
     setColumns(rs);
   }, [propsColumns]);
@@ -154,13 +152,17 @@ const InternalTable = props => {
       setSelectedKeys,
       selectedKeys,
       confirm,
-      close,
+      // close,
       setOperatorKey,
       operatorKey,
       visible,
       searchValue,
       setSearchValue
     }) => {
+      const type = (0, _hooks.getTypeFilter)(column);
+      // const operatorOptions  = !type || type === 'Text' ? stringOperator : numberOperator
+      // const operatorOptions  = type === 'Checkbox' || type === 'Dropdown' || type === 'DropTree' || ty
+      const operatorOptions = type === ('Checkbox' || 'Dropdown' || 'DropTree' || 'CheckboxDropdown') ? _hooks.booleanOperator : !type || type === 'Text' ? _hooks.stringOperator : _hooks.numberOperator;
       return /*#__PURE__*/_react.default.createElement("div", {
         style: {
           padding: 8,
@@ -170,7 +172,7 @@ const InternalTable = props => {
       }, column?.showOperator !== false && column?.typeFilter !== 'DateRange' && column?.typeFilter !== 'NumberRange' && /*#__PURE__*/_react.default.createElement("div", {
         className: 'mb-1'
       }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Select, {
-        options: (0, _hooks.translateOption)(_hooks.numberOperator, t),
+        options: (0, _hooks.translateOption)(operatorOptions, t),
         style: {
           width: '100%',
           marginBottom: 8
@@ -201,13 +203,17 @@ const InternalTable = props => {
         style: {
           width: 90
         }
-      }, "Filter"), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/_react.default.createElement(_antd.Button, {
         type: "link",
         size: "small",
         onClick: () => {
-          close();
+          // setSearchValue('')
+          setSelectedKeys([]);
+          confirm();
+          // handleSearch()
+          // close()
         }
-      }, "close")));
+      }, t ? t("Clear") : 'Clear')));
     },
     filterIcon: filtered => /*#__PURE__*/_react.default.createElement(_becoxyIcons.FilterFill, {
       fontSize: 12,
@@ -226,117 +232,100 @@ const InternalTable = props => {
       }
     }
   }), [buddhistLocale, dataSourceFilter, onFilterCallback, onFilterClick, t]);
-  const handleResize = indexPath => (e, {
+  const handleResize = column => (e, {
     size
   }) => {
-    const updateColumns = (cols, path) => {
-      const [currentIndex, ...restPath] = path;
-      return cols.map((col, idx) => {
-        if (idx === currentIndex) {
-          if (restPath.length === 0) {
-            // Cập nhật width của cột cuối cùng trong path
-            // return { ...col, width: size.width }
-
-            // Kiểm tra minWidth trước khi cập nhật width
-            if (col.minWidth && size.width < col.minWidth) {
-              e.preventDefault();
-              return col; // Không cập nhật nếu nhỏ hơn minWidth
-            }
-
-            // Kiểm tra minWidth trước khi cập nhật width
-            if (col.maxWidth && size.width > col.maxWidth) {
-              e.preventDefault();
-              return col; // Không cập nhật nếu nhỏ hơn minWidth
-            }
-            return {
-              ...col,
-              width: size.width
-            };
-          } else if (col.children) {
-            // Tiếp tục cập nhật các cấp con
-            return {
-              ...col,
-              children: updateColumns(col.children, restPath)
-            };
-          }
-        }
-        // e.preventDefault()
-        return col;
-      });
+    const newColumn = {
+      ...column,
+      width: size.width
     };
-    setColumns(prevColumns => updateColumns(prevColumns, indexPath));
+    const newColumns = (0, _hooks.updateArrayByKey)(columns, newColumn, 'field');
+    setColumns(newColumns);
   };
-  const transformColumns = _react.default.useCallback((cols, parentPath = []) => {
-    return cols.map((col, index) => {
-      const currentPath = [...parentPath, index];
-      // @ts-ignore
-      if (!col?.dataIndex && !col.key && !col.field) {
-        return col;
-      }
-      const transformedColumn = {
-        ...col,
-        dataIndex: col.field ?? col.dataIndex,
-        key: col.field ?? col.dataIndex ?? col.key,
-        title: t ? t(col.headerText ?? col.title) : col.headerText ?? col.title,
-        ellipsis: col.ellipsis !== false,
-        align: col.textAlign ?? col.align,
-        fixed: col.frozen ? col.frozen.toLowerCase() : col.fixed
+  const convertColumns = (0, _useColumns.flatColumns2)(columns).map((column, colIndex) => {
+    if (!column?.dataIndex && !column.key && !column.field) {
+      return column;
+    }
+    const transformedColumn = {
+      ...column,
+      dataIndex: column.field ?? column.dataIndex,
+      key: column.field ?? column.dataIndex ?? column.key,
+      title: t ? t(column.headerText ?? column.title) : column.headerText ?? column.title,
+      ellipsis: column.ellipsis !== false,
+      align: column.textAlign ?? column.align,
+      fixed: column.frozen ? column.frozen.toLowerCase() : column.fixed
+    };
+
+    // @ts-ignore
+    if (["index", "#"].includes(transformedColumn.dataIndex)) {
+      return {
+        ...transformedColumn,
+        onCell: () => ({
+          className: 'cell-number'
+        }),
+        render: (_, __, rowIndex) => rowIndex + 1
       };
-      if (col.children) {
-        return {
-          ...transformedColumn,
-          children: transformColumns(col.children, currentPath)
-        };
+    }
+    if (column.field === 'command') {
+      return {
+        ...transformedColumn,
+        onCell: () => ({
+          className: column.field === 'command' ? "ui-rc-cell-command" : ''
+        }),
+        onHeaderCell: () => ({
+          width: column.width,
+          onResize: handleResize(column)
+        })
+      };
+    }
+    return {
+      ...(column.allowFiltering === false ? {} : {
+        ...getColumnSearchProps(column)
+      }),
+      ...transformedColumn,
+      onFilter: value => {
+        return value;
+      },
+      sorter: column.sorter === false ? undefined : {
+        compare: a => a,
+        multiple: sortMultiple ? colIndex : undefined
+      },
+      onHeaderCell: () => ({
+        width: column.width,
+        onResize: handleResize(column)
+      }),
+      render: (value, record, rowIndex) => (0, _useColumns.renderContent)(column, value, record, rowIndex, format)
+    };
+  });
+  const transformColumns = _react.default.useCallback(cols => {
+    // @ts-ignore
+    return cols.map(column => {
+      const find = convertColumns.find(it => it.key === column.field);
+      if (!column?.field && !column?.key) {
+        return column;
       }
-
-      // @ts-ignore
-      if (["index", "#"].includes(transformedColumn.dataIndex)) {
+      if (find) {
         return {
-          ...transformedColumn,
-          onCell: () => ({
-            className: 'cell-number'
-          }),
-          render: (_, __, rowIndex) => rowIndex + 1
+          ...find
         };
       }
-      if (col.field === 'command') {
+
+      // Xử lý đệ quy cho children
+      if (column.children?.length) {
         return {
-          ...transformedColumn,
-          onCell: () => ({
-            className: col.field === 'command' ? "ui-rc-cell-command" : ''
-          }),
-          onHeaderCell: () => ({
-            width: col.width,
-            onResize: handleResize(currentPath)
-          })
+          ...column,
+          key: column.field ?? column.dataIndex ?? column.key,
+          title: t ? t(column.headerText ?? column.title) : column.headerText ?? column.title,
+          ellipsis: column.ellipsis !== false,
+          align: column.textAlign ?? column.align,
+          children: transformColumns(column.children)
         };
       }
-      return {
-        ...(col.allowFiltering === false ? {} : {
-          ...getColumnSearchProps(col)
-        }),
-        ...transformedColumn,
-        onFilter: value => {
-          return value;
-        },
-        sorter: col.sorter === false ? undefined : {
-          compare: a => a,
-          multiple: sortMultiple ? index : undefined
-        },
-        onHeaderCell: () => ({
-          width: col.width,
-          onResize: handleResize(currentPath)
-        }),
-        render: (value, record, rowIndex) => (0, _useColumns.renderContent)(col, value, record, rowIndex, format)
-      };
     });
-  }, [getColumnSearchProps]);
+  }, [convertColumns]);
   const mergedColumns = _react.default.useMemo(() => {
     return transformColumns(columns);
   }, [transformColumns, columns]);
-
-  // console.log('mergedColumns', mergedColumns)
-
   const triggerChangeColumns = newColumns => {
     setColumns(newColumns);
   };

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

@@ -1,11 +1,13 @@
 import React from 'react';
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
-import type { ColumnsTable, GridTableProps } from "./type";
+import type { ColumnsTable, GetRowKey, GridTableProps } from "./type";
 type GridProps<T> = GridTableProps<T> & {
     triggerChangeColumns?: (columns: ColumnsTable<T>, type: string) => void;
-    triggerChangeData?: () => void;
+    triggerChangeData?: (newData: T[], type: string) => void;
     tableRef: any;
+    bottomToolbar?: () => React.ReactElement;
+    getRowKey?: GetRowKey<T>;
 };
 declare const TableGrid: <RecordType extends object>(props: GridProps<RecordType>) => React.JSX.Element;
 export default TableGrid;

package/lib/grid-component/TableGrid.js

@@ -97,6 +97,7 @@ const TableGrid = props => {
     dataSource,
     locale,
     expandable,
+    rowHoverable,
     // mergedData,
     title,
     format,
@@ -125,6 +126,7 @@ const TableGrid = props => {
     summary,
     showToolbar,
     onSorter,
+    bottomToolbar,
     ...rest
   } = props;
   const {
@@ -323,6 +325,7 @@ const TableGrid = props => {
     },
     loading: {
       spinning: columns && columns.length === 0 || loading === true,
+      // spinning: loading === true,
       indicator: /*#__PURE__*/_react.default.createElement(_LoadingSpinner.default, null)
     },
     dataSource: dataSource
@@ -335,7 +338,7 @@ const TableGrid = props => {
     virtual: virtual,
     columns: columns,
     rowKey: rowKey,
-    rowHoverable: true,
+    rowHoverable: rowHoverable,
     size: "small",
     scroll: scroll ? scroll : {
       y: 500
@@ -348,7 +351,7 @@ const TableGrid = props => {
         onContextMenu: onContextMenu(data)
       };
     },
-    rowSelection: {
+    rowSelection: columns && columns.length === 0 ? undefined : {
       ...selectionSettings,
       type: selectionSettings?.mode === 'checkbox' || type === 'multiple' ? 'checkbox' : "radio",
       columnWidth: !mode ? 0.0000001 : columnWidth ?? 50,
@@ -357,7 +360,9 @@ const TableGrid = props => {
       selectedRowKeys: mergedSelectedKeys,
       defaultSelectedRowKeys: selectionSettings?.defaultSelectedRowKeys,
       preserveSelectedRowKeys: true,
-      ...rowSelection,
+      // ...rowSelection,
+      // checkStrictly: false,
+
       hideSelectAll: !type || type === 'single' || selectionSettings?.mode === 'radio' ? true : hideSelectAll ?? type !== 'multiple'
     },
     onScroll: () => {
@@ -415,9 +420,9 @@ const TableGrid = props => {
       // @ts-ignore
       , {
         style: {
-          width: `calc(100% - 650px`
+          width: pagination && pagination.onChange && pagination?.position && pagination?.position[0] === 'topRight' ? `calc(100% - 650px` : `calc(100% - 25px`
         },
-        items: toolbarItems ?? [],
+        items: (toolbarItems ?? []).filter(it => it.position !== 'Bottom'),
         mode: 'scroll'
       }), /*#__PURE__*/_react.default.createElement("div", {
         style: {
@@ -452,7 +457,7 @@ const TableGrid = props => {
         } = args;
 
         // @ts-ignore
-        if (record?.children && record?.children?.length > 0 || record?.isChildren) {
+        if (record?.children?.length > 0 || record?.isChildren) {
           return expanded ? /*#__PURE__*/_react.default.createElement("button", {
             onClick: e => {
               e.preventDefault();
@@ -468,12 +473,17 @@ const TableGrid = props => {
             },
             className: 'ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-collapsed'
           });
+        } else {
+          return /*#__PURE__*/_react.default.createElement("button", {
+            className: 'ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-spaced'
+          });
         }
       }
     }
-  })), pagination && pagination.onChange && !pagination.position && /*#__PURE__*/_react.default.createElement(_pagination.default
+  })), bottomToolbar?.(), pagination && pagination.onChange && !pagination.position && /*#__PURE__*/_react.default.createElement(_pagination.default
   // style={{padding: '0.75rem 1rem'}}
   , (0, _extends2.default)({
+    rootClassName: 'pagination-template',
     showSizeChanger: true,
     responsive: true,
     size: 'small',

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

@@ -16,29 +16,29 @@ const numberOperator = exports.numberOperator = [{
   key: '>'
 }, {
   value: 'greaterthanorequal',
-  label: 'Greater Than or Equal',
+  label: 'Greater than or equal',
   key: '>='
 }, {
   value: 'lessthan',
-  label: 'Less Than',
+  label: 'Less than',
   key: '<'
 }, {
   value: 'lessthanorequal',
-  label: 'Less Than Or Equal',
+  label: 'Less than or equal',
   key: '<='
 }, {
   value: 'notequal',
-  label: 'Not Equal',
+  label: 'Not equal',
   key: '!='
 }];
 const stringOperator = exports.stringOperator = [{
   value: 'startswith',
   key: '_=',
-  label: 'Starts With'
+  label: 'Starts with'
 }, {
   value: 'endswith',
   key: '|=',
-  label: 'Ends With'
+  label: 'Ends with'
 }, {
   value: 'contains',
   key: '~=',
@@ -50,7 +50,7 @@ const stringOperator = exports.stringOperator = [{
 }, {
   value: 'notequal',
   key: '!=',
-  label: 'Not Equal'
+  label: 'Not equal'
 }];
 const dateOperator = exports.dateOperator = [{
   value: 'equal',
@@ -59,15 +59,15 @@ const dateOperator = exports.dateOperator = [{
 }, {
   value: 'notequal',
   key: '!=',
-  label: 'Not Equal'
+  label: 'Not equal'
 }, {
   value: 'greaterthan',
   key: '>',
-  label: 'Greater Than'
+  label: 'Greater than'
 }, {
   value: 'lessthan',
   key: '<',
-  label: 'Less Than'
+  label: 'Less than'
 }];
 const dateTimeOperator = exports.dateTimeOperator = [{
   value: 'equal',
@@ -76,15 +76,15 @@ const dateTimeOperator = exports.dateTimeOperator = [{
 }, {
   value: 'notequal',
   key: '!=',
-  label: 'Not Equal'
+  label: 'Not equal'
 }, {
   value: 'greaterthan',
   key: '>',
-  label: 'Greater Than'
+  label: 'Greater than'
 }, {
   value: 'lessthan',
   key: '<',
-  label: 'Less Than'
+  label: 'Less than'
 }];
 const booleanOperator = exports.booleanOperator = [{
   value: 'equal',
@@ -93,7 +93,7 @@ const booleanOperator = exports.booleanOperator = [{
 }, {
   value: 'notequal',
   key: '!=',
-  label: 'Not Equal'
+  label: 'Not equal'
 }];
 const translateOption = (options, t) => {
   if (!t) {

package/lib/grid-component/hooks/useColumns/index.d.ts

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

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.flatColumns = flatColumns;
+exports.flatColumns2 = flatColumns2;
 exports.renderFilter = exports.renderContent = exports.getValueCell = void 0;
 var _utils = require("../utils");
 var _reactNumericComponent = require("react-numeric-component");
@@ -13,11 +14,11 @@ var _moment = _interopRequireDefault(require("moment/moment"));
 var _react = _interopRequireWildcard(require("react"));
 var _rcMasterUi = require("rc-master-ui");
 var _CheckboxFilter = _interopRequireDefault(require("../../CheckboxFilter"));
+var _useSelection = require("rc-master-ui/es/table/hooks/useSelection");
 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 * as React from 'react'
 
-// import {ColorPicker} from "antd";
 const {
   RangePicker
 } = _rcMasterUi.DatePicker;
@@ -44,6 +45,34 @@ function flatColumns(columns, parentKey = 'key') {
     }];
   }, []);
 }
+function flatColumns2(columns, parentKey = 'key') {
+  // @ts-ignore
+  return columns.reduce((list, column, index) => {
+    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 === _useSelection.SELECTION_COLUMN) {
+      return [...list, {
+        ...column
+      }];
+    }
+    if (subColumns && subColumns.length > 0) {
+      return [...list, ...flatColumns(subColumns, mergedKey).map(subColum => ({
+        fixed: parsedFixed,
+        ...subColum
+      }))];
+    }
+    return [...list, {
+      key: mergedKey,
+      ...column,
+      fixed: parsedFixed
+    }];
+  }, []);
+}
 const getValueCell = (column, value, format) => {
   switch (column?.type) {
     case 'number':

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

@@ -4,7 +4,7 @@ import type { EditType, IColumnType, TypeFilter } from "rc-master-ui";
 import type { ColumnEditType, ColumnsType, ColumnTable, GetRowKey } from "../type";
 import type { SelectionSettings } from "../type";
 import type { AnyObject } from "../type";
-import { Key } from "react";
+import type { Key } from "react";
 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;
@@ -24,7 +24,7 @@ export declare const customWeekStartEndFormat: (value: any, weekFormat: string)
 export declare const getTypeFilter: (col: ColumnTable<any>) => TypeFilter;
 export declare const updateArrayByKey: (arr: any[], element: any, key: string) => any[];
 export declare const getDateString: <T>(column: ColumnTable<T>, value: any) => string;
-export declare const getEditType: <T>(column: ColumnEditType<T>, rowData?: any) => EditType | ((rowData?: any) => EditType);
+export declare const getEditType: <T>(column: ColumnEditType<T>, rowData?: any) => EditType;
 export declare const isDisable: <T>(column: ColumnEditType<T>, rowData?: any) => boolean;
 export declare const checkFieldKey: (key: string | undefined) => string;
 export declare const convertLabelToTitle: (data: any[]) => any[];
@@ -37,3 +37,7 @@ export declare const updateData: <Record_1 = AnyObject>(initData: Record_1[], ro
 export declare const parseBooleanToValue: (value: boolean, type: 'boolean' | 'number') => number | boolean;
 export declare const genPresets: (presets?: import("@ant-design/colors").PalettesProps) => import("antd/es/color-picker/interface").PresetsItem[];
 export declare function findAllChildrenKeys<RecordType>(data: readonly RecordType[], getRowKey: GetRowKey<RecordType>, childrenColumnName: string): Key[];
+export declare const flattenArray: <RecordType extends AnyObject = AnyObject>(arr: any[]) => RecordType[];
+export declare const flattenData: <RecordType extends AnyObject = AnyObject>(childrenColumnName: keyof RecordType, data?: RecordType[]) => RecordType[];
+export declare const countItemsBeforeIndex: (array: any[], index: number) => number;
+export declare const getRowNumber: (array: any[], rowKey: any, key: any) => number;

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

@@ -4,11 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.customWeekStartEndFormat = exports.convertLabelToTitle = exports.convertDayjsToDate = exports.convertDateToDayjs = exports.convertArrayWithIndent = exports.checkThousandSeparator = exports.checkFieldKey = exports.checkDecimalSeparator = void 0;
+exports.customWeekStartEndFormat = exports.countItemsBeforeIndex = exports.convertLabelToTitle = exports.convertDayjsToDate = exports.convertDateToDayjs = exports.convertArrayWithIndent = exports.checkThousandSeparator = exports.checkFieldKey = exports.checkDecimalSeparator = void 0;
 exports.findAllChildrenKeys = findAllChildrenKeys;
-exports.getEditType = exports.getDatepickerFormat = exports.getDateString = exports.getColumnsVisible = exports.getAllVisibleKeys = exports.genPresets = void 0;
+exports.getEditType = exports.getDatepickerFormat = exports.getDateString = exports.getColumnsVisible = exports.getAllVisibleKeys = exports.genPresets = exports.flattenData = exports.flattenArray = void 0;
 exports.getHiddenParentKeys = getHiddenParentKeys;
-exports.updateData = exports.updateColumns = exports.updateArrayByKey = exports.totalFixedWidth = exports.sumDataByField = exports.parseBooleanToValue = exports.newGuid = exports.isObjEmpty = exports.isNullOrUndefined = exports.isNameColor = exports.isEmpty = exports.isDisable = exports.isColor = exports.getVisibleColumnKeys = exports.getTypeFilter = exports.getTemplate = void 0;
+exports.updateData = exports.updateColumns = exports.updateArrayByKey = exports.totalFixedWidth = exports.sumDataByField = exports.parseBooleanToValue = exports.newGuid = exports.isObjEmpty = exports.isNullOrUndefined = exports.isNameColor = exports.isEmpty = exports.isDisable = exports.isColor = exports.getVisibleColumnKeys = exports.getTypeFilter = exports.getTemplate = exports.getRowNumber = void 0;
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _moment = _interopRequireDefault(require("moment/moment"));
 var _uuid = require("uuid");
@@ -251,7 +251,7 @@ const getEditType = (column, rowData) => {
   if (column && typeof column.editType === 'function') {
     return column.editType(rowData);
   }
-  return column.editType;
+  return column.editType ?? 'text';
 };
 exports.getEditType = getEditType;
 const isDisable = (column, rowData) => {
@@ -380,4 +380,50 @@ function findAllChildrenKeys(data, getRowKey, childrenColumnName) {
   }
   dig(data);
   return keys;
-}
+}
+const flattenArray = arr => {
+  if (!arr) {
+    return [];
+  }
+  return arr.reduce((r, {
+    children,
+    ...rest
+  }) => {
+    r.push(rest);
+    if (children) {
+      r.push(...flattenArray(children));
+    }
+    return r;
+  }, []);
+};
+exports.flattenArray = flattenArray;
+const flattenData = (childrenColumnName, data) => {
+  let list = [];
+  (data || []).forEach(record => {
+    list.push(record);
+    if (record && typeof record === 'object' && childrenColumnName in record) {
+      list = [...list, ...flattenData(childrenColumnName, record[childrenColumnName])];
+    }
+  });
+  return list;
+};
+exports.flattenData = flattenData;
+const countItemsBeforeIndex = (array, index) => {
+  let count = 0;
+  for (let i = 0; i < index; i++) {
+    if (array[i].children && array[i].children.length > 0) {
+      const rs = flattenData('children', [array[i]]);
+      count += rs.length;
+    } else {
+      count++;
+    }
+  }
+  return count;
+};
+exports.countItemsBeforeIndex = countItemsBeforeIndex;
+const getRowNumber = (array, rowKey, key) => {
+  // const flattArray = flattenArray(array)
+  const flattArray = flattenData('children', array);
+  return flattArray.findIndex(it => it[key] === rowKey);
+};
+exports.getRowNumber = getRowNumber;