es-grid-template 1.8.65 → 1.8.67

package/es/table-component/header/TableHeadCell.js

@@ -1,23 +1,14 @@
-// import { useSortable } from "@dnd-kit/sortable"
-
 import { flexRender } from '@tanstack/react-table';
 import React, { useContext } from 'react';
-// import { CSS } from '@dnd-kit/utilities'
-// import type { Virtualizer } from '@tanstack/react-virtual'
 import { Button, Space } from 'antd';
 import { ArrowDown, ArrowUp, FilterFill, SortCancel } from 'becoxy-icons';
 import classNames from 'classnames';
 import { Checkbox, Dropdown, Select } from 'rc-master-ui';
-import { booleanOperator, nonActionColumn, numberOperator, stringOperator, translateOption } from "../hook/constant";
+import { booleanOperator, nonActionColumn, numberOperator, stringOperator, translateOption } from "../../grid-component/hooks";
 import { extendsObject, getCommonPinningStyles, getDefaultOperator, getTypeFilter } from "../hook/utils";
 import { TableContext } from "../useContext";
 import { renderFilter } from "./renderFilter";
 import ReactDOMServer from 'react-dom/server';
-
-// import { ColumnTable } from "../type";
-
-// import { Tooltip } from 'react-tooltip'
-
 const TableHeadCell = props => {
   const {
     header,

package/es/table-component/header/TableHeadCell2.js

@@ -4,11 +4,11 @@ import { Button, Space } from 'antd';
 import { ArrowDown, ArrowUp, FilterFill, SortCancel } from 'becoxy-icons';
 import classNames from 'classnames';
 import { Checkbox, Dropdown, Select } from 'rc-master-ui';
-import { booleanOperator, nonActionColumn, numberOperator, stringOperator, translateOption } from "../hook/constant";
 import { excludeItems, extendsObject, getCommonPinningStyles, getDefaultOperator, getTypeFilter, removeDuplicatesByKey } from "../hook/utils";
 import { TableContext } from "../useContext";
 import { renderFilter } from "./renderFilter";
 import ReactDOMServer from 'react-dom/server';
+import { booleanOperator, nonActionColumn, numberOperator, stringOperator, translateOption } from "../../grid-component/hooks";
 const TableHeadCell2 = props => {
   const {
     column,

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

@@ -2,9 +2,9 @@ import type { CheckboxProps, TablePaginationConfig } from 'rc-master-ui';
 import type { ItemType } from 'rc-master-ui/es/menu/interface';
 import type { Cell, Header, OnChangeFn, Row } from '@tanstack/react-table';
 import type { ReactElement, ReactNode } from 'react';
-import type { IOperator } from './hook/constant';
 import type { ColorPickerProps } from 'antd';
 import type { TableLocale } from "rc-master-ui/lib/table/interface";
+import type { IOperator } from '../grid-component/hooks';
 declare module "@tanstack/table-core" {
     interface ColumnMeta<any, any> extends ColumnTable {
         rowSpan?: number;
@@ -80,6 +80,7 @@ export type ColumnTemplate<RecordType> = {
     index: number;
     field: string;
 };
+export type GetRowKey<RecordType> = (record: RecordType, index?: number) => Key;
 export type ColumnTable<RecordType = AnyObject> = {
     field: string;
     width?: number;
@@ -200,6 +201,7 @@ export type TableProps<RecordType = AnyObject> = {
     title?: ReactNode | ((data: RecordType) => ReactNode);
     fullScreenTitle?: ReactNode | (() => ReactNode);
     editAble?: boolean;
+    rowKey?: string;
     infiniteScroll?: boolean;
     next?: () => void;
     locale?: Locale;

package/es/table-virtuoso/ColumnsGroup/ColumnsGroup.js

@@ -27,12 +27,9 @@ export const ColumnsGroup = props => {
   const menuRef = useRef();
   const [tempGroup, setTempGroup] = useState([]);
   const [clicked, setClicked] = useState(false);
-  console.log('columns', columns);
-  console.log('columnsGrouped', columnsGrouped);
   const rsCol = React.useMemo(() => {
     return columns.filter(it => it.visible !== false && !tempGroup.includes(it.field) && it.field !== '#' && it.field !== 'selection_column' && it.field !== 'command');
   }, [columns, tempGroup]);
-  console.log('rsCol', rsCol);
   const options = React.useMemo(() => {
     return rsCol.map(it => ({
       ...it,
@@ -225,6 +222,7 @@ export const ColumnsGroup = props => {
     title: 'Nhóm dữ liệu'
   }, /*#__PURE__*/React.createElement(Group, {
     fontSize: 18,
+    color: "#555555",
     style: {
       cursor: 'pointer'
     }

package/es/table-virtuoso/InternalTable.js

@@ -5,21 +5,15 @@ import 'react-resizable/css/styles.css';
 import dayjs from 'dayjs';
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
-
-// import './style.scss'
-
 import { faker } from '@faker-js/faker';
 import useMergedState from "rc-util/es/hooks/useMergedState";
 import { getCoreRowModel, getExpandedRowModel, getGroupedRowModel, getPaginationRowModel, useReactTable } from '@tanstack/react-table';
 import { addRowIdArray, convertFlatColumn1, convertToObj, convertToObjTrue, filterDataByColumns, findAllChildrenKeys2, flatColumns2, getAllRowKey, getDiffent2Array, getFixedFields, getInvisibleColumns, groupArrayByColumns, isTreeArray, removeKeys } from "./hook/utils";
 import { convertToTanStackColumns } from "./hook/useColumns";
-// import { convertColumns } from './hook/convert'
 import { removeInvisibleColumns } from "../grid-component/hooks";
 import Grid from "./table/Grid";
 import { removeColumns } from "../table-component/hook/utils";
 import { OperatorFeature } from "../table-component/features/operator";
-// import { ColumnsGroup } from '../grid-component/ColumnsGroup'
-
 dayjs.extend(customParseFormat);
 export const SELECTION_COLUMN = {};
 const InternalTable = props => {
@@ -126,24 +120,6 @@ const InternalTable = props => {
     // setColumns(updateWidthsByOther(propsColumns, columns))
     setColumns(propsColumns);
   }, [propsColumns]);
-
-  // const convertData = React.useMemo(() => {
-
-  //   if (groupAble && groupSetting && groupSetting.client !== false) {
-
-  //     const bbc = addRowIdArray(dataSource)
-
-  //     const abc = groupArrayByColumns(bbc, groupColumns)
-
-  //     return abc
-  //   } else {
-
-  //     return addRowIdArray(dataSource)
-
-  //   }
-
-  // }, [dataSource, groupAble, groupColumns, groupSetting])
-
   const mergedColumns = React.useMemo(() => {
     return convertToTanStackColumns({
       t,
@@ -151,8 +127,6 @@ const InternalTable = props => {
       format,
       editAble
     });
-
-    // return convertToTanStackColumns<RecordType>(columns)
   }, [t, columns, format, editAble]);
   const isDataTree = React.useMemo(() => {
     return isTreeArray(tableData);
@@ -191,8 +165,12 @@ const InternalTable = props => {
 
   React.useEffect(() => {
     const a = getInvisibleColumns(columns);
-    setColumnVisibility(a);
-  }, [columns]);
+    const bcd = convertToObj(groupColumns);
+    setColumnVisibility({
+      ...a,
+      ...bcd
+    });
+  }, [columns, groupColumns]);
   const [columnsHiddenKeys, setColumnsHiddenKeys] = useMergedState(undefined, {
     value: undefined
   });

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

@@ -1,7 +1,5 @@
 import { flexRender } from "@tanstack/react-table";
 import Space from "rc-master-ui/es/space";
-// import Command from "../components/command/Command";
-
 import ReactDOMServer from 'react-dom/server';
 import { getCommonPinningStyles } from "../hook/utils";
 import Checkbox from "rc-master-ui/es/checkbox/Checkbox";
@@ -61,7 +59,6 @@ const renderCommand = args => {
       onClick: () => {
         commandClick?.({
           id: item.id,
-          // rowId: getRowKey(record, index) as any,
           rowId: record.rowId,
           rowData: record,
           index: cell.row.index,
@@ -186,12 +183,6 @@ const TableBodyCell = props => {
   const isLastLeftPinnedColumn = isPinned === "left" && cell.column.getIsLastColumn("left");
   const isFirstRightPinnedColumn = isPinned === "right" && cell.column.getIsFirstColumn("right");
   const enableClick = typeof columnMeta.allowSelection === 'function' ? columnMeta.allowSelection(record) : columnMeta.allowSelection;
-
-  // const firstVisibleNormalColumn = table.getVisibleLeafColumns().filter(col => col.id !== 'selection' && col.id !== '#')[0];
-  // const firstVisibleNormalColumn = table.getVisibleLeafColumns().filter(col => col.id !== 'selection' && col.id !== '#')[0];
-
-  // const parrents = cell.row.getParentRows();
-
   if (cell.column.id === "#") {
     return /*#__PURE__*/React.createElement("td", {
       key: cell.id,

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

@@ -1,5 +1,4 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-// import type { VirtualItem, Virtualizer } from "@tanstack/react-virtual"
 import TableBodyCell from "./TableBodyCell";
 import { flexRender } from "@tanstack/react-table";
 import React from "react";
@@ -67,9 +66,6 @@ const TableBodyRow = ({
         field
       } = row.original ?? {};
       const cellGroup = allCells.find(it => it.column.id === field);
-
-      // const header = allColumns.find((it) => it.id === field)
-
       const headerContext = cellGroup && groupSetting?.showHeaderColumn !== false ? {
         table,
         column: cellGroup.column,

package/es/table-virtuoso/style.js

@@ -1,6 +1,7 @@
 import styled from "styled-components";
 const color = "#000000de";
 const BgColor = "#ffffff";
+const rowSelectedBg = "#FEF2EF";
 const tableBorderColor = "#e0e0e0";
 const tableBorderColorDark = "#44485E";
 const BgColorDark = "#343e59";
@@ -8,4 +9,4 @@ const colorDark = "#e6e4f3e6";
 export const GridStyle = styled.div.withConfig({
   displayName: "GridStyle",
   componentId: "es-grid-template__sc-rs980s-0"
-})(["&.", "-grid{color:", ";font-size:13px;background-color:", ";table{table-layout:fixed;border-collapse:separate;border-spacing:0;}.", "-grid-container{border:1px solid ", ";.", "-grid-thead{&:has(.resizer.isResizing){.", "-grid-cell{touch-action:none;user-select:none;}}.", "-grid-cell{background-color:#ffffff;&:has(.resizer.isResizing){touch-action:none;user-select:none;}.resizer{cursor:col-resize;height:100%;position:absolute;right:0;top:0;touch-action:none;user-select:none;width:5px;}}}tbody{.", "-grid-row{&.", "-grid-row-parent{.", "-grid-cell{font-weight:600;background-color:#f5f5f5;}}}}.", "-grid-tfoot{z-index:3 !important;.ui-rc-grid-footer-row{.ui-rc-grid-cell{border-top:1px solid ", ";border-bottom:1px solid ", ";}}}.", "-grid-cell{padding:7px 8px;.class-content:has(*){background:lightblue;}.class-content:not(:has(*)){background:lightgreen;}&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-righ{text-align:right;justify-content:flex-end;}}.", "-grid-cell:not(:has(*)){&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-right{text-align:right;justify-content:flex-end;}&.", "-grid-cell-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;}}}&.", "-grid-light{.", "-grid-container{.", "-grid-thead{z-index:3 !important;background-color:", ";font-weight:500;.", "-grid-cell{font-weight:inherit;color:", ";background-color:#ffffff;border-inline-end:1px solid ", ";border-bottom:1px solid ", ";&.ui-rc-grid-cell-ellipsis{.ui-rc-table-column-title,.", "-grid-cell-ellipsis{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;}}&.ui-rc-grid-cell-wrap{.ui-rc-table-column-title,.", "-grid-cell-text-wrap{white-space:normal;word-break:break-word;overflow:hidden;}}&:hover{.ui-rc-header-trigger{.ui-rc-table-column-sorter-cancel{opacity:1;}}}.", "-grid-filter-column{display:flex;justify-content:space-between;width:100%;align-items:center;position:relative;}.ui-rc-header-trigger{padding-left:6px;display:flex;align-items:center;.ui-rc-table-column-sorter-cancel{opacity:0;}}.resizer{cursor:col-resize;height:100%;position:absolute;right:0;top:0;touch-action:none;user-select:none;width:5px;}.resizer.isResizing{opacity:1;}}}.", "-grid-tbody{.", "-grid-row{background-color:", ";color:", ";}}tbody{background-color:", ";color:", ";.", "-grid-cell{outline:none;background-color:#ffffff;border-inline-end:1px solid ", ";border-bottom:1px solid ", ";&.ui-rc-grid-cell-selected{background-color:#33335d !important;}&.disable{background-color:#272A2F;}}}.", "-grid-tfoot{.", "-grid-footer-row{border-bottom-width:1px;border-bottom-color:", ";border-bottom-style:solid;border-top-width:1px;border-top-color:", ";border-top-style:solid;background-color:#fafafa;}.", "-grid-cell{background-color:inherit;border-inline-end:1px solid ", ";}}}}&.", "-grid-dark{background-color:", ";color:", ";.", "-grid-container{border-color:", ";&::after{border-right-color:", ";}}}}"], props => props.$prefix, color, BgColor, props => props.$prefix, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => props.$prefix, props => `${props.$theme.color ? props.$theme.color : color}`, tableBorderColor, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, tableBorderColor, props => props.$prefix, BgColorDark, colorDark, props => props.$prefix, tableBorderColorDark, tableBorderColorDark);
+})(["&.", "-grid{color:", ";font-size:13px;background-color:", ";table{table-layout:fixed;border-collapse:separate;border-spacing:0;}.", "-grid-container{border:1px solid ", ";.", "-grid-thead{&:has(.resizer.isResizing){.", "-grid-cell{touch-action:none;user-select:none;}}.", "-grid-cell{background-color:#ffffff;&:has(.resizer.isResizing){touch-action:none;user-select:none;}.resizer{cursor:col-resize;height:100%;position:absolute;right:0;top:0;touch-action:none;user-select:none;width:5px;}}}tbody{.", "-grid-row{&.", "-grid-row-parent{.", "-grid-cell{font-weight:600;background-color:#f5f5f5;}}}}.", "-grid-tfoot{z-index:3 !important;.ui-rc-grid-footer-row{.ui-rc-grid-cell{border-top:1px solid ", ";border-bottom:1px solid ", ";}}}.", "-grid-cell{padding:7px 8px;.class-content:has(*){background:lightblue;}.class-content:not(:has(*)){background:lightgreen;}&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-righ{text-align:right;justify-content:flex-end;}}.", "-grid-cell:not(:has(*)){&.", "-grid-cell-text-center{text-align:center;justify-content:center;}&.", "-grid-cell-text-right{text-align:right;justify-content:flex-end;}&.", "-grid-cell-ellipsis{overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;}}}&.", "-grid-light{.", "-grid-container{.", "-grid-thead{z-index:3 !important;background-color:", ";font-weight:500;.", "-grid-cell{font-weight:inherit;color:", ";background-color:#ffffff;outline:1px solid ", ";border:0;&.ui-rc-grid-cell-ellipsis{.ui-rc-table-column-title,.", "-grid-cell-ellipsis{width:100%;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;word-break:keep-all;}}&.ui-rc-grid-cell-wrap{.ui-rc-table-column-title,.", "-grid-cell-text-wrap{white-space:normal;word-break:break-word;overflow:hidden;}}&:hover{.ui-rc-header-trigger{.ui-rc-table-column-sorter-cancel{opacity:1;}}}.", "-grid-filter-column{display:flex;justify-content:space-between;width:100%;align-items:center;position:relative;}.ui-rc-header-trigger{padding-left:6px;display:flex;align-items:center;.ui-rc-table-column-sorter-cancel{opacity:0;}}.resizer{cursor:col-resize;height:100%;position:absolute;right:0;top:0;touch-action:none;user-select:none;width:5px;}.resizer.isResizing{opacity:1;}}}.", "-grid-tbody{.", "-grid-row{background-color:", ";color:", ";}}tbody{background-color:", ";color:", ";.", "-grid-row{&.ui-rc-grid-row-selected{.", "-grid-cell{background-color:", ";}}}.", "-grid-cell{outline:none;background-color:#ffffff;outline:1px solid ", ";&.ui-rc-grid-cell-selected{background-color:#33335d !important;}&.disable{background-color:#272A2F;}}}.", "-grid-tfoot{.", "-grid-footer-row{border-bottom-width:1px;border-bottom-color:", ";border-bottom-style:solid;border-top-width:1px;border-top-color:", ";border-top-style:solid;background-color:#fafafa;}.", "-grid-cell{background-color:inherit;border:0;outline:1px solid ", ";}}}}&.", "-grid-dark{background-color:", ";color:", ";.", "-grid-container{border-color:", ";&::after{border-right-color:", ";}}}}"], props => props.$prefix, color, BgColor, props => props.$prefix, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => props.$prefix, props => `${props.$theme.color ? props.$theme.color : color}`, tableBorderColor, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => props.$prefix, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, props => `${props.$theme.backgroundColor ? props.$theme.backgroundColor : BgColor}`, props => `${props.$theme.color ? props.$theme.color : color}`, props => props.$prefix, props => props.$prefix, rowSelectedBg, props => props.$prefix, tableBorderColor, props => props.$prefix, props => props.$prefix, tableBorderColor, tableBorderColor, props => props.$prefix, tableBorderColor, props => props.$prefix, BgColorDark, colorDark, props => props.$prefix, tableBorderColorDark, tableBorderColorDark);

package/es/table-virtuoso/style.scss

@@ -622,8 +622,9 @@ $cell-index-focus-bg-Dark: #E6EFFD !default;
       .#{$prefix}-grid-cell {
 
         background-color: inherit;
+        
 
-        border-inline-end: 1px solid $tableBorderColor;
+        // border-inline-end: 1px solid $tableBorderColor;
       }
     }
 

package/es/table-virtuoso/table/Grid.js

@@ -115,7 +115,6 @@ const Grid = props => {
   }, [isSelectionChange, rowSelection, table.getState().rowSelection]);
   React.useEffect(() => {
     if (sorterChange) {
-      console.log('12312312313123');
       const aa = table.getState().sorting;
       const rs = aa.map(it => {
         return {
@@ -135,7 +134,6 @@ const Grid = props => {
   React.useEffect(() => {
     if (filterChange) {
       const operatorState = table.getState().operator;
-      console.log('operatorState', operatorState);
       const merged = columnFilters.map(filter => {
         const match = operatorState.find(op => op.id === filter.id);
         const col = table.getVisibleFlatColumns().find(it => it.id === filter.id)?.columnDef.meta;
@@ -147,8 +145,6 @@ const Grid = props => {
           operator: match ? match.operator : undefined
         };
       });
-      console.log('operatorState', operatorState);
-      console.log('merged', merged);
       if (onFilter) {
         onFilter?.(convertFilters(merged));
       } else {

package/es/table-virtuoso/table/TableContainer.js

@@ -5,11 +5,11 @@ import React from 'react';
 import classNames from 'classnames';
 import Pagination from 'rc-master-ui/es/pagination';
 import { Toolbar } from 'rc-master-ui';
-import { Maximize, Minimize } from 'becoxy-icons';
+import { Collapse2, Expand2, Maximize, Minimize } from 'becoxy-icons';
 import { numericFormatter } from 'react-numeric-component';
 import TableWrapper from "./TableWrapper";
 import { ColumnsChoose } from "../../table-component/ColumnsChoose";
-import { getTableHeight } from "../hook/utils";
+import { convertToObjTrue, findAllChildrenKeys2, getTableHeight, isObjEmpty } from "../hook/utils";
 import { TableContext } from "../useContext";
 // import { ColumnsGroup } from '../../grid-component/ColumnsGroup';
 import { flatColumns2 } from "../../table-component/hook/utils";
@@ -20,7 +20,7 @@ const TableContainer = props => {
     table,
     id,
     prefix,
-    // commandClick,
+    commandClick,
     editAble,
     rowKey,
     format,
@@ -106,41 +106,28 @@ const TableContainer = props => {
       document.removeEventListener('mousedown', handleClickOutside);
     };
   }, []);
+  const triggerCommandClick = args => {
+    // const { id: idCommand, rowId, rowData, index } = args
 
-  // React.useEffect(() => {
-
-  //   if (!tableContainerRef.current) {
-  //     return
-  //   }
-
-  //   if (columnSizingInfo.isResizingColumn === false) {
-
-  //     const aa = updateColumnWidthsRecursive(propsColumns, columnSizing)
-
-  //     setColumns(aa)
-
-  //   }
-
-  // }, [columnSizingInfo])
-
-  // const triggerCommandClick = (args: Omit<CommandClick<RecordType>, 'rows'>) => {
-
-  //   // const { id: idCommand, rowId, rowData, index } = args
-
-  //   // const tmpData = [...dataSource]
-
-  //   if (commandClick) {
-  //     commandClick({
-  //       ...args,
-  //       rows: originData
-  //     })
-  //   }
-
-  // }
+    // const tmpData = [...dataSource]
 
+    if (commandClick) {
+      commandClick({
+        ...args,
+        rows: originData
+      });
+    }
+  };
   const handleOnGroup = value => {
     triggerGroupColumns?.(value);
   };
+  const handleCollapseAllGroup = () => {
+    setExpanded({});
+  };
+  const handleExpandAllGroup = () => {
+    const allKeys = findAllChildrenKeys2(dataSource, rowKey, 'children');
+    setExpanded(convertToObjTrue(allKeys));
+  };
   const groupToolbar = () => {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -158,7 +145,15 @@ const TableContainer = props => {
       columns: propsColumns ? flatColumns2(propsColumns) : [],
       columnsGrouped: groupColumns,
       onSubmit: handleOnGroup
-    }), /*#__PURE__*/React.createElement(React.Fragment, null));
+    }), /*#__PURE__*/React.createElement(React.Fragment, null, !isObjEmpty(expanded) ? /*#__PURE__*/React.createElement(Collapse2, {
+      fontSize: 16,
+      color: '#555555',
+      onClick: handleCollapseAllGroup
+    }) : /*#__PURE__*/React.createElement(Expand2, {
+      fontSize: 16,
+      color: '#555555',
+      onClick: handleExpandAllGroup
+    })));
   };
   return /*#__PURE__*/React.createElement("div", {
     ref: containerRef,
@@ -234,7 +229,6 @@ const TableContainer = props => {
       setExpanded,
       dataSource,
       originData,
-      // triggerFilter,
       wrapSettings,
       recordDoubleClick,
       selectionSettings,
@@ -245,8 +239,6 @@ const TableContainer = props => {
       setFilterChange,
       windowSize,
       isDataTree,
-      // focusedCell,
-      // setFocusedCell,
       rowClassName,
       onRowStyles,
       onRowFooterStyles,
@@ -254,12 +246,6 @@ const TableContainer = props => {
       table,
       pagination,
       groupSetting
-      // visible,
-      // setVisible,
-      // selectedKeys,
-      //  setSelectedKeys,
-      //  currentFilter, 
-      //  setCurrentFilter
     }
   }, /*#__PURE__*/React.createElement(TableWrapper, {
     tableContainerRef: tableContainerRef,
@@ -269,7 +255,8 @@ const TableContainer = props => {
     minHeight: minHeight,
     dataSource: dataSource,
     table: table,
-    columns: columns
+    columns: columns,
+    commandClick: triggerCommandClick
   })), /*#__PURE__*/React.createElement("div", {
     ref: bottomToolbarRef
   }, pagination && !infiniteScroll && /*#__PURE__*/React.createElement(Pagination

package/es/table-virtuoso/table/TableWrapper.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { ColumnDef, Table } from "@tanstack/react-table";
+import type { CommandClick } from '../../table-component/type';
 type Props<T> = {
     tableContainerRef: React.RefObject<HTMLDivElement>;
     table: Table<T>;
@@ -11,6 +12,7 @@ type Props<T> = {
     dataSource: T[];
     summary?: boolean;
     loading?: boolean;
+    commandClick?: (args: Omit<CommandClick<T>, 'rows'>) => void;
     editAble?: boolean;
     showEmptyText?: boolean;
     contextMenuClick?: any;

package/es/table-virtuoso/table/TableWrapper.js

@@ -14,6 +14,7 @@ import { TableContext } from "../useContext";
 import classNames from 'classnames';
 import TableBodyRow from "../body/TableBodyRow";
 import TableFooterCell from "../footer/TableFooterCell";
+
 // import type { ColumnsTable, TableProps } from '../type';
 
 // type TableContainerProps<T> = Omit<TableProps<T>, 'columns'> & {
@@ -23,7 +24,8 @@ const TableWrapper = props => {
     table,
     // columns,
     height,
-    id
+    id,
+    commandClick
   } = props;
   const {
     prefix
@@ -83,7 +85,8 @@ const TableWrapper = props => {
         return /*#__PURE__*/React.createElement(TableBodyRow, _extends({
           tableId: id,
           row: row,
-          table: table
+          table: table,
+          commandClick: commandClick
         }, props));
       }
     }

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

@@ -1,4 +1,4 @@
 import React from 'react';
-import type { GridTableProps } from "./type";
-declare const TempTable: <RecordType extends object>(props: GridTableProps<RecordType>) => React.JSX.Element;
+import type { TableProps } from "../table-component";
+declare const TempTable: <RecordType extends object>(props: TableProps<RecordType>) => React.JSX.Element;
 export default TempTable;

package/lib/grid-component/TempTable.js

@@ -6,11 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _tableComponent = _interopRequireDefault(require("../table-component"));
 var _tableVirtuoso = _interopRequireDefault(require("../table-virtuoso"));
-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; }
 const TempTable = props => {
   const {
     groupAble,
@@ -18,9 +16,9 @@ const TempTable = props => {
     ...rest
   } = props;
   const TabComponent = groupAble ? _tableVirtuoso.default : _tableComponent.default;
-  return /*#__PURE__*/_react.default.createElement(_react.Fragment, null, /*#__PURE__*/_react.default.createElement(TabComponent, (0, _extends2.default)({}, rest, {
+  return /*#__PURE__*/_react.default.createElement(TabComponent, (0, _extends2.default)({}, rest, {
     groupAble: groupAble,
     editAble: editAble
-  })));
+  }));
 };
 var _default = exports.default = TempTable;

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

@@ -70,3 +70,4 @@ export declare const booleanToValue: {
     true: number;
     false: number;
 };
+export declare const nonActionColumn: string[];

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.valueToBoolean = exports.translateOption = exports.transferFontSize = exports.stringOperator = exports.paperSize = exports.optionsSize = exports.optionsPaperOrientation = exports.optionFontSize = exports.optionFont = exports.numberOperator = exports.defaultWidth = exports.defaultTimeFormat = exports.defaultRowHeight = exports.defaultPageSizes = exports.defaultDateTimeFormat = exports.defaultDateFormat = exports.default = exports.dateTimeOperator = exports.dateOperator = exports.booleanToValue = exports.booleanOperator = exports.alignToFlex = void 0;
+exports.valueToBoolean = exports.translateOption = exports.transferFontSize = exports.stringOperator = exports.paperSize = exports.optionsSize = exports.optionsPaperOrientation = exports.optionFontSize = exports.optionFont = exports.numberOperator = exports.nonActionColumn = exports.defaultWidth = exports.defaultTimeFormat = exports.defaultRowHeight = exports.defaultPageSizes = exports.defaultDateTimeFormat = exports.defaultDateFormat = exports.default = exports.dateTimeOperator = exports.dateOperator = exports.booleanToValue = exports.booleanOperator = exports.alignToFlex = void 0;
 const defaultWidth = exports.defaultWidth = 100;
 const defaultRowHeight = exports.defaultRowHeight = 35;
 const numberOperator = exports.numberOperator = [{
@@ -243,4 +243,5 @@ const valueToBoolean = exports.valueToBoolean = {
 const booleanToValue = exports.booleanToValue = {
   true: 1,
   false: 0
-};
+};
+const nonActionColumn = exports.nonActionColumn = ['#', 'command', 'selection_column'];

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

@@ -1,4 +1,4 @@
-import type { AnyObject, GetRowKey } from "../type";
 import type { Key } from "react";
+import type { AnyObject, GetRowKey } from '../../table-component/type';
 declare const useLazyKVMap: <RecordType extends AnyObject = AnyObject>(data: readonly RecordType[], childrenColumnName: string, getRowKey: GetRowKey<RecordType>) => readonly [(key: Key) => RecordType];
 export default useLazyKVMap;

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

@@ -9,9 +9,6 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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; }
 /* eslint-disable @typescript-eslint/no-non-null-asserted-optional-chain */
 
-// import type { AnyObject } from '../../_util/type';
-// import type { GetRowKey, Key } from '../interface';
-
 const useLazyKVMap = (data, childrenColumnName, getRowKey) => {
   const mapCacheRef = React.useRef({});
   function getRecordByKey(key) {

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

@@ -1,10 +1,9 @@
 import type * as React from "react";
 import dayjs from "dayjs";
 import type { EditType, IColumnType, TypeFilter } from "rc-master-ui";
-import type { ColumnTable, GetRowKey, IFormat } from "../type";
-import type { AnyObject } from "../type";
 import type { Key } from "react";
 import type { ColumnsTable } from "./../index";
+import type { AnyObject, ColumnTable, GetRowKey, IFormat } from "../../table-component/type";
 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;
@@ -50,7 +49,7 @@ export declare const convertLabelToTitle: (data: any[]) => any[];
 export declare const convertArrayWithIndent: (inputArray: any[], parentIndent?: number) => any[];
 export declare const getTemplate: (template: any, column?: ColumnTable) => React.ReactNode | React.ReactElement;
 export declare const isObjEmpty: (obj: any) => boolean;
-export declare const getColumnsVisible: <T>(columns: ColumnsTable<T>, index: number) => import("../../table-component/type").ColumnTable<T>[];
+export declare const getColumnsVisible: <T>(columns: ColumnsTable<T>, index: number) => ColumnTable<T>[];
 export declare const updateData: <Record = AnyObject>(initData: Record[], rows: Record[], key: keyof Record) => Record[];
 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[];
@@ -105,7 +104,7 @@ export declare const convertFlatColumn: (array: ColumnsTable) => ColumnsTable[];
 export declare const checkChild: (inputArray: any[]) => boolean;
 export declare const isEditable: <RecordType>(column: ColumnTable, rowData: RecordType) => boolean | ((rowData: any) => boolean);
 export declare const isArraysEqual: (arr1: any[], arr2: any[]) => boolean;
-export declare const editAbleColumns: <T>(columns: ColumnsTable<T>) => import("../../table-component/type").ColumnTable<T>[];
+export declare const editAbleColumns: <T>(columns: ColumnsTable<T>) => ColumnTable<T>[];
 export declare const findItemPath: (tree: any[], targetItem: any, rowKey: any, currentPage?: number, pageSize?: number) => any;
 export declare const filterDataByColumns: (data: any[], queries: any) => any[];
 export declare const filterDataByColumns2: (data: any[], queries: any) => any[];

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

@@ -48,7 +48,10 @@ var _dayjs = _interopRequireDefault(require("dayjs"));
 var _moment = _interopRequireDefault(require("moment/moment"));
 var _uuid = require("uuid");
 var _colors = require("@ant-design/colors");
+// import type {ColumnTable, GetRowKey, IFormat, Presets} from "./../ type"
+
 // import type {SelectionSettings} from "../type"
+// import type {AnyObject} from "../type"
 
 // import {Table} from "rc-master-ui"
 // import {flatColumns2} from "./columns"