es-grid-template 1.8.66 → 1.8.68

package/es/table-component/TableContainerEdit.js

@@ -13,7 +13,7 @@ import { TableContext } from "./useContext";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { Toolbar } from "rc-master-ui";
 import classNames from "classnames";
-import { Maximize, Minimize, Plus, Trash2 } from "becoxy-icons";
+import { Maximize, Minimize } from "becoxy-icons";
 import { ColumnsChoose } from "./ColumnsChoose";
 import TableWrapper from "./table/TableWrapper";
 import withReactContent from "sweetalert2-react-content";
@@ -77,7 +77,7 @@ const TableContainerEdit = props => {
     isSelectionChange,
     setIsSelectionChange,
     // onContextMenu,
-    contextMenuItems: propsContext,
+    contextMenuItems,
     setSorterChange,
     setFilterChange,
     onCellPaste,
@@ -117,7 +117,6 @@ const TableContainerEdit = props => {
     contextMenuOpen,
     contextMenuClick,
     contextMenuHidden,
-    showDefaultContext,
     commandSettings,
     isDataTree,
     onCellClick,
@@ -126,7 +125,8 @@ const TableContainerEdit = props => {
     columnSizing,
     columnSizingInfo,
     rowClassName,
-    onRowStyles
+    onRowStyles,
+    dataSourceFilter
   } = props;
   const containerRef = React.useRef(null);
   const bottomToolbarRef = React.useRef(null);
@@ -141,123 +141,6 @@ const TableContainerEdit = props => {
 
   // const columnSizingState = table.getState().columnSizing;
 
-  const defaultContext = React.useMemo(() => {
-    return [{
-      key: 'INSERT_BEFORE',
-      // label: 'Thêm dòng bên trên',
-      // label: `${t ? t(locale?.add_rows_before ?? 'Add rows before') : 'Add rows before'}`,
-      label: locale?.add_rows_before ?? 'Add rows before',
-      icon: /*#__PURE__*/React.createElement(Plus, {
-        fontSize: 14
-      }),
-      children: [{
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_1',
-        label: locale?.add_1 ?? 'Add 1 rows',
-        row: 1
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_10',
-        label: locale?.add_10 ?? 'Add 10 rows',
-        row: 10
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_50',
-        label: locale?.add_50 ?? 'Add 50 rows',
-        row: 50
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_100',
-        label: locale?.add_100 ?? 'Add 100 rows',
-        row: 100
-      }, {
-        parentKey: 'INSERT_BEFORE',
-        key: 'INSERT_BEFORE_ADV',
-        label: locale?.custom ?? 'Custom'
-      }]
-    }, {
-      key: 'INSERT_AFTER',
-      label: locale?.add_rows_after ?? 'Add rows after',
-      icon: /*#__PURE__*/React.createElement(Plus, {
-        fontSize: 14
-      }),
-      children: [{
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_1',
-        label: locale?.add_1 ?? 'Add 1 rows',
-        row: 1
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_10',
-        label: locale?.add_10 ?? 'Add 10 rows',
-        row: 10
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_50',
-        label: locale?.add_50 ?? 'Add 50 rows',
-        row: 50
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_100',
-        label: locale?.add_100 ?? 'Add 100 rows',
-        row: 100
-      }, {
-        parentKey: 'INSERT_AFTER',
-        key: 'INSERT_AFTER_ADV',
-        label: locale?.custom ?? 'Custom'
-      }]
-    }, {
-      key: 'INSERT_CHILDREN',
-      // label: 'Insert item children',
-      label: locale?.add_children ?? 'Add children',
-      icon: /*#__PURE__*/React.createElement(Plus, {
-        fontSize: 14
-      })
-      // children: [
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_1',
-      //     label: 'Thêm 1 dòng',
-      //     row: 1
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_10',
-      //     label: 'Thêm 10 dòng',
-      //     row: 10
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_50',
-      //     label: 'Thêm 50 dòng',
-      //     row: 50
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_100',
-      //     label: 'Thêm 100 dòng',
-      //     row: 100
-      //   },
-      //   {
-      //     parentKey: 'INSERT_AFTER',
-      //     key: 'INSERT_AFTER_ADV',
-      //     label: 'Tùy chỉnh'
-      //   }
-      // ]
-    }, {
-      key: 'DELETE_CONTENT',
-      label: locale?.delete_content ?? 'Delete content',
-      icon: /*#__PURE__*/React.createElement(Trash2, {
-        fontSize: 14
-      })
-    }, {
-      key: 'DELETE_ROWS',
-      label: locale?.delete_rows ?? 'Delete rows',
-      icon: /*#__PURE__*/React.createElement(Trash2, {
-        fontSize: 14
-      })
-    }];
-  }, [locale]);
   const itemsAdd = React.useMemo(() => {
     return [{
       key: '10',
@@ -270,13 +153,6 @@ const TableContainerEdit = props => {
       label: `100 ${t ? t('rows') : 'rows'}`
     }];
   }, [t]);
-  const contextMenuItems = React.useMemo(() => {
-    const a = showDefaultContext !== false ? [...defaultContext] : [];
-    const b = propsContext && propsContext.length > 0 ? [...propsContext, {
-      type: 'divider'
-    }] : [];
-    return [...b, ...a];
-  }, [defaultContext, propsContext, showDefaultContext]);
   const [dataErrors, setDataErrors] = React.useState([]);
   React.useEffect(() => {
     if (validate && dataSource && dataSource.length) {
@@ -2026,7 +1902,8 @@ const TableContainerEdit = props => {
       pagination,
       rowClassName,
       rowEditable,
-      onRowStyles
+      onRowStyles,
+      dataSourceFilter
     }
   }, /*#__PURE__*/React.createElement(TableWrapper, {
     contextMenuItems: contextMenuItems,

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

@@ -1,6 +1,6 @@
 import React from "react";
 import type { EditType } from "rc-master-ui";
-import type { ColumnTable, IFormat } from "../type";
+import type { ColumnTable, IFormat } from "../../grid-component/type";
 interface EditableCellProps<DataType> extends React.HTMLAttributes<HTMLElement> {
     t?: any;
     dataIndex: string;

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/TableBodyCellEdit.js

@@ -2,21 +2,14 @@ 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 { addRowsDown, addRowsDownWithCtrl, addRowsUp, addRowsUpWithCtrl, findFirst, flattenArray, flattenData,
-// getCellsByPosition,
-getColIdsBetween, getCommonPinningStyles, getEditType, getRowIdsBetween, getSelectedCellMatrix, isEditable, isObjEmpty, isObjEqual, newGuid, unFlattenData, updateOrInsert } from "../hook/utils";
-// import { nonActionColumn } from "../hook/constant";
+import { addRowsDown, addRowsDownWithCtrl, addRowsUp, addRowsUpWithCtrl, findFirst, flattenArray, flattenData, getColIdsBetween, getCommonPinningStyles, getEditType, getRowIdsBetween, getSelectedCellMatrix, isEditable, isObjEmpty, isObjEqual, newGuid, unFlattenData, updateOrInsert } from "../hook/utils";
 import Checkbox from "rc-master-ui/es/checkbox/Checkbox";
 import classNames from "classnames";
-// import type { Dispatch, SetStateAction } from "react";
-
 import React from "react";
 import { TableContext } from "../useContext";
 import EditableCell from "./EditableCell";
-import { nonActionColumn } from "../hook/constant";
+import { nonActionColumn } from "../../grid-component/hooks";
 import { toggleRowSelection } from "../hook/useColumns";
-// import { nonActionColumn } from "../hook/constant";
-
 const renderCellIndex = props => {
   const {
     parrents,

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

@@ -1,33 +1,19 @@
-// 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,
     getPopupContainer,
     table
-    // t,
-    // columnVirtualizer,
-    // rowHeaderVirtualizer,
-    // colSpan,
-    // rowSpan
   } = props;
   const {
     t,

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,
@@ -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,