es-grid-template 1.8.67 → 1.8.68

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

@@ -1,24 +1,9 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useContext } from "react";
 import { ColorPicker, DatePicker, Divider, Input, TimePicker, Row, Col } from "antd";
-// import type {ColumnTable, ColumnSelectTable, IFormat} from "./type"
-
-import { checkDecimalSeparator, checkThousandSeparator, checkFieldKey, convertArrayWithIndent, convertDateToDayjs,
-// convertDayjsToDate,
-convertLabelToTitle,
-// customWeekStartEndFormat,
-getDatepickerFormat,
-// getTemplate,
-isDisable, isEmpty, isNullOrUndefined, customWeekStartEndFormat, convertDayjsToDate, parseBooleanToValue, isColor, genPresets, getFormat
-// isEditable,
-// convertDayjsToDate
-} from "../hook/utils";
-// import moment from "moment";
-// import dayjs from "dayjs";
-// import {TreeSelect} from "antd";
+import { checkDecimalSeparator, checkThousandSeparator, checkFieldKey, convertArrayWithIndent, convertDateToDayjs, convertLabelToTitle, getDatepickerFormat, isDisable, isEmpty, isNullOrUndefined, customWeekStartEndFormat, convertDayjsToDate, parseBooleanToValue, isColor, genPresets, getFormat } from "../hook/utils";
 import classNames from "classnames";
 import { NumericFormat } from "react-numeric-component";
-// import {TableContext} from "./useContext"
 import dayjs from "dayjs";
 import moment from "moment";
 import { Controller } from "react-hook-form";
@@ -28,8 +13,6 @@ import { AsyncTableSelect } from "../components/async-table-select";
 import { cyan, green, red, blue } from '@ant-design/colors';
 import { EditForm } from "../components/EditForm";
 import { TableContext } from "../useContext";
-// import moment from "moment";
-
 const {
   SHOW_PARENT
 } = TreeSelect;

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

@@ -1,5 +1,5 @@
 import { type Table } from "@tanstack/react-table";
-import type { CommandClick } from "../type";
+import type { CommandClick } from "../../grid-component/type";
 import React from "react";
 interface TableBodyProps<T> {
     table: Table<T>;

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

@@ -1,5 +1,5 @@
 import type { Cell, Table } from "@tanstack/react-table";
-import type { CommandClick } from "../type";
+import type { CommandClick } from "../../grid-component/type";
 import React from "react";
 import type { VirtualItem, Virtualizer } from "@tanstack/react-virtual";
 interface TableBodyCellProps<T> {

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

@@ -1,5 +1,5 @@
 import type { Cell, Table } from "@tanstack/react-table";
-import type { CommandClick } from "../type";
+import type { CommandClick } from "../../grid-component/type";
 import React from "react";
 import type { VirtualItem, Virtualizer } from "@tanstack/react-virtual";
 interface TableBodyCellProps<T> {

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

@@ -1,6 +1,6 @@
 import type { VirtualItem, Virtualizer } from "@tanstack/react-virtual";
 import { type Column, type Row, type Table } from "@tanstack/react-table";
-import type { CommandClick } from "../type";
+import type { CommandClick } from "../../grid-component/type";
 import React from "react";
 interface TableBodyRowProps<T> {
     tableId: string;

package/es/table-component/components/ControlCheckbox.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { ColumnTable } from "../type";
+import type { ColumnTable } from "../../grid-component/type";
 type Props = {
     column: ColumnTable;
     record?: any;

package/es/table-component/components/EditForm/EditForm.js

@@ -3,7 +3,6 @@ import styled from "styled-components";
 import { useForm } from "react-hook-form";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { Col, Row } from "rc-master-ui/es/grid";
-// import InputControl from "../control/InputControl/InputControl";
 import { isNullOrUndefined, isObjEmpty } from "../../hook/utils";
 import { Input } from "rc-master-ui";
 import { Dropdown } from "antd";

package/es/table-component/components/InputControl/InputControl.js

@@ -4,11 +4,8 @@ import { Input } from "rc-master-ui";
 import { Typography } from "antd";
 import classnames from "classnames";
 import React, { Fragment } from "react";
-// import {isNullOrUndefined} from "../../hooks";
 import { Col, Row } from "rc-master-ui/es/grid";
 import { isNullOrUndefined } from "../../hook/utils";
-// import {isNullOrUndefined} from "../../../hooks"
-
 const {
   Text
 } = Typography;

package/es/table-component/components/async-select/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { BaseOptionType, DefaultOptionType } from "rc-select/lib/Select";
 import type { SelectProps } from "rc-master-ui/es/select";
-import type { LoadOptionsArgs } from '../../type';
+import type { LoadOptionsArgs } from '../../../grid-component/type';
 export interface DebounceSelectProps<OptionType extends BaseOptionType = DefaultOptionType> extends SelectProps {
     loadOptions?: (search: string, callback: (newOptions: OptionType[]) => void, args?: LoadOptionsArgs) => void;
     debounceTimeout?: number;

package/es/table-component/components/async-select/index.js

@@ -2,9 +2,6 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useEffect, useMemo, useState } from 'react';
 import debounce from 'lodash/debounce';
 import { Select } from "rc-master-ui";
-
-// import type {LoadOptionsArgs} from "../type";
-
 export function AsyncSelect({
   loadOptions,
   debounceTimeout = 500,

package/es/table-component/components/async-table-select/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { BaseOptionType, DefaultOptionType } from "rc-select/lib/Select";
 import type { TableSelectProps } from "rc-master-ui";
-import type { LoadOptionsArgs } from '../../type';
+import type { LoadOptionsArgs } from '../../../grid-component/type';
 export interface DebounceSelectProps<OptionType extends BaseOptionType = DefaultOptionType> extends TableSelectProps {
     loadOptions?: (search: string, callback: (newOptions: OptionType[]) => void, args?: LoadOptionsArgs) => void;
     debounceTimeout?: number;

package/es/table-component/components/async-table-select/index.js

@@ -2,10 +2,6 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useEffect, useMemo, useState } from 'react';
 import debounce from 'lodash/debounce';
 import { TableSelect } from "rc-master-ui";
-// import type {TableSelectProps} from "rc-master-ui/es/table-select"
-
-// import type {LoadOptionsArgs} from "../type";
-
 export function AsyncTableSelect({
   loadOptions,
   debounceTimeout = 500,

package/es/table-component/components/checkbox-filter/CheckboxFilter.js

@@ -128,7 +128,7 @@ const CheckboxFilter = props => {
   }) => (filters || []).map((filter, index) => {
     const key = String(filter.value);
     const item = {
-      title: filter.text,
+      title: filter.label,
       key: filter.value !== undefined ? key : String(index)
     };
     if (filter.children) {
@@ -213,7 +213,11 @@ const CheckboxFilter = props => {
           return filterSearch(searchValue, getFilterData(node));
         }
         return searchValueMatched(searchValue, node.title);
-      } : undefined
+      } : undefined,
+      rootStyle: {
+        background: 'none',
+        boxShadow: 'none'
+      }
     })));
   }
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FilterSearch, {

package/es/table-component/components/checkbox-filter/FilterSearch.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { FilterSearchType, TableLocale } from "antd/es/table/interface";
-import type { AnyObject } from '../../type';
+import type { AnyObject } from '../../../grid-component/type';
 interface FilterSearchProps<RecordType = AnyObject> {
     value: string;
     onChange: (e: React.ChangeEvent<HTMLInputElement>) => void;

package/es/table-component/components/checkbox-filter/FilterSearch.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import SearchOutlined from '@ant-design/icons/SearchOutlined';
 import { Input } from 'rc-master-ui';
 
-// import type {AnyObject} from "./type"
+// import type {AnyObject} from "./../grid-component/type"
 
 const FilterSearch = props => {
   const {

package/es/table-component/components/command/Command.d.ts

@@ -1,5 +1,5 @@
 import React from "react";
-import type { CommandItem } from "../../type";
+import type { CommandItem } from "../../../grid-component/type";
 type Props<T> = {
     id: string;
     record: T;

package/es/table-component/components/number/index.d.ts

@@ -1,5 +1,6 @@
-import React, { KeyboardEventHandler } from "react";
-import type { IFormat } from "../../type";
+import type { KeyboardEventHandler } from "react";
+import React from "react";
+import type { IFormat } from "../../../grid-component/type";
 type Props = {
     t?: any;
     format?: IFormat;

package/es/table-component/components/number/index.js

@@ -2,9 +2,6 @@ import React, { Fragment } from "react";
 import { NumericFormat } from "react-numeric-component";
 import { Input } from "rc-master-ui";
 import { checkDecimalSeparator, checkThousandSeparator } from "../../hook/utils";
-// import type {IFormat} from "../type"
-// import {checkDecimalSeparator, checkThousandSeparator} from "../hooks"
-
 const NumberInput = props => {
   const {
     t,
@@ -14,11 +11,6 @@ const NumberInput = props => {
     onPressEnter
   } = props;
   const values = React.useMemo(() => [value], [value]);
-
-  // const [values, setValues] = React.useState<any[]>(() =>
-  //   mergedValues,
-  // );
-
   return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(NumericFormat, {
     value: values[0] ?? ''
     // value={min}

package/es/table-component/components/number-range/index.d.ts

@@ -1,5 +1,6 @@
-import React, { KeyboardEventHandler } from "react";
-import type { IFormat } from "../../type";
+import type { KeyboardEventHandler } from "react";
+import React from "react";
+import type { IFormat } from "../../../grid-component/type";
 type Props = {
     t?: any;
     format?: IFormat;

package/es/table-component/components/number-range/index.js

@@ -2,9 +2,6 @@ import React, { Fragment } from "react";
 import { NumericFormat } from "react-numeric-component";
 import { Input } from "rc-master-ui";
 import { checkDecimalSeparator, checkThousandSeparator } from "../../hook/utils";
-// import type {IFormat} from "../type"
-// import {checkDecimalSeparator, checkThousandSeparator} from "../hooks"
-
 const NumberRange = props => {
   const {
     t,

package/es/table-component/footer/TableFooterRow.js

@@ -1,33 +1,15 @@
-// import type { Virtualizer } from "@tanstack/react-virtual";
-// import type { Person } from "../makeData";
 import TableFooterCell from "./TableFooterCell";
 import React from "react";
 import { TableContext } from "../useContext";
-// import type { Person } from "../../tanstack-table/makeData";
-// import TableHeadCell from "./TableHeadCell";
-
 const TableFooterRow = ({
   table,
-  // columnVirtualizer,
   headerGroup
-  // virtualPaddingLeft,
-  // virtualPaddingRight,
-  // fixedLeftColumns,
-  // fixedRightColumns,
-  // virtualColumns,
-  // columnVirtualizer
 }) => {
-  // const virtualColumns = columnVirtualizer.getVirtualItems();
-
-  // const a  =  table.getVisibleFlatColumns()
   const visibleColumns = table.getVisibleLeafColumns();
   const {
     onRowFooterStyles
   } = React.useContext(TableContext);
   const rowStyles = typeof onRowFooterStyles === 'function' ? onRowFooterStyles() : onRowFooterStyles;
-
-  // const 
-
   return /*#__PURE__*/React.createElement("div", {
     key: headerGroup.id,
     style: {
@@ -40,11 +22,8 @@ const TableFooterRow = ({
     className: "ui-rc-grid-footer-row"
   }, visibleColumns.map(header => {
     return /*#__PURE__*/React.createElement(TableFooterCell, {
-      key: header.id
-      // header={header as any}
-      ,
+      key: header.id,
       column: header
-      // columnVirtualizer={columnVirtualizer}
     });
   }));
 };

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

@@ -1,27 +1,10 @@
 import React, { useContext } from 'react';
 import { TableContext } from "../useContext";
-// import TableHeadRow from './TableHeadRow'
 import TableHeadCell2 from "./TableHeadCell2";
 import TableHeadGroupCell from "./TableHeadGroupCell";
-// import { getCommonPinningStyles } from '../hook/utils'
-
-// const getVisibleChildCount = <T,>(column: Column<T>): number => {
-//   if (!column.columns?.length) return 0;
-
-//   return column.columns.reduce((count: number, col: Column<T>) => {
-//     const selfCount =  col.getIsVisible() ? 1 : 0;
-//     const childrenCount = getVisibleChildCount(col);
-//     return count + selfCount + (childrenCount ? childrenCount - 1 : childrenCount);
-//   }, 0);
-// }
-
 const TableHead = ({
   columnVirtualizer,
   table
-  // virtualPaddingLeft,
-  // virtualPaddingRight,
-  // fixedLeftColumns,
-  // fixedRightColumns
 }) => {
   const {
     prefix,
@@ -29,7 +12,6 @@ const TableHead = ({
   } = useContext(TableContext);
   const headerGroups = table.getFlatHeaders();
   const leafColumns = table.getVisibleFlatColumns();
-  // const leafColumns11 = table.getIsAllColumnsVisible();
   const headerDepth = table.getHeaderGroups().length;
   const rowStyles = typeof onRowHeaderStyles === 'function' ? onRowHeaderStyles() : onRowHeaderStyles;
   return /*#__PURE__*/React.createElement("div", {
@@ -40,8 +22,6 @@ const TableHead = ({
       position: 'sticky',
       top: 0,
       zIndex: 1,
-      // gridTemplateRows: `repeat(${table.getHeaderGroups().length}, auto)`,
-      // gridTemplateColumns: `repeat(${table.getVisibleLeafColumns().length}, 1fr)`,
       gridTemplateColumns: `${table.getVisibleLeafColumns().map(n => `${n.getSize()}fr`).join(" ")}`
     }
   }, leafColumns.map(column => {

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

@@ -14,11 +14,6 @@ const TableHeadCell = props => {
     header,
     getPopupContainer,
     table
-    // t,
-    // columnVirtualizer,
-    // rowHeaderVirtualizer,
-    // colSpan,
-    // rowSpan
   } = props;
   const {
     t,

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

@@ -30,7 +30,8 @@ const TableHeadCell2 = props => {
     setIsSelectionChange,
     id,
     locale,
-    format
+    format,
+    dataSourceFilter
   } = useContext(TableContext);
   const isPinned = column.getIsPinned();
   const isLastLeftPinnedColumn = isPinned === 'left' && column.getIsLastColumn('left');
@@ -156,7 +157,8 @@ const TableHeadCell2 = props => {
         selectedKeys,
         setSelectedKeys,
         doFilter,
-        format
+        format,
+        dataSourceFilter
 
         // selectedKeys: (column.getFilterValue() ?? []) as string[],
         // setSelectedKeys: column.setFilterValue,

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

@@ -9,25 +9,17 @@ const TableHeadGroupCell = props => {
   const {
     column,
     header,
-    // getPopupContainer,
     table,
     depth,
-    // t,
-    // columnVirtualizer,
-    // rowHeaderVirtualizer,
     colSpan,
     rowSpan
   } = props;
   const {
-    // t,
     prefix,
-    // setSorterChange,
-    // setFilterChange,
     wrapSettings,
     selectionSettings,
     setIsSelectionChange,
     id
-    // locale
   } = useContext(TableContext);
   const isPinned = column.getIsPinned();
   const isLastLeftPinnedColumn = isPinned === 'left' && column.getIsLastColumn('left');
@@ -37,14 +29,6 @@ const TableHeadGroupCell = props => {
   const cellContent = flexRender(column.columnDef.header, header.getContext());
   const html = ReactDOMServer.renderToStaticMarkup( /*#__PURE__*/React.createElement(React.Fragment, null, cellContent));
   const hasValue = html.trim().length > 0;
-
-  // const filtered = column.getIsFiltered()
-
-  // const { attributes, isDragging, listeners, setNodeRef, transform } =
-  //   useSortable({
-  //     id: column.id,
-  //   })
-
   const style = {
     transition: 'width transform 0.2s ease-in-out',
     whiteSpace: 'nowrap',
@@ -104,13 +88,6 @@ const TableHeadGroupCell = props => {
     onDoubleClick: () => column.resetSize(),
     onMouseDown: header.getResizeHandler(),
     onTouchStart: header.getResizeHandler(),
-    // onMouseUp: () => {
-    //   requestAnimationFrame(() => {
-    //     columnVirtualizer.measure()
-    //     // rowHeaderVirtualizer.measure()
-    //   })
-    // },
-
     className: `resizer ${column.getIsResizing() ? 'isResizing' : ''}`
   }));
 };

package/es/table-component/header/renderFilter.d.ts

@@ -1,6 +1,6 @@
 import type { ColumnDef } from "@tanstack/react-table";
 import React from "react";
-import type { IFormat } from "../type";
+import type { IFormat } from "../../grid-component/type";
 type RenderFilterProps<RecordType> = {
     column: ColumnDef<RecordType, unknown>;
     selectedKeys: any[];

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

@@ -1,5 +1,5 @@
 import type { Dispatch, SetStateAction } from "react";
-import type { ColumnsTable, ColumnTable, IFormat, SelectionSettings } from '../type';
+import type { ColumnsTable, ColumnTable, IFormat, SelectionSettings } from '../../grid-component/type';
 import type { Cell, ColumnDef } from '@tanstack/react-table';
 export declare const renderValueCell: <T>(column: ColumnTable<T>, value: any, record: T, rowIndex: number, colIndex: number, format?: IFormat, editAble?: boolean) => any;
 export declare function convertToTanStackColumns<T>({ t, columns, format, editAble }: {

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

@@ -1,5 +1,5 @@
-import { Table } from '@tanstack/react-table';
-import type { FilterOperator } from '../type';
+import type { Table } from '@tanstack/react-table';
+import type { FilterOperator } from '../../grid-component/type';
 export declare function useFilterOperator(table: Table<any>): {
     setFilterOperator: (columnId: string, operator: FilterOperator) => void;
     getFilterOperator: (columnId: string) => FilterOperator;

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

@@ -1,7 +1,7 @@
 import type { Row, Table } from "@tanstack/react-table";
 import { type Column } from "@tanstack/react-table";
 import type { VirtualItem } from "@tanstack/react-virtual";
-import type { AnyObject, ColumnsTable, ColumnTable, EditType, FilterOperator, IColumnType, IFormat, RangeState, Sorter, TypeFilter } from "./../type";
+import type { AnyObject, ColumnsTable, ColumnTable, EditType, FilterOperator, IColumnType, IFormat, RangeState, Sorter, TypeFilter } from "./../../grid-component/type";
 import type { Key } from "react";
 import { type CSSProperties } from "react";
 import dayjs from "dayjs";

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

@@ -1,8 +1,5 @@
-// import { SELECTION_COLUMN } from "rc-master-ui/es/table/hooks/useSelection"
 import { v4 as uuidv4 } from 'uuid';
 import { presetPalettes } from "@ant-design/colors";
-// import moment from "moment/moment"
-
 import dayjs from "dayjs";
 import moment from "moment";
 export const newGuid = () => {

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

@@ -1,4 +1,4 @@
 import InternalTable from './InternalTable';
-import type { ColumnsTable, TableProps, ColumnTable, ContextMenuItem } from './type';
+import type { ColumnsTable, TableProps, ColumnTable, ContextMenuItem } from './../grid-component/type';
 export type { ColumnsTable, TableProps, ColumnTable, ContextMenuItem };
 export default InternalTable;

package/es/table-component/index.js

@@ -1,5 +1,2 @@
 import InternalTable from "./InternalTable";
-
-// import type {ToolbarItem} from "rc-master-ui/es/toolbar"
-
 export default InternalTable;

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

@@ -1,5 +1,5 @@
 import type { ColumnDef, ColumnPinningState, ExpandedState, VisibilityState } from '@tanstack/react-table';
-import type { ColumnsTable, Sorter, TableProps } from '../type';
+import type { ColumnsTable, Sorter, TableProps } from '../../grid-component/type';
 import type { Dispatch, Key, SetStateAction } from 'react';
 import React from 'react';
 type Props<T> = Omit<TableProps<T>, 'columns'> & {

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

@@ -11,11 +11,6 @@ useReactTable } from '@tanstack/react-table';
 import { DndContext, KeyboardSensor, MouseSensor, TouchSensor, closestCenter, useSensor, useSensors } from '@dnd-kit/core';
 import { restrictToHorizontalAxis } from '@dnd-kit/modifiers';
 import { arrayMove } from '@dnd-kit/sortable';
-
-// import {  flattenArray, getFixedFields, getInvisibleColumns, unFlattenData, updateOrInsert } from './hook/utils'
-
-// import { faker } from '@faker-js/faker'
-
 import React, { Fragment } from 'react';
 import TableContainer from "../TableContainer";
 import { OperatorFeature } from "../features/operator";

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

@@ -1,5 +1,5 @@
 import { type Table } from "@tanstack/react-table";
-import type { CommandClick, ContextInfo, ContextMenuItem, PaginationConfig } from "../type";
+import type { CommandClick, ContextInfo, ContextMenuItem, PaginationConfig } from "../../grid-component/type";
 import React from "react";
 import type { Virtualizer } from "@tanstack/react-virtual";
 import type { Column } from "@tanstack/react-table";

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

@@ -1,5 +1,5 @@
 import type { Dispatch, SetStateAction } from 'react';
-import type { ColumnTable, ExpandableConfig, IFormat, IWrapSettings, Locale, PaginationConfig, RangeState, RecordDoubleClickEventArgs, RowClassName, SelectionSettings } from "./type";
+import type { ColumnTable, ExpandableConfig, IFormat, IWrapSettings, Locale, PaginationConfig, RangeState, RecordDoubleClickEventArgs, RowClassName, SelectionSettings, SourceFilter } from "./../grid-component/type";
 import type { SubmitHandler } from "react-hook-form";
 import type { ExpandedState, Row, Table } from '@tanstack/react-table';
 export type IPositionCell = {
@@ -82,6 +82,7 @@ export interface IContext<T> {
     onRowStyles?: Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'> | ((data: T, row: Row<T>) => Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'>);
     onRowHeaderStyles?: Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'> | (() => Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'>);
     onRowFooterStyles?: Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'> | (() => Omit<React.CSSProperties, 'display' | 'transform' | 'gridTemplateColumns' | 'height' | 'minHeight'>);
+    dataSourceFilter?: SourceFilter[];
 }
 export declare const TableContext: import("react").Context<IContext<any>>;
 export type ContextCellChange = {

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

@@ -2,7 +2,7 @@ import React from 'react';
 import 'react-resizable/css/styles.css';
 import 'dayjs/locale/es';
 import 'dayjs/locale/vi';
-import type { TableProps } from '../table-component/type';
+import type { TableProps } from '../grid-component/type';
 export declare const SELECTION_COLUMN: {};
 declare const InternalTable: <RecordType extends object>(props: TableProps<RecordType>) => React.JSX.Element;
 export default InternalTable;

package/es/table-virtuoso/InternalTable.js

@@ -9,11 +9,12 @@ 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 { convertToTanStackColumns } from './hook/useColumns'
 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 { convertToTanStackColumns } from "../table-component/hook/useColumns";
 dayjs.extend(customParseFormat);
 export const SELECTION_COLUMN = {};
 const InternalTable = props => {

package/es/table-virtuoso/body/TableBodyCell.d.ts

@@ -1,5 +1,5 @@
 import type { Cell, Table } from "@tanstack/react-table";
-import type { CommandClick } from "../../table-component/type";
+import type { CommandClick } from "../../grid-component/type";
 import React from "react";
 import type { VirtualItem } from "@tanstack/react-virtual";
 interface TableBodyCellProps<T> {

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

@@ -6,8 +6,8 @@ import Checkbox from "rc-master-ui/es/checkbox/Checkbox";
 import classNames from "classnames";
 import React from "react";
 import { TableContext } from "../useContext";
-import { toggleRowSelection } from "../hook/useColumns";
 import Command from "../../table-component/components/command/Command";
+import { toggleRowSelection } from "../../table-component/hook/useColumns";
 const renderCellIndex = props => {
   const {
     cell,

package/es/table-virtuoso/body/TableBodyRow.d.ts

@@ -1,5 +1,5 @@
 import { type Row, type Table } from "@tanstack/react-table";
-import type { CommandClick } from "../../table-component/type";
+import type { CommandClick } from "../../grid-component/type";
 import React from "react";
 interface TableBodyRowProps<T> {
     tableId: string;
@@ -9,5 +9,5 @@ interface TableBodyRowProps<T> {
     editAble?: boolean;
     [key: string]: any;
 }
-declare const TableBodyRow: <RecordType extends object>({ tableId, table, row, virtualRow, commandClick, contextMenuItems, onContextMenu, ...rest }: TableBodyRowProps<RecordType>) => React.JSX.Element;
+declare const TableBodyRow: <RecordType extends object>({ tableId, table, row, virtualRow, commandClick, contextMenuItems, onContextMenu, rowheight, ...rest }: TableBodyRowProps<RecordType>) => React.JSX.Element;
 export default TableBodyRow;

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

@@ -12,6 +12,7 @@ const TableBodyRow = ({
   commandClick,
   contextMenuItems,
   onContextMenu,
+  rowheight,
   ...rest
 }) => {
   const {
@@ -36,7 +37,8 @@ const TableBodyRow = ({
       [`${prefix}-grid-row-parent`]: row.subRows && row.subRows.length > 0
     }),
     style: {
-      ...rowStyles
+      ...rowStyles,
+      height: rowheight
     },
     onDoubleClick: e => {
       recordDoubleClick?.({

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

@@ -4,13 +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 { extendsObject, getCommonPinningHeaderStyles, getDefaultOperator, getTypeFilter } from "../hook/utils";
 import { renderFilter } from "./renderFilter";
 import ReactDOMServer from 'react-dom/server';
 import { TableContext } from "../useContext";
-// import type { MenuProps } from 'rc-master-ui/es'
-
+import { booleanOperator, nonActionColumn, numberOperator, stringOperator, translateOption } from "../../grid-component/hooks";
 const TableHeadCell = props => {
   const {
     header,