es-grid-template 1.3.0 → 1.3.2

package/assets/index.css

@@ -42,6 +42,12 @@
 .ui-rc-table-wrapper .ui-rc-table-bordered .ui-rc-table-tbody-virtual .ui-rc-table-cell {
   border-inline-end: 1px solid #e0e0e0;
 }
+.ui-rc-table-wrapper .ui-rc-table-tbody .ui-rc-table-cell {
+  line-height: 22px;
+}
+.ui-rc-table-wrapper .ui-rc-table-tbody .ui-rc-table-cell .ui-rc-table-cell-content {
+  line-height: 22px;
+}
 .ui-rc-table-wrapper .ui-rc-table-tbody .ui-rc-table-row.ui-rc-table-row-selected > .ui-rc-table-cell {
   background: #FEF2EF;
 }
@@ -102,6 +108,9 @@
   border-bottom: 1px solid #e0e0e0;
   font-weight: 500;
 }
+.ui-rc-table-wrapper .ui-rc-table-thead .ui-rc-table-cell .ui-rc-table-cell-content {
+  line-height: 22px;
+}
 .ui-rc-table-wrapper .ui-rc-table-summary .ui-rc-table-cell {
   background-color: #fafafa;
   height: 39px;
@@ -176,6 +185,9 @@
   inset-inline-start: -1px;
 }
 
+.ui-rc-table-wrapper .ui-rc-table.ui-rc-table-small .ui-rc-table-thead > tr > th.ui-rc-table-selection-column {
+  padding: 0;
+}
 .ui-rc-table-wrapper.grid-editable .ui-rc-table .ui-rc-table-tbody .rc-ui-cell-editable {
   overflow: unset;
   display: flex;
@@ -276,6 +288,9 @@
 .ui-rc-table-wrapper.grid-editable .ui-rc_cell-content.selected {
   background-color: #E6EFFD;
 }
+.ui-rc-table-wrapper.grid-editable .ui-rc_cell-content.disable {
+  background-color: #f0f0f0;
+}
 .ui-rc-table-wrapper.grid-editable .ui-rc_cell-content--index.focus {
   background-color: #CEDBEF;
 }
@@ -471,6 +486,7 @@
   transition: 0.3s;
   white-space: nowrap;
   overflow: hidden;
+  line-height: 22px;
 }
 .ui-rc-table-wrapper.grid-editable .ui-rc-table-tbody .ui-rc-table-cell.cell-editing:focus-visible {
   outline: none;

package/assets/index.scss

@@ -133,6 +133,21 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 
   .#{$prefix}-table-tbody {
 
+
+    .#{$prefix}-table-cell {
+      line-height: 22px;
+
+      .ui-rc-table-cell-content {
+        line-height: 22px;
+      }
+
+      &.#{$prefix}-table-cell-fix-left-last {
+        .#{$prefix}-table-cell-content {
+        }
+      }
+
+    }
+
     .#{$prefix}-table-row {
 
       &.#{$prefix}-table-row-selected {
@@ -205,11 +220,17 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
         border-bottom: 1px solid $tableBorderColor;
         //background: #fff;
         font-weight: 500;
+        //line-height: 23px;
+        //height: 40px;
       }
     }
 
     .#{$prefix}-table-cell {
 
+      .ui-rc-table-cell-content {
+        line-height: 22px;
+      }
+
       &.#{$prefix}-table-cell-fix-left-last {
         .#{$prefix}-table-cell-content {
           //overflow: visible;
@@ -336,10 +357,18 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
 .#{$prefix}-table-wrapper {
 
   .#{$prefix}-table.#{$prefix}-table-small {
-    .#{$prefix}-table-selection-column{
-      //padding: 8px 8px;
-      //padding: 6px 8px;
+    .ui-rc-table-thead {
+      >tr >th.#{$prefix}-table-selection-column{
+        //padding-block: 7px;
+        padding: 0;
+        //padding: 6px 8px;
+      }
     }
+    //.#{$prefix}-table-selection-column{
+    //  padding-block: 7px;
+    //  padding: 0;
+    //  //padding: 6px 8px;
+    //}
   }
 
   &.grid-editable {
@@ -594,6 +623,10 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
       background-color: $cell-selected-bg;
     }
 
+    .ui-rc_cell-content.disable {
+      background-color: #f0f0f0;
+    }
+
     .ui-rc_cell-content--index {
       &.focus {
         background-color: $cell-index-focus-bg;
@@ -678,6 +711,7 @@ $fontFamily: "Montserrat",Helvetica,Arial,serif !default;
               transition: 0.3s;
               white-space: nowrap;
               overflow: hidden;
+              line-height: 22px;
             }
           }
         }

package/es/grid-component/CheckboxFilter.js

@@ -79,6 +79,7 @@ const CheckboxFilter = props => {
 
   // const [searchValue, setSearchValue] = React.useState('');
 
+  console.log('options', options);
   const [openKeys, setOpenKeys] = React.useState([]);
 
   // clear search value after close filter dropdown
@@ -171,6 +172,9 @@ const CheckboxFilter = props => {
       onSelect?.(keys);
     }
   };
+  console.log('getTreeData({ filters: options })', getTreeData({
+    filters: options
+  }));
   if (filterMode === 'tree') {
     return /*#__PURE__*/React.createElement(React.Fragment, null, showFilter && /*#__PURE__*/React.createElement(FilterSearch, {
       filterSearch: filterSearch,

package/es/grid-component/CheckboxFilter2.d.ts

@@ -0,0 +1,20 @@
+import * as React from "react";
+import type { TableLocale } from "rc-master-ui/es/table/interface";
+type Props = {
+    options: any[];
+    filterSearch?: boolean;
+    open?: boolean;
+    tablePrefixCls?: string;
+    prefixCls?: string;
+    dropdownPrefixCls?: string;
+    filterMultiple: boolean;
+    showFilter?: boolean;
+    onSelect?: (value: any) => void;
+    selectedKeys: string[];
+    locale?: TableLocale;
+    filterMode?: 'menu' | 'tree';
+    searchValue: string;
+    setSearchValue: (value: any) => void;
+};
+declare const CheckboxFilter: (props: Props) => React.JSX.Element;
+export default CheckboxFilter;

package/es/grid-component/CheckboxFilter2.js

@@ -0,0 +1,248 @@
+import * as React from "react";
+import classNames from "classnames";
+import FilterSearch from "./FilterSearch";
+import { Checkbox, Menu, Radio, Empty } from "rc-master-ui";
+import { Tree } from "antd";
+import { flattenKeys } from "rc-master-ui/es/table/hooks/useFilter";
+// import Tree from "rc-master-ui/es/tree";
+
+function searchValueMatched(searchValue, text) {
+  if (typeof text === 'string' || typeof text === 'number') {
+    return text?.toString().toLowerCase().includes(searchValue.trim().toLowerCase());
+  }
+  return false;
+}
+function renderFilterItems({
+  filters,
+  prefixCls,
+  filteredKeys,
+  filterMultiple,
+  searchValue,
+  filterSearch
+}) {
+  return filters.map((filter, index) => {
+    const key = String(filter.value);
+    if (filter.children) {
+      return {
+        key: key || index,
+        label: filter.text,
+        popupClassName: `${prefixCls}-dropdown-submenu`,
+        children: renderFilterItems({
+          filters: filter.children,
+          prefixCls,
+          filteredKeys,
+          filterMultiple,
+          searchValue,
+          filterSearch
+        })
+      };
+    }
+    const Component = filterMultiple ? Checkbox : Radio;
+    const item = {
+      key: filter.value !== undefined ? key : index,
+      label: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Component, {
+        checked: filteredKeys.includes(key)
+      }), /*#__PURE__*/React.createElement("span", null, filter.text))
+    };
+    if (searchValue.trim()) {
+      if (typeof filterSearch === 'function') {
+        return filterSearch(searchValue, filter) ? item : null;
+      }
+      return searchValueMatched(searchValue, filter.text) ? item : null;
+    }
+    return item;
+  });
+}
+function hasSubMenu(filters) {
+  return filters.some(({
+    children
+  }) => children);
+}
+const CheckboxFilter = props => {
+  const {
+    // column,
+    filterSearch = true,
+    tablePrefixCls = 'ui-rc-table',
+    prefixCls = 'ui-rc-table-filter',
+    dropdownPrefixCls = 'ui-rc-dropdown',
+    filterMultiple,
+    selectedKeys,
+    locale,
+    options,
+    filterMode = 'tree',
+    // open,
+    searchValue,
+    showFilter,
+    setSearchValue,
+    onSelect
+  } = props;
+
+  // const [searchValue, setSearchValue] = React.useState('');
+
+  console.log('options', options);
+  const [openKeys, setOpenKeys] = React.useState([]);
+
+  // clear search value after close filter dropdown
+  // React.useEffect(() => {
+  //   // if (visible) {
+  //     setSearchValue('');
+  //   // }
+  // }, [open]);
+
+  const onOpenChange = keys => {
+    setOpenKeys(keys);
+  };
+  const items = renderFilterItems({
+    // filters: column.filters || [],
+    filters: options || [],
+    filterSearch,
+    prefixCls,
+    filteredKeys: selectedKeys ?? [],
+    filterMultiple,
+    searchValue
+  });
+  const dropdownMenuClass = classNames({
+    // [`${dropdownPrefixCls}-menu-without-submenu`]: !hasSubMenu(column.filters || []),
+    [`${dropdownPrefixCls}-menu-without-submenu`]: !hasSubMenu(options || [])
+  });
+  const empty = /*#__PURE__*/React.createElement(Empty, {
+    image: Empty.PRESENTED_IMAGE_SIMPLE,
+    description: locale?.filterEmptyText,
+    imageStyle: {
+      height: 24
+    },
+    style: {
+      margin: 0,
+      padding: '16px 0'
+    }
+  });
+  const isEmpty = items.every(item => item === null);
+  const onSearch = e => {
+    const {
+      value
+    } = e.target;
+    setSearchValue(value);
+  };
+
+  // if ((column.filters || []).length === 0) {
+  //   return empty;
+  // }
+
+  const getTreeData = ({
+    filters
+  }) => (filters || []).map((filter, index) => {
+    const key = String(filter.value);
+    const item = {
+      title: filter.text,
+      key: filter.value !== undefined ? key : String(index)
+    };
+    if (filter.children) {
+      item.children = getTreeData({
+        filters: filter.children
+      });
+    }
+    return item;
+  });
+  const getFilterData = node => ({
+    ...node,
+    text: node.title,
+    value: node.key,
+    children: node.children?.map(item => getFilterData(item)) || []
+  });
+  const onCheckAll = e => {
+    if (e.target.checked) {
+      const allFilterKeys = flattenKeys(options).map(key => String(key));
+
+      // setFilteredKeysSync(allFilterKeys);
+      onSelect?.(allFilterKeys);
+    } else {
+      onSelect?.([]);
+      // setFilteredKeysSync([]);
+    }
+  };
+  const onCheck = (keys, {
+    node,
+    checked
+  }) => {
+    if (!filterMultiple) {
+      // onSelectKeys({ selectedKeys: checked && node.key ? [node.key] : [] });
+      onSelect?.(checked && node.key ? [node.key] : []);
+    } else {
+      // onSelectKeys({ selectedKeys: keys });
+      onSelect?.(keys);
+    }
+  };
+  console.log('getTreeData({ filters: options })', getTreeData({
+    filters: options
+  }));
+  if (filterMode === 'tree') {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, showFilter && /*#__PURE__*/React.createElement(FilterSearch, {
+      filterSearch: filterSearch,
+      value: searchValue,
+      onChange: onSearch,
+      tablePrefixCls: tablePrefixCls,
+      locale: locale
+    }), /*#__PURE__*/React.createElement("div", {
+      className: `${tablePrefixCls}-filter-dropdown-tree`
+    }, filterMultiple && options.length > 0 ? /*#__PURE__*/React.createElement(Checkbox
+    // checked={selectedKeys.length === flattenKeys(column.filters).length}
+    , {
+      checked: selectedKeys.length === flattenKeys(options).length
+      // indeterminate={
+      //   selectedKeys.length > 0 &&
+      //   selectedKeys.length < flattenKeys(column.filters).length
+      // }
+      ,
+
+      indeterminate: selectedKeys.length > 0 && selectedKeys.length < flattenKeys(options).length,
+      className: `${tablePrefixCls}-filter-dropdown-checkall`,
+      onChange: onCheckAll
+    }, locale?.filterCheckall) : /*#__PURE__*/React.createElement(Empty, null), /*#__PURE__*/React.createElement(Tree, {
+      checkable: true,
+      selectable: false,
+      blockNode: true,
+      multiple: filterMultiple,
+      checkStrictly: !filterMultiple,
+      className: `${dropdownPrefixCls}-menu`,
+      onCheck: onCheck,
+      checkedKeys: selectedKeys,
+      selectedKeys: selectedKeys,
+      showIcon: false
+      // treeData={getTreeData({ filters: column.filters })}
+      ,
+      treeData: getTreeData({
+        filters: options
+      }),
+      autoExpandParent: true,
+      defaultExpandAll: true,
+      filterTreeNode: searchValue.trim() ? node => {
+        if (typeof filterSearch === 'function') {
+          // @ts-ignore
+          return filterSearch(searchValue, getFilterData(node));
+        }
+        return searchValueMatched(searchValue, node.title);
+      } : undefined
+    })));
+  }
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FilterSearch, {
+    filterSearch: filterSearch,
+    value: searchValue,
+    onChange: onSearch,
+    tablePrefixCls: tablePrefixCls,
+    locale: locale
+  }), isEmpty ? empty : /*#__PURE__*/React.createElement(Menu, {
+    selectable: true,
+    multiple: filterMultiple,
+    prefixCls: `${dropdownPrefixCls}-menu`,
+    className: dropdownMenuClass,
+    onSelect: onSelect,
+    onDeselect: onSelect,
+    selectedKeys: selectedKeys
+    // getPopupContainer={getPopupContainer}
+    ,
+    openKeys: openKeys,
+    onOpenChange: onOpenChange,
+    items: items
+  }));
+};
+export default CheckboxFilter;

package/es/grid-component/ColumnsGroup/ColumnsGroup.js

@@ -33,7 +33,7 @@ export const ColumnsGroup = props => {
     return rsCol.map(it => ({
       ...it,
       value: it.field,
-      label: t ? t(it.columnGroupText ?? it.headerText ?? it.title) : it.columnGroupText ?? it.headerText ?? it.title
+      label: t ? t(it?.columnGroupText ?? it?.headerText) : it?.columnGroupText ?? it?.headerText
     }));
   }, [rsCol, t]);
 
@@ -136,7 +136,7 @@ export const ColumnsGroup = props => {
       ,
       labelRender: labelProps => {
         const it = columns.find(col => col.field === labelProps.value);
-        return t ? t(it.columnGroupText ?? it.headerText ?? it.title) : it.columnGroupText ?? it.headerText ?? it.title;
+        return t ? t(it?.columnGroupText ?? it?.headerText) : it?.columnGroupText ?? it?.headerText;
       }
       // hideSelectedOptions
     })), /*#__PURE__*/React.createElement("div", {
@@ -165,7 +165,7 @@ export const ColumnsGroup = props => {
       ,
       labelRender: labelProps => {
         const it = columns.find(col => col.field === labelProps.value);
-        return t ? t(it.columnGroupText ?? it.headerText ?? it.title) : it.columnGroupText ?? it.headerText ?? it.title;
+        return t ? t(it?.columnGroupText ?? it?.headerText) : it?.columnGroupText ?? it?.headerText;
       }
     })), /*#__PURE__*/React.createElement("div", {
       className: 'mb-1',
@@ -192,7 +192,7 @@ export const ColumnsGroup = props => {
       ,
       labelRender: labelProps => {
         const it = columns.find(col => col.field === labelProps.value);
-        return t ? t(it.columnGroupText ?? it.headerText ?? it.title) : it.columnGroupText ?? it.headerText ?? it.title;
+        return t ? t(it?.columnGroupText ?? it?.headerText) : it?.columnGroupText ?? it?.headerText;
       }
     }))), /*#__PURE__*/React.createElement(BoxAction, {
       className: 'px-1'

package/es/grid-component/ContextMenu.js

@@ -83,6 +83,7 @@ const ContextMenu = props => {
     React.createElement(Dropdown, {
       placement: 'topRight',
       open: open,
+      overlayClassName: 'be-popup-container',
       overlayStyle: {
         left: `${pos.x}px`,
         top: `${pos.y}px`

package/es/grid-component/ConvertColumnTable.js

@@ -104,6 +104,7 @@ const ConvertColumnTable = props => {
     locale,
     t,
     buddhistLocale,
+    dataSource,
     dataSourceFilter: propDataSourceFilter,
     format,
     sortMultiple,

package/es/grid-component/EditableCell.js

@@ -125,7 +125,7 @@ const EditableCell = props => {
               });
             }
           },
-          placeholder: column.placeholder,
+          placeholder: t ? t(column.placeholder ?? 'Select') : column.placeholder ?? 'Select',
           disabled: isDisable(column, record) ?? false,
           maxDate: maxDate,
           minDate: minDate
@@ -165,7 +165,7 @@ const EditableCell = props => {
           },
           showTime: true,
           value: date,
-          placeholder: column.placeholder,
+          placeholder: t ? t(column.placeholder ?? 'Select') : column.placeholder ?? 'Select',
           disabled: isDisable(column, record) ?? false,
           maxDate: maxDate,
           minDate: minDate,
@@ -216,7 +216,7 @@ const EditableCell = props => {
             height: '100%'
           },
           picker: editType,
-          placeholder: column.placeholder,
+          placeholder: t ? t(column.placeholder ?? 'Select') : column.placeholder ?? 'Select',
           disabled: isDisable(column, record) ?? false,
           maxDate: maxDateValue1,
           minDate: minDateValue1,
@@ -233,7 +233,7 @@ const EditableCell = props => {
             height: '100%'
           },
           picker: editType,
-          placeholder: column.placeholder,
+          placeholder: t ? t(column.placeholder ?? 'Select') : column.placeholder ?? 'Select',
           disabled: isDisable(column, record) ?? false,
           maxDate: maxWeekValue,
           minDate: minWeekValue,
@@ -253,6 +253,7 @@ const EditableCell = props => {
             format: timeFormat,
             type: 'mask'
           },
+          placeholder: t ? t(column.placeholder ?? 'Select') : column.placeholder ?? 'Select',
           maxDate: maxTime,
           minDate: minTime,
           disabled: isDisable(column, record) ?? false,
@@ -326,7 +327,7 @@ const EditableCell = props => {
           defaultOpen: column.field === cellEditing?.column.field
           // autoFocus={true}
           ,
-          placeholder: t ? t('Select') : 'Select',
+          placeholder: t ? t(column.placeholder ?? 'Select') : column.placeholder ?? 'Select',
           allowClear: column.isClearable ?? false,
           maxTagCount: 'responsive',
           rowKey: keySelect,
@@ -406,7 +407,7 @@ const EditableCell = props => {
             width: '100%',
             height: '100%'
           },
-          placeholder: t ? t('Select') : 'Select',
+          placeholder: t ? t(column.placeholder ?? 'Select') : column.placeholder ?? 'Select',
           allowClear: column.isClearable ?? false,
           maxTagCount: 'responsive',
           popupMatchSelectWidth: menuWidth ? menuWidth + 10 : undefined,
@@ -460,7 +461,7 @@ const EditableCell = props => {
             width: '100%',
             height: '100%'
           },
-          placeholder: t ? t('Select') : 'Select',
+          placeholder: t ? t(column.placeholder ?? 'Select') : column.placeholder ?? 'Select',
           allowClear: column.isClearable ?? false,
           maxTagCount: 'responsive',
           popupMatchSelectWidth: menuWidth ? menuWidth + 10 : undefined,
@@ -530,7 +531,7 @@ const EditableCell = props => {
             overflow: 'auto'
           },
           treeData: newTreeData,
-          placeholder: t ? t('Select') : 'Select',
+          placeholder: t ? t(column.placeholder ?? 'Select') : column.placeholder ?? 'Select',
           treeDefaultExpandAll: true,
           defaultOpen: column.field === cellEditing?.column.field
           // autoFocus={true}
@@ -744,6 +745,7 @@ const EditableCell = props => {
           customInput: Input
           // valueIsNumericString={true}
           ,
+          placeholder: t ? t(column.placeholder ?? 'Enter') : column.placeholder ?? 'Enter',
           autoComplete: 'off',
           className: classNames('be-cell-editing  rounded-0 input-element', {
             'is-invalid': isInvalid,
@@ -787,6 +789,7 @@ const EditableCell = props => {
           ,
           disabled: isDisable(column, record) ?? false,
           className: classNames('be-cell-editing rounded-0 input-element'),
+          placeholder: t ? t(column.placeholder ?? 'Enter') : column.placeholder ?? 'Enter',
           value: !isNullOrUndefined(value) ? value : '',
           onBlur: () => {
             const formState = getValues();

package/es/grid-component/InternalTable.js

@@ -3,9 +3,14 @@ import React from 'react';
 import { Resizable } from "react-resizable";
 import 'react-resizable/css/styles.css';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
-import { addRowIdArray, findItemByKey,
+import { addRowIdArray,
+// filterDataByColumns,
+// filterDataByColumns2,
+// filterDataByColumns3,
+findItemByKey,
 // convertFlatColumn,
 removeColumns,
+// removeFieldRecursive,
 // addRowIdArray,
 updateArrayByKey, updateColumnsByGroup, updateData } from "./hooks";
 import dayjs from "dayjs";
@@ -65,7 +70,8 @@ const InternalTable = props => {
     dataSource,
     allowResizing,
     dataSourceFilter: propDataSourceFilter,
-    onFilterClick,
+    // onFilterClick,
+    // onFilter,
     editAble,
     rowKey: propRowKey,
     format,
@@ -94,8 +100,15 @@ const InternalTable = props => {
       ...local.lang
     }
   };
+
+  // const [filterStates, setFilterState] = React.useState<any>(null)
+  // const [isFilter, setIsFilter] = React.useState<boolean>(false);
+
   const mergerdData = React.useMemo(() => {
+    // return filterDataByColumns2(addRowIdArray(dataSource), filterStates)
+    // return filterDataByColumns3(addRowIdArray(dataSource), filterStates)
     return addRowIdArray(dataSource);
+    // return dataSource
   }, [dataSource]);
   const [columns, setColumns] = React.useState([]);
   const tableRef = React.useRef(null);
@@ -127,9 +140,21 @@ const InternalTable = props => {
     const newColumns = updateArrayByKey(columns, newColumn, 'field');
     setColumns(newColumns);
   };
+
+  // ============================ RowKey ============================
+  const getRowKey = React.useMemo(() => {
+    if (typeof rowKey === 'function') {
+      return rowKey;
+    }
+    // @ts-ignore
+    return record => record?.[rowKey];
+  }, [rowKey]);
   const [transformSelectionColumns] = useColumns({
     locale,
     t,
+    rowKey,
+    // dataSource: mergerdData,
+    dataSource,
     buddhistLocale,
     dataSourceFilter: propDataSourceFilter,
     format,
@@ -143,15 +168,6 @@ const InternalTable = props => {
     return transformSelectionColumns(columns);
   }, [columns, transformSelectionColumns]);
 
-  // ============================ RowKey ============================
-  const getRowKey = React.useMemo(() => {
-    if (typeof rowKey === 'function') {
-      return rowKey;
-    }
-    // @ts-ignore
-    return record => record?.[rowKey];
-  }, [rowKey]);
-
   // const triggerChangeColumns = (newColumns: ColumnsTable<RecordType>) => {
   const triggerChangeColumns = (newColumns, type) => {
     setColumns(newColumns);
@@ -206,7 +222,22 @@ const InternalTable = props => {
     // setData(newData)
     // setMergedData(newData)
     onDataChange?.(newData);
+    // onDataChange?.(removeFieldRecursive(newData, 'isFilterState'))
   };
+
+  // const triggerFilter = (queries: any) => {
+  //   console.log('queries', queries)
+  //   // console.log('data', dataSource)
+  //   setFilterState(queries)
+  //
+  //   if (queries && queries.length > 0) {
+  //     setIsFilter(true)
+  //   } else {
+  //     setIsFilter(false)
+  //   }
+  //
+  // }
+
   const triggerCommandClick = args => {
     const {
       id,
@@ -365,6 +396,7 @@ const InternalTable = props => {
     locale: locale,
     tableRef: tableRef,
     dataSource: mergerdData
+    // dataSource={dataSource}
     // components={components}
     ,
     components: {
@@ -390,6 +422,10 @@ const InternalTable = props => {
     groupAble: groupAble,
     groupColumns: groupColumns,
     commandClick: triggerCommandClick
+    // triggerFilter={triggerFilter}
+    // isFilter={isFilter}
+    // setIsFilter={setIsFilter}
+    // onScroll={onScroll}
   }));
 };
 export default InternalTable;