es-grid-template 1.1.8 → 1.2.1

package/lib/grid-component/InternalTable.js

@@ -6,28 +6,26 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireWildcard(require("react"));
-var _rcMasterUi = require("rc-master-ui");
-var _antd = require("antd");
-var _icons = require("@ant-design/icons");
+var _react = _interopRequireDefault(require("react"));
 var _reactResizable = require("react-resizable");
 var _customParseFormat = _interopRequireDefault(require("dayjs/plugin/customParseFormat"));
 var _hooks = require("./hooks");
-var _becoxyIcons = require("becoxy-icons");
-var _useColumns = require("./hooks/useColumns");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 require("dayjs/locale/es");
 require("dayjs/locale/vi");
+var _GridEdit = _interopRequireDefault(require("./table/GridEdit"));
+var _Grid = _interopRequireDefault(require("./table/Grid"));
 var _en_US = _interopRequireDefault(require("rc-master-ui/es/date-picker/locale/en_US"));
 var _vi_VN = _interopRequireDefault(require("rc-master-ui/es/date-picker/locale/vi_VN"));
+var _useColumns = _interopRequireDefault(require("./hooks/useColumns"));
 require("./styles.scss");
-var _GridEdit = _interopRequireDefault(require("./table/GridEdit"));
-var _Grid = _interopRequireDefault(require("./table/Grid"));
-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 useMergedState from "rc-util/lib/hooks/useMergedState";
-
+var _columns = require("./hooks/columns");
+var _Group = _interopRequireDefault(require("./table/Group"));
 _dayjs.default.extend(_customParseFormat.default);
+
+// const ASCEND = 'ascend';
+// const DESCEND = 'descend';
+
 const ResizableTitle = props => {
   const {
     onResize,
@@ -59,6 +57,7 @@ const ResizableTitle = props => {
 const InternalTable = props => {
   const {
     t,
+    // columns,
     columns: propsColumns,
     lang,
     locale,
@@ -67,13 +66,24 @@ const InternalTable = props => {
     dataSourceFilter: propDataSourceFilter,
     onFilterClick,
     editAble,
-    rowKey,
+    rowKey: propRowKey,
     format,
     onDataChange,
     sortMultiple,
-    expandable,
+    // expandable,
+    // @ts-ignore
+    onCellPaste,
+    clickHeaderToSort = true,
+    components,
+    onChooseColumns,
+    groupAble,
+    groupSetting,
+    groupColumns,
     ...rest
   } = props;
+  const rowKey = _react.default.useMemo(() => {
+    return editAble ? 'rowId' : propRowKey ?? 'id';
+  }, [editAble, propRowKey]);
   const local = lang && lang === 'en' ? _en_US.default : _vi_VN.default;
   const buddhistLocale = {
     ...local,
@@ -81,157 +91,28 @@ const InternalTable = props => {
       ...local.lang
     }
   };
-
-  // const [mergedColumns, setMergedColumns] = useMergedState(
-  //   propsColumns,
-  //   {
-  //     value: propsColumns,
-  //   },
-  // );
-
-  const tableRef = (0, _react.useRef)(null);
-  const [data, setData] = (0, _react.useState)([]);
-  const [columns, setColumns] = (0, _react.useState)([]);
-  const [isManualUpdate, setIsManualUpdate] = (0, _react.useState)(false);
-  // 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] : []
-    setColumns(rs);
+  const mergerdData = _react.default.useMemo(() => {
+    return (0, _hooks.addRowIdArray)(dataSource);
+  }, [dataSource]);
+  const [columns, setColumns] = _react.default.useState([]);
+  const tableRef = _react.default.useRef(null);
+  _react.default.useEffect(() => {
+    setColumns(propsColumns);
   }, [propsColumns]);
-  (0, _react.useEffect)(() => {
-    if (!isManualUpdate) {
-      setData(dataSource || []);
-    }
-    setIsManualUpdate(false);
-  }, [dataSource, isManualUpdate]);
 
-  // const [columns, setColumns] = useMergedState(
-  //   propsColumns ? [Table.SELECTION_COLUMN, ...propsColumns] : [],
-  //   {
-  //     value: propsColumns ? [Table.SELECTION_COLUMN, ...propsColumns] : [],
-  //   },
-  // );
+  // const [data, setData] = useState<RecordType[]>([]);
 
-  // ============================ RowKey ============================
-  const getRowKey = _react.default.useMemo(() => {
-    if (typeof rowKey === 'function') {
-      return rowKey;
-    }
-    // @ts-ignore
-    return record => record?.[rowKey];
-  }, [rowKey]);
+  // const [isManualUpdate, setIsManualUpdate] = useState(false);
 
   // useEffect(() => {
-  //   const rrr = findAllChildrenKeys<any>(dataSource, getRowKey, 'children');
-  //   setExpandKeys(rrr as any)
-  // }, [dataSource, getRowKey])
+  //   if (!isManualUpdate) {
+  //     const mergedData = addRowIdArray(dataSource)
+  //
+  //     setData(mergedData || []);
+  //   }
+  //   setIsManualUpdate(false);
+  // }, [dataSource, isManualUpdate])
 
-  const handleSearch = (selectedKeys, confirm) => {
-    confirm();
-  };
-  const onFilterCallback = (key, filterDataCallback) => {
-    const find = dataSourceFilter.find(it => it.key === key);
-    if (find) {
-      const newData = (0, _hooks.updateArrayByKey)(dataSourceFilter, {
-        key,
-        data: filterDataCallback
-      }, 'key');
-      setDataSourceFilter(newData);
-    } else {
-      const newData = [...dataSourceFilter, {
-        key,
-        data: filterDataCallback
-      }];
-      setDataSourceFilter(newData);
-    }
-  };
-  const getColumnSearchProps = (0, _react.useCallback)(column => ({
-    filterDropdown: ({
-      setSelectedKeys,
-      selectedKeys,
-      confirm,
-      // 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,
-          minWidth: 275
-        },
-        onKeyDown: e => e.stopPropagation()
-      }, 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)(operatorOptions, t),
-        style: {
-          width: '100%',
-          marginBottom: 8
-        },
-        value: operatorKey,
-        onChange: val => {
-          setOperatorKey(val);
-        }
-      })), /*#__PURE__*/_react.default.createElement("div", {
-        style: {
-          marginBottom: 8
-        }
-      }, (0, _useColumns.renderFilter)(column, selectedKeys, setSelectedKeys, confirm, visible, searchValue, setSearchValue, dataSourceFilter, buddhistLocale, locale, t)), /*#__PURE__*/_react.default.createElement(_antd.Space, {
-        style: {
-          justifyContent: 'end',
-          width: '100%'
-        }
-      }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
-        type: "primary",
-        onClick: () => {
-          confirm({
-            closeDropdown: false
-          });
-          handleSearch(selectedKeys, confirm);
-        },
-        icon: /*#__PURE__*/_react.default.createElement(_icons.SearchOutlined, null),
-        size: "small",
-        style: {
-          width: 90
-        }
-      }, t ? t('Filter') : 'Filter'), /*#__PURE__*/_react.default.createElement(_antd.Button, {
-        type: "link",
-        size: "small",
-        onClick: () => {
-          // setSearchValue('')
-          setSelectedKeys([]);
-          confirm();
-          // handleSearch()
-          // close()
-        }
-      }, t ? t("Clear") : 'Clear')));
-    },
-    filterIcon: filtered => /*#__PURE__*/_react.default.createElement(_becoxyIcons.FilterFill, {
-      fontSize: 12,
-      onClick: () => {
-        onFilterClick?.(column, onFilterCallback);
-      },
-      style: {
-        color: filtered ? '#283046' : undefined
-      }
-    }),
-    filterDropdownProps: {
-      onOpenChange(open) {
-        if (open) {
-          // setTimeout(() => searchInput.current?.select(), 100)
-        }
-      }
-    }
-  }), [buddhistLocale, dataSourceFilter, onFilterCallback, onFilterClick, t]);
   const handleResize = column => (e, {
     size
   }) => {
@@ -242,119 +123,136 @@ const InternalTable = props => {
     const newColumns = (0, _hooks.updateArrayByKey)(columns, newColumn, 'field');
     setColumns(newColumns);
   };
-  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
-    };
+  const [transformSelectionColumns] = (0, _useColumns.default)({
+    locale,
+    t,
+    buddhistLocale,
+    dataSourceFilter: propDataSourceFilter,
+    format,
+    sortMultiple,
+    groupAble,
+    groupSetting,
+    groupColumns,
+    handleResize
+  });
+  const mergedColumns = _react.default.useMemo(() => {
+    return transformSelectionColumns(columns);
+  }, [columns, transformSelectionColumns]);
 
-    // @ts-ignore
-    if (["index", "#"].includes(transformedColumn.dataIndex)) {
-      return {
-        ...transformedColumn,
-        onCell: () => ({
-          className: 'cell-number'
-        }),
-        render: (_, __, rowIndex) => rowIndex + 1
-      };
-    }
-    if (column.field === 'command') {
-      return {
-        ...transformedColumn,
-        onCell: () => ({
-          className: column.field === 'command' ? "ui-rc-cell-command" : ''
-        }),
-        onHeaderCell: () => ({
-          width: column.width,
-          onResize: handleResize(column)
-        })
-      };
+  // ============================ RowKey ============================
+  const getRowKey = _react.default.useMemo(() => {
+    if (typeof rowKey === 'function') {
+      return rowKey;
     }
-    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;
-      }
-      if (find) {
-        return {
-          ...find
-        };
-      }
+    return record => record?.[rowKey];
+  }, [rowKey]);
 
-      // Xử lý đệ quy cho children
-      if (column.children?.length) {
-        return {
-          ...column,
-          children: transformColumns(column.children)
-        };
-      }
-    });
-  }, [convertColumns]);
-  const mergedColumns = _react.default.useMemo(() => {
-    return transformColumns(columns);
-  }, [transformColumns, columns]);
+  // const triggerChangeColumns = (newColumns: ColumnsTable<RecordType>) => {
   const triggerChangeColumns = newColumns => {
     setColumns(newColumns);
+    onChooseColumns?.({
+      showColumns: [],
+      columns: [],
+      flattenColumns: []
+    });
+  };
+  const triggerGroupColumns = groupedColumns => {
+    setColumns((0, _hooks.updateColumnsByGroup)(mergedColumns, groupedColumns));
+    if (groupSetting) {
+      if (groupSetting.client === false) {
+
+        // setIsTree(true)
+
+        // setGroupOpen([])
+
+        // const dt = ungroupArray(dataSource)
+
+        // const rs = groupArrayByColumns2(dt, [...value])
+
+        // setResource([...rs])
+
+        // if (groupSetting.onGroup) {
+        //   groupSetting.onGroup({
+        //     columnGrouped: value,
+        //     columns: removeColumns(columns as any, value),
+        //     flattenColumns: convertFlatColumn(removeColumns(columns as any, value)) as any
+        //
+        //   })
+        // }
+      } else {
+        if (groupSetting.onGroup) {
+          groupSetting.onGroup({
+            columnGrouped: groupedColumns,
+            columns: (0, _hooks.removeColumns)(columns, groupedColumns),
+            flattenColumns: (0, _columns.flatColumns2)((0, _hooks.removeColumns)(columns, groupedColumns))
+          });
+        }
+      }
+    }
   };
   const triggerChangeData = newData => {
-    setIsManualUpdate(true);
-    setData(newData);
+    // setIsManualUpdate(true)
+    // setData(newData)
     // setMergedData(newData)
     onDataChange?.(newData);
   };
-  const TableComponent = editAble ? _GridEdit.default : _Grid.default;
+  const triggerPaste = (pastedRows, pastedColumnsArray, newData) => {
+    const handlePasteCallback = callbackData => {
+      const newDataUpdate = (0, _hooks.updateData)(dataSource, callbackData, rowKey);
+      triggerChangeData(newDataUpdate);
+      onCellPaste?.dataChange?.(newDataUpdate);
+    };
+    if (onCellPaste && onCellPaste.onPasted) {
+      if (onCellPaste.onPasted.length > 1) {
+        onCellPaste.onPasted({
+          pasteData: pastedRows,
+          type: 'onPaste',
+          data: dataSource,
+          pastedColumns: pastedColumnsArray
+        }, handlePasteCallback);
+      } else {
+        onCellPaste.onPasted({
+          pasteData: pastedRows,
+          type: 'onPaste',
+          data: dataSource,
+          pastedColumns: pastedColumnsArray
+        }, handlePasteCallback);
+        triggerChangeData(newData);
+        onCellPaste.dataChange?.(newData);
+      }
+    }
+  };
+  const TableComponent = groupAble ? _Group.default : editAble ? _GridEdit.default : _Grid.default;
   return /*#__PURE__*/_react.default.createElement(TableComponent, (0, _extends2.default)({}, rest, {
     t: t,
     locale: locale,
     tableRef: tableRef,
-    dataSource: data
-    // mergedData={mergedData}
+    dataSource: mergerdData
+    // components={components}
     ,
     components: {
       header: {
         cell: allowResizing ? ResizableTitle : undefined
       }
     },
-    format: format,
-    columns: mergedColumns
-    // defaultColumns={mergedColumns}
+    format: format
+    // columns={columns}
     ,
+    columns: mergedColumns,
     showSorterTooltip: {
       target: 'sorter-icon'
     },
     triggerChangeColumns: triggerChangeColumns,
     triggerChangeData: triggerChangeData,
+    triggerGroupColumns: triggerGroupColumns,
     rowKey: rowKey,
-    getRowKey: getRowKey
+    getRowKey: getRowKey,
+    triggerPaste: triggerPaste,
+    clickHeaderToSort: clickHeaderToSort,
+    groupSetting: groupSetting,
+    groupAble: groupAble,
+    groupColumns: groupColumns
   }));
 };
 var _default = exports.default = InternalTable;

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

@@ -1,11 +1,16 @@
 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;
+    triggerGroupColumns?: (groupedColumns: string[]) => void;
     tableRef: any;
+    bottomToolbar?: () => React.ReactElement;
+    getRowKey: GetRowKey<T>;
+    rowSelection?: any;
+    groupToolbar?: () => React.ReactNode;
 };
 declare const TableGrid: <RecordType extends object>(props: GridProps<RecordType>) => React.JSX.Element;
 export default TableGrid;

package/lib/grid-component/TableGrid.js

@@ -16,7 +16,7 @@ var _ContextMenu = _interopRequireDefault(require("./ContextMenu"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _hooks = require("./hooks");
 var _antd = require("antd");
-var _useColumns = require("./hooks/useColumns");
+var _columns = require("./hooks/columns");
 var _pagination = _interopRequireDefault(require("rc-master-ui/es/pagination"));
 var _LoadingSpinner = _interopRequireDefault(require("./LoadingSpinner"));
 var _ColumnsChoose = require("./ColumnsChoose");
@@ -98,7 +98,6 @@ const TableGrid = props => {
     locale,
     expandable,
     rowHoverable,
-    // mergedData,
     title,
     format,
     virtual = true,
@@ -123,9 +122,16 @@ const TableGrid = props => {
     dataSourceFilter: propDataSourceFilter,
     loading,
     triggerChangeColumns,
+    triggerGroupColumns,
     summary,
     showToolbar,
     onSorter,
+    bottomToolbar,
+    groupSetting,
+    groupAble,
+    getRowKey,
+    groupColumns,
+    groupToolbar,
     ...rest
   } = props;
   const {
@@ -140,16 +146,10 @@ const TableGrid = props => {
     selectedRowKeys,
     defaultSelectedRowKeys
   } = selectionSettings || {};
-  const clickRef = (0, _react.useRef)(null);
-  const menuRef = (0, _react.useRef)(null);
+  const clickRef = _react.default.useRef(null);
+  const menuRef = _react.default.useRef(null);
   const viewportWidth = window.innerWidth;
   const viewportHeight = window.innerHeight;
-
-  // const defaultSelected = useMemo(() => {
-  //   return defaultSelectedRowKeys ?? []
-  //
-  // }, [defaultSelectedRowKeys])
-
   const [menuVisible, setMenuVisible] = _react.default.useState(false);
   const [selectedRowData, setSelectedRowData] = _react.default.useState(null);
   const [position, setPosition] = _react.default.useState({
@@ -187,7 +187,7 @@ const TableGrid = props => {
     }
     return propContextMenuItems;
   }, [propContextMenuItems, contextMenuHidden, selectedRowData]);
-  (0, _react.useLayoutEffect)(() => {
+  _react.default.useLayoutEffect(() => {
     setMenuVisible(false);
   }, []);
   const onContextMenu = data => event => {
@@ -326,7 +326,7 @@ const TableGrid = props => {
       spinning: columns && columns.length === 0 || loading === true,
       indicator: /*#__PURE__*/_react.default.createElement(_LoadingSpinner.default, null)
     },
-    dataSource: dataSource
+    dataSource: columns && columns.length > 0 && loading !== true ? dataSource : []
     // className={styles.customTable}
     ,
     className: (0, _classnames.default)(className, {
@@ -344,12 +344,11 @@ const TableGrid = props => {
     onRow: (data, index) => {
       return {
         onDoubleClick: handleRowDoubleClick(data, index),
-        // onClick: handleRowClick,
         onClick: handleRowClick(),
         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,
@@ -375,7 +374,7 @@ const TableGrid = props => {
       }
       return /*#__PURE__*/_react.default.createElement(_rcMasterUi.Table.Summary, {
         fixed: true
-      }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Table.Summary.Row, null, (0, _useColumns.flatColumns)(columns).filter(col => col.hidden !== true).map((col, index) => {
+      }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.Table.Summary.Row, null, (0, _columns.flatColumns)([_rcMasterUi.Table.SELECTION_COLUMN, ...columns]).filter(col => col.hidden !== true).map((col, index) => {
         const thousandSeparator = col.format?.thousandSeparator ? col.format?.thousandSeparator : format?.thousandSeparator;
         const decimalSeparator = col.format?.decimalSeparator ? col.format?.decimalSeparator : format?.decimalSeparator;
         const dec = col.format?.decimalScale || col.format?.decimalScale === 0 ? col.format?.decimalScale : format?.decimalScale;
@@ -399,7 +398,7 @@ const TableGrid = props => {
         }, col.summaryTemplate ? col.summaryTemplate(cellValue, col.key) : (0, _reactNumericComponent.numericFormatter)(cellValue, numericFormatProps));
       })));
     },
-    pagination: pagination && pagination.onChange ? false : {
+    pagination: !pagination || pagination && pagination.onChange ? false : {
       showTotal: (total, range) => `${range[0]}-${range[1]} / ${total} items`,
       ...pagination
     },
@@ -414,13 +413,13 @@ const TableGrid = props => {
           justifyContent: 'space-between',
           alignItems: 'center'
         }
-      }, toolbarItems && toolbarItems?.length > 0 && /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar
+      }, groupAble && groupToolbar?.(), toolbarItems && toolbarItems?.length > 0 && /*#__PURE__*/_react.default.createElement(_rcMasterUi.Toolbar
       // @ts-ignore
       , {
         style: {
-          width: `calc(100% - 650px`
+          width: pagination && pagination.onChange && pagination?.position && pagination?.position[0] === 'topRight' ? `calc(100% - 650px - ${groupAble ? 50 : 0}px` : `calc(100% - 25px - ${groupAble ? 50 : 0}px`
         },
-        items: toolbarItems ?? [],
+        items: (toolbarItems ?? []).filter(it => it.position !== 'Bottom'),
         mode: 'scroll'
       }), /*#__PURE__*/_react.default.createElement("div", {
         style: {
@@ -439,48 +438,23 @@ const TableGrid = props => {
       }, pagination)), showColumnChoose && /*#__PURE__*/_react.default.createElement(_ColumnsChoose.ColumnsChoose, {
         columns: columns,
         t: t,
+        columnsGroup: groupColumns,
         triggerChangeColumns: triggerChangeColumns
       }))));
     },
     expandable: {
-      expandIconColumnIndex: 3,
-      defaultExpandAllRows: true,
-      indentSize: 25,
-      ...expandable,
-      expandIcon: args => {
-        const {
-          record,
-          expanded,
-          onExpand
-        } = args;
-
-        // @ts-ignore
-        if (record?.children?.length > 0 || record?.isChildren) {
-          return expanded ? /*#__PURE__*/_react.default.createElement("button", {
-            onClick: e => {
-              e.preventDefault();
-              e.stopPropagation();
-              onExpand(record, e);
-            },
-            className: 'ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-expanded'
-          }) : /*#__PURE__*/_react.default.createElement("button", {
-            onClick: e => {
-              e.preventDefault();
-              e.stopPropagation();
-              onExpand(record, e);
-            },
-            className: 'ui-rc-table-row-expand-icon ui-rc-table-row-expand-icon-collapsed'
-          });
-        }
-      }
+      ...expandable
     }
-  })), pagination && pagination.onChange && !pagination.position && /*#__PURE__*/_react.default.createElement(_pagination.default
+  })), /*#__PURE__*/_react.default.createElement("div", null), 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',
-    showTotal: (total, range) => `${range[0]}-${range[1]} / ${total} items`
-  }, pagination))));
+    size: 'small'
+    // @ts-ignore
+    ,
+    showTotal: (total, range) => `${range[0]}-${range[1]} / ${total} ${t ? t(pagination?.locale?.items ?? 'items') : 'items'}`
+  }, pagination)), bottomToolbar?.()));
 };
 var _default = exports.default = TableGrid;

package/lib/grid-component/hooks/{useColumns → columns}/index.d.ts

@@ -3,7 +3,7 @@ import React from "react";
 import type { TableLocale } from "rc-master-ui/lib/table/interface";
 import type { ColumnsTable } from "../../type";
 export declare function flatColumns<RecordType>(columns: ColumnsTable<RecordType>, parentKey?: string): ColumnsTable<RecordType>;
-export declare function flatColumns2<RecordType>(columns: ColumnsTable<RecordType>, parentKey?: string): ColumnsTable<RecordType>;
+export declare function flatColumns2<RecordType>(columns: ColumnsTable<RecordType>): 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 renderContent: (column: any, value: any, record: any, 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;