@rainbow-oh/yee-c 0.8.11 → 0.8.13

package/dist/cjs/Table/table.js

@@ -155,13 +155,24 @@ var Table = import_react.default.forwardRef((baseprops, ref) => {
     expandable,
     rowSelection
   });
-  const { data: filteredData, onFilter: onFilterInternal } = (0, import_useFilter.default)({
-    data: dataSource
+  const {
+    data: filteredData,
+    filterRecords,
+    onFilter: onFilterInternal
+  } = (0, import_useFilter.default)({
+    data: dataSource,
+    columns: wrapedColumns
   });
+  const filters = (0, import_react.useMemo)(
+    () => Object.fromEntries(
+      filterRecords.map(({ dataIndex, value }) => [dataIndex, value])
+    ),
+    [filterRecords]
+  );
   const {
     data: sortedData,
     sorters,
-    onSort
+    onSort: onSortInternal
   } = (0, import_useSorter.default)({ data: filteredData, columns: wrapedColumns });
   const { pageData, current, pageSize, pagination } = (0, import_usePagination.default)({
     data: sortedData,
@@ -170,13 +181,25 @@ var Table = import_react.default.forwardRef((baseprops, ref) => {
       onChange({
         pagination: info,
         sorter: sorters,
-        filters: void 0,
-        // TODO: Extract filter info from onFilterInternal
+        filters,
         currentDataSource: sortedData,
         action: "paginate"
       });
     } : void 0
   });
+  const handleSort = import_react.default.useCallback(
+    (dataIndex) => {
+      const next = onSortInternal(dataIndex);
+      onChange == null ? void 0 : onChange({
+        pagination: pagination === false ? void 0 : { current, pageSize },
+        sorter: next.sorters,
+        filters,
+        currentDataSource: next.data,
+        action: "sort"
+      });
+    },
+    [onSortInternal, onChange, pagination, current, pageSize, filters]
+  );
   const { expandedRowKeys, onExpand } = (0, import_useExpand.default)(
     expandable,
     allKeys,
@@ -188,7 +211,7 @@ var Table = import_react.default.forwardRef((baseprops, ref) => {
     onCheckAll,
     onChange: onSelectionChange
   } = (0, import_useSelection.default)({ pageData, dataSource, getRowKey, rowSelection, allKeys });
-  const prevSortersRef = (0, import_react.useRef)({});
+  const prevFilterRecordsRef = (0, import_react.useRef)(filterRecords);
   const contentWrapperRef = (0, import_react.useRef)(null);
   const contentRef = (0, import_react.useRef)(null);
   const [horizontalScroll, setHorizontalScroll] = import_react.default.useState({
@@ -211,46 +234,29 @@ var Table = import_react.default.forwardRef((baseprops, ref) => {
       (current2) => current2.left === next.left && current2.right === next.right ? current2 : next
     );
   }, []);
-  const onFilter = import_react.default.useCallback(
-    (...args) => {
-      onFilterInternal(...args);
-      if (onChange) {
-        onChange({
-          pagination: pagination === false ? void 0 : { current, pageSize },
-          sorter: sorters,
-          filters: void 0,
-          // TODO: Extract filter info from args
-          currentDataSource: filteredData,
-          action: "filter"
-        });
-      }
-    },
-    [
-      onChange,
-      pagination,
-      current,
-      pageSize,
-      sorters,
-      filteredData,
-      onFilterInternal
-    ]
-  );
   (0, import_react.useEffect)(() => {
-    if (!onChange)
+    if (prevFilterRecordsRef.current === filterRecords)
       return;
-    const sortersChanged = JSON.stringify(prevSortersRef.current) !== JSON.stringify(sorters);
-    if (sortersChanged && prevSortersRef.current !== sorters) {
-      prevSortersRef.current = sorters;
-      onChange({
-        pagination: pagination === false ? void 0 : { current, pageSize },
-        sorter: sorters,
-        filters: void 0,
-        currentDataSource: sortedData,
-        action: "sort"
-      });
+    prevFilterRecordsRef.current = filterRecords;
+    if (!onChange)
       return;
-    }
-  }, [sorters, current, pageSize, pageData, sortedData, onChange]);
+    onChange({
+      pagination: pagination === false ? void 0 : { current, pageSize },
+      sorter: sorters,
+      filters,
+      currentDataSource: sortedData,
+      action: "filter"
+    });
+  }, [
+    filterRecords,
+    filters,
+    sortedData,
+    pagination,
+    current,
+    pageSize,
+    sorters,
+    onChange
+  ]);
   (0, import_react.useEffect)(() => {
     updateHorizontalScroll();
     const wrapper = contentWrapperRef.current;
@@ -290,9 +296,9 @@ var Table = import_react.default.forwardRef((baseprops, ref) => {
         headerRows,
         checkedAll,
         sorters,
-        onSort,
+        onSort: handleSort,
         onCheckAll,
-        onInternalFilter: onFilter
+        onInternalFilter: onFilterInternal
       })
     );
   };

package/dist/cjs/Table/tbody/index.js

@@ -81,19 +81,26 @@ var TableBody = (props) => {
   const resolveRowKey = (record) => typeof rowKey === "function" ? rowKey(record) : record[rowKey];
   const getRenderRows = () => {
     if (lazyLoad) {
-      return /* @__PURE__ */ import_react.default.createElement(import_lazy_row.default, __spreadProps(__spreadValues({}, rest), { pageData, columns }));
+      return /* @__PURE__ */ import_react.default.createElement(
+        import_lazy_row.default,
+        __spreadProps(__spreadValues({}, rest), {
+          pageData,
+          columns,
+          resolveRowKey
+        })
+      );
     }
     return pageData.map((record, index) => {
+      const resolvedRowKey = resolveRowKey(record);
       if (RowRenderer) {
-        const rk = resolveRowKey(record);
         return /* @__PURE__ */ import_react.default.createElement(
           RowRenderer,
           {
-            key: rk != null ? rk : index,
+            key: resolvedRowKey != null ? resolvedRowKey : index,
             record,
             index,
             columns,
-            rowKey: rk
+            rowKey: resolvedRowKey
           }
         );
       }
@@ -102,8 +109,9 @@ var TableBody = (props) => {
         __spreadProps(__spreadValues({}, rest), {
           columns,
           record,
+          rowKeyValue: resolvedRowKey,
           index,
-          key: `row-${record.key || index}`
+          key: resolvedRowKey != null ? resolvedRowKey : `row-${index}`
         })
       );
     });

package/dist/cjs/Table/tbody/lazy-row.js

@@ -67,21 +67,24 @@ var createBlank = (size, key) => {
   return size ? [/* @__PURE__ */ React.createElement("tr", { style: { height: `${size * 47}px`, width: "100%" }, key })] : [];
 };
 var LazyRow = (props) => {
-  const _a = props, { range, pageData, columns } = _a, rest = __objRest(_a, ["range", "pageData", "columns"]);
+  const _a = props, { range, pageData, columns, resolveRowKey } = _a, rest = __objRest(_a, ["range", "pageData", "columns", "resolveRowKey"]);
   const { start, end } = range;
   let result = [];
   const pl = pageData.length;
   const startBlank = createBlank(start, "row-start");
   result = result.concat(startBlank);
   for (let i = start; i < (end > pl ? pl : end); i++) {
+    const record = pageData[i];
+    const rowKeyValue = resolveRowKey(record);
     result.push(
       /* @__PURE__ */ React.createElement(
         import_row.default,
         __spreadProps(__spreadValues({}, rest), {
           columns,
-          record: pageData[i],
+          record,
+          rowKeyValue,
           index: i,
-          key: "row-" + i
+          key: rowKeyValue != null ? rowKeyValue : `row-${i}`
         })
       )
     );

package/dist/cjs/Table/tbody/row.js

@@ -74,6 +74,7 @@ var TableRow = (props) => {
   const _a = props, {
     index,
     record,
+    rowKeyValue,
     columns,
     highlight,
     stripe,
@@ -90,6 +91,7 @@ var TableRow = (props) => {
   } = _a, rest = __objRest(_a, [
     "index",
     "record",
+    "rowKeyValue",
     "columns",
     "highlight",
     "stripe",
@@ -104,9 +106,9 @@ var TableRow = (props) => {
     "onDoubleClick",
     "onSelectionChange"
   ]);
-  const { prefixCls, rowKey } = (0, import_react.useContext)(import_table.TableCtx);
+  const { prefixCls } = (0, import_react.useContext)(import_table.TableCtx);
   const expanded = expandedRowKeys == null ? void 0 : expandedRowKeys.includes(
-    expandedKeyType === "index" ? index + 1 : record[rowKey]
+    expandedKeyType === "index" ? index + 1 : rowKeyValue
   );
   const high = import_react.default.useMemo(() => {
     if (typeof highlight === "undefined")
@@ -128,14 +130,13 @@ var TableRow = (props) => {
   };
   const getSelection = (column) => {
     const { type, disabled: colDisabled, onCell } = column;
-    const rowKeyValue = record[rowKey];
     const props2 = (onCell == null ? void 0 : onCell(record, index)) || {};
     const checked = selectedRowKeys == null ? void 0 : selectedRowKeys.includes(rowKeyValue);
     const disabled = typeof colDisabled === "function" ? colDisabled(record, index) : Array.isArray(colDisabled) ? colDisabled[index] : !!colDisabled;
     const commonProps = __spreadValues({
       checked,
       value: rowKeyValue,
-      onChange: onSelectionChange,
+      onChange: (event) => onSelectionChange(event, rowKeyValue),
       disabled
     }, props2);
     if (type === "checkbox") {

package/dist/cjs/Table/theader/cell.js

@@ -122,12 +122,16 @@ var HeadCell = (props) => {
   const showFilter = !!filter;
   const sortOrder = dataIndex && (sorters == null ? void 0 : sorters[dataIndex]) || 0;
   const displaySortOrder = sortOrder === -1 ? 2 : sortOrder;
+  const currentSortOrder = sortOrder === 1 ? "ascend" : sortOrder === -1 ? "descend" : null;
   const handleSort = () => {
     if (dataIndex && onSort) {
       onSort(dataIndex, sorter);
     }
   };
   const renderSort = () => {
+    if (typeof sorter === "object" && sorter.icon) {
+      return /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefixCls}-column-sorter` }, sorter.icon(currentSortOrder));
+    }
     const trigger = /* @__PURE__ */ import_react.default.createElement("span", { className: `${prefixCls}-column-sorter` }, /* @__PURE__ */ import_react.default.createElement(
       import_arrow_icon.default,
       {

package/dist/cjs/Table/theader/filter.js

@@ -49,13 +49,31 @@ var getStrLower = (str) => {
   }
   return str;
 };
+var areFilterValuesEqual = (a, b) => {
+  if (!Array.isArray(a) || !Array.isArray(b))
+    return a === b;
+  return a.length === b.length && a.every((value, index) => value === b[index]);
+};
+var hasFilterValue = (value) => Array.isArray(value) ? value.length > 0 : value !== "";
 var HeaderFilter = import_react.default.memo((props) => {
   const { filter, column, getPopupContainer, onInternalFilter } = props;
   const { prefixCls } = (0, import_react.useContext)(import_table.TableCtx);
   const { locale } = (0, import_locale.useLocale)();
   const { table: tableLocale } = locale;
   const { dataIndex } = column;
+  const {
+    items,
+    icon,
+    searchable = true,
+    filterMode = "menu",
+    filtered,
+    filterOnClose = true,
+    render
+  } = filter;
   const inputRef = (0, import_react.useRef)(null);
+  const initialValue = items ? [] : "";
+  const committedValueRef = (0, import_react.useRef)(initialValue);
+  const [committedValue, setCommittedValue] = (0, import_react.useState)(initialValue);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [selectNodes, setSelectNodes] = (0, import_react.useState)([]);
   const [searchValue, setSearchValue] = (0, import_react.useState)("");
@@ -71,30 +89,34 @@ var HeaderFilter = import_react.default.memo((props) => {
   const inputChange = (value) => {
     setSearchValue(value);
   };
-  const reset = () => {
-    setSearchValue("");
-    setSelectNodes([]);
-    onInternalFilter({ dataIndex, value: "", column });
+  const getCurrentValue = (type) => type === "search" ? searchValue : selectNodes;
+  const commitValue = (value) => {
+    const committed = Array.isArray(value) ? [...value] : value;
+    committedValueRef.current = committed;
+    setCommittedValue(committed);
   };
-  const ok = (type) => {
+  const applyFilter = (type) => {
+    const value = getCurrentValue(type);
+    commitValue(value);
     onInternalFilter({
       dataIndex,
-      value: type === "search" ? searchValue : selectNodes,
+      value,
       type,
       column
     });
+  };
+  const reset = () => {
+    const value = items ? [] : "";
+    setSearchValue("");
+    setSelectNodes([]);
+    commitValue(value);
+    onInternalFilter({ dataIndex, value, column });
+  };
+  const ok = (type) => {
+    applyFilter(type);
     setOpen(false);
   };
   let popup;
-  const {
-    items,
-    icon,
-    searchable = true,
-    filterMode = "menu"
-    // filtered,
-    // filterOnClose,
-    // onFilter,
-  } = filter;
   const searchInputNode = searchable ? /* @__PURE__ */ import_react.default.createElement(
     import_Input.default,
     {
@@ -110,7 +132,9 @@ var HeaderFilter = import_react.default.memo((props) => {
       ref: inputRef
     }
   ) : null;
-  if (items) {
+  if (render) {
+    popup = render();
+  } else if (items) {
     let dataSource = [];
     const inputValue = getStrLower(searchValue);
     const filteredItems = inputValue ? items.filter(
@@ -152,15 +176,23 @@ var HeaderFilter = import_react.default.memo((props) => {
   } else {
     return null;
   }
-  const handleOpenChange = (o) => {
-    setOpen(o);
+  const handleOpenChange = (nextOpen) => {
+    if (!nextOpen && open && filterOnClose && !render) {
+      const type = items ? "filter" : "search";
+      const value = getCurrentValue(type);
+      if (!areFilterValuesEqual(value, committedValueRef.current)) {
+        applyFilter(type);
+      }
+    }
+    setOpen(nextOpen);
   };
+  const isFiltered = filtered != null ? filtered : hasFilterValue(committedValue);
   const renderTrigger = () => {
-    const trigger = typeof icon === "function" ? icon() : /* @__PURE__ */ import_react.default.createElement(
+    const trigger = typeof icon === "function" ? icon(isFiltered) : /* @__PURE__ */ import_react.default.createElement(
       import_Button.default,
       {
         icon: items ? /* @__PURE__ */ import_react.default.createElement(import_lucide_react.ListFilter, { size: 14, strokeWidth: 1.5 }) : /* @__PURE__ */ import_react.default.createElement(import_lucide_react.Search, { size: 14, strokeWidth: 1.5 }),
-        variant: selectNodes.length || searchValue ? "filled" : void 0,
+        variant: isFiltered ? "filled" : void 0,
         type: "text",
         size: "small"
       }

package/dist/cjs/Table/util/index.js

@@ -40,7 +40,7 @@ __export(util_exports, {
 });
 module.exports = __toCommonJS(util_exports);
 function handleColumns(columns) {
-  var _a;
+  var _a, _b;
   let leftWidthCount = 0;
   let rightWidthCount = 0;
   for (let i = 0; i < columns.length; i++) {
@@ -48,7 +48,9 @@ function handleColumns(columns) {
     if (col.fixed === true || col.fixed === "left") {
       col.fixed = "left";
       col.style = __spreadProps(__spreadValues({}, col.style), { left: leftWidthCount });
-      if (!columns[i + 1].fixed) {
+      const nextFixed = (_a = columns[i + 1]) == null ? void 0 : _a.fixed;
+      const nextIsFixedLeft = nextFixed === true || nextFixed === "left";
+      if (!nextIsFixedLeft) {
         col.isFixedLeftLast = true;
       }
       leftWidthCount = leftWidthCount + (col.width ? parseFloat(col.width) : 0);
@@ -58,7 +60,7 @@ function handleColumns(columns) {
     const col = columns[j] || {};
     if (col.fixed === "right") {
       col.style = __spreadProps(__spreadValues({}, col.style), { right: rightWidthCount });
-      if (((_a = columns[j - 1]) == null ? void 0 : _a.fixed) !== "right") {
+      if (((_b = columns[j - 1]) == null ? void 0 : _b.fixed) !== "right") {
         col.isFixedRightFirst = true;
       }
       rightWidthCount = rightWidthCount + (col.width ? parseFloat(col.width) : 0);

package/dist/cjs/style/themes.css

@@ -1,7 +1,7 @@
 /*!
  * @rainbow-oh/yee-c CSS Variables
  * Auto-generated, do not edit manually
- * Generated on 2026-07-29T03:43:59.991Z
+ * Generated on 2026-07-30T06:25:23.552Z
  */
 
 /* ========== color.blue.css ========== */

package/dist/cjs/style/variables.css

@@ -1,7 +1,7 @@
 /*!
  * @rainbow-oh/yee-c CSS Variables
  * Auto-generated, do not edit manually
- * Generated on 2026-07-29T03:43:59.991Z
+ * Generated on 2026-07-30T06:25:23.552Z
  */
 
 /* ========== color.css ========== */

package/dist/cjs/version.d.ts

@@ -3,4 +3,4 @@ declare global {
         __yee_c_version__: string;
     }
 }
-export declare const version = "0.8.11";
+export declare const version = "0.8.13";

package/dist/cjs/version.js

@@ -22,7 +22,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-var version = "0.8.11";
+var version = "0.8.13";
 if (typeof window !== "undefined") {
   window.__yee_c_version__ = version;
 }

package/dist/esm/Table/col-group.d.ts

@@ -3,5 +3,5 @@ import { ColumnProps } from './interface';
 interface TableColGroupProps {
     columns: Array<ColumnProps>;
 }
-declare const _default: React.MemoExoticComponent<React.MemoExoticComponent<({ columns }: TableColGroupProps) => React.JSX.Element>>;
-export default _default;
+declare const ColGroup: React.MemoExoticComponent<({ columns }: TableColGroupProps) => React.JSX.Element>;
+export default ColGroup;

package/dist/esm/Table/col-group.js

@@ -33,4 +33,4 @@ var ColGroup = /*#__PURE__*/React.memo(function (_ref) {
 }, areEqual); // Optimization: use custom comparison function
 
 ColGroup.displayName = 'ColGroup';
-export default /*#__PURE__*/React.memo(ColGroup);
+export default ColGroup;

package/dist/esm/Table/demo/sorter-callback.js

@@ -21,8 +21,9 @@ export default (function () {
     title: 'Score',
     dataIndex: 'score',
     key: 'score',
-    sorter: true,
-    defaultSortOrder: 'descend'
+    sorter: {
+      defaultSortOrder: 'descend'
+    }
   }, {
     title: 'Address',
     dataIndex: 'address',

package/dist/esm/Table/demo/sorter.js

@@ -10,8 +10,9 @@ export default (function () {
     title: 'Age',
     dataIndex: 'age',
     key: 'age',
-    sorter: true,
-    defaultSortOrder: 'descend'
+    sorter: {
+      defaultSortOrder: 'descend'
+    }
   }, {
     title: 'Address',
     dataIndex: 'address',

package/dist/esm/Table/hooks/useExpand.d.ts

@@ -1,5 +1,5 @@
-import { ExpandableType } from '../interface';
-export default function useExpand(expandable: ExpandableType | undefined, allKeys: string[], getRowKey: (record: Record<string, any>) => string): {
+import { ExpandableType, SelectionKeyType } from '../interface';
+export default function useExpand(expandable: ExpandableType | undefined, allKeys: SelectionKeyType[], getRowKey: (record: Record<string, any>) => SelectionKeyType): {
     expandedRowKeys: (string | number)[];
     onExpand: ({ expanded, record, }: {
         expanded: boolean;

package/dist/esm/Table/hooks/useFilter.d.ts

@@ -1,11 +1,19 @@
+import type { ColumnProps, FilterValue } from '../interface';
+type FilterInput = FilterValue | FilterValue[];
 type FilterOptions = {
     dataIndex: string;
-    value: string;
+    value: FilterInput;
 };
-export default function useFilter({ data, }: {
+type FilterRecord = {
+    value: FilterInput;
+    dataIndex: string;
+};
+export default function useFilter({ data, columns, }: {
     data: Array<Record<string, unknown>>;
+    columns: ColumnProps[];
 }): {
     data: Record<string, unknown>[];
+    filterRecords: FilterRecord[];
     onFilter: ({ value, dataIndex }: FilterOptions) => void;
 };
 export {};

package/dist/esm/Table/hooks/useFilter.js

@@ -14,65 +14,92 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
+var isEmptyFilterValue = function isEmptyFilterValue(value) {
+  return value === '' || Array.isArray(value) && value.length === 0;
+};
+var normalizeValue = function normalizeValue(value) {
+  return value === null || value === undefined ? '' : String(value).toLowerCase();
+};
 export default function useFilter(_ref) {
-  var data = _ref.data;
+  var data = _ref.data,
+    columns = _ref.columns;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     filterRecords = _useState2[0],
     setFilterRecords = _useState2[1];
-  var onFilter = function onFilter(_ref2) {
-    var value = _ref2.value,
-      dataIndex = _ref2.dataIndex;
-    var newFilterMap = _toConsumableArray(filterRecords);
-    if (!value || Array.isArray(value) && !value.length) {
-      newFilterMap = newFilterMap.filter(function (item) {
-        return item.dataIndex !== dataIndex;
+  var columnMap = useMemo(function () {
+    return new Map(columns.flatMap(function (column) {
+      return column.dataIndex ? [[column.dataIndex, column]] : [];
+    }));
+  }, [columns]);
+  useEffect(function () {
+    setFilterRecords(function (current) {
+      var next = current.filter(function (_ref2) {
+        var dataIndex = _ref2.dataIndex;
+        return columnMap.has(dataIndex);
       });
-    } else {
-      var exited = false;
-      newFilterMap = newFilterMap.map(function (item) {
-        if (item.dataIndex === dataIndex) {
-          exited = true;
-          return _objectSpread(_objectSpread({}, item), {}, {
-            value: value
-          });
-        }
-        return item;
+      return next.length === current.length ? current : next;
+    });
+  }, [columnMap]);
+  var onFilter = function onFilter(_ref3) {
+    var value = _ref3.value,
+      dataIndex = _ref3.dataIndex;
+    setFilterRecords(function (current) {
+      if (isEmptyFilterValue(value)) {
+        return current.filter(function (item) {
+          return item.dataIndex !== dataIndex;
+        });
+      }
+      var index = current.findIndex(function (item) {
+        return item.dataIndex === dataIndex;
       });
-      if (!exited) {
-        newFilterMap.push({
+      if (index === -1) {
+        return [].concat(_toConsumableArray(current), [{
           dataIndex: dataIndex,
           value: value
-        });
+        }]);
       }
-    }
-    setFilterRecords(newFilterMap);
+      return current.map(function (item, itemIndex) {
+        return itemIndex === index ? _objectSpread(_objectSpread({}, item), {}, {
+          value: value
+        }) : item;
+      });
+    });
   };
   var filtered = useMemo(function () {
-    var handled = filterRecords.filter(function (item) {
-      return item.dataIndex && item.value;
+    var handled = filterRecords.filter(function (_ref4) {
+      var dataIndex = _ref4.dataIndex,
+        value = _ref4.value;
+      return Boolean(dataIndex) && columnMap.has(dataIndex) && !isEmptyFilterValue(value);
     });
     if (!handled.length) {
       return data;
     }
     return data.filter(function (item) {
-      return handled.find(function (o) {
-        if (Array.isArray(o.value)) {
-          return o.value.some(function (v) {
-            var t = item[o.dataIndex] || '';
-            return t.toLowerCase() === v.toLowerCase();
+      return handled.every(function (_ref5) {
+        var _columnMap$get;
+        var dataIndex = _ref5.dataIndex,
+          value = _ref5.value;
+        var customFilter = (_columnMap$get = columnMap.get(dataIndex)) === null || _columnMap$get === void 0 || (_columnMap$get = _columnMap$get.filter) === null || _columnMap$get === void 0 ? void 0 : _columnMap$get.onFilter;
+        if (customFilter) {
+          return Array.isArray(value) ? value.some(function (filterValue) {
+            return customFilter(filterValue, item);
+          }) : customFilter(value, item);
+        }
+        var targetValue = normalizeValue(item[dataIndex]);
+        if (Array.isArray(value)) {
+          return value.some(function (filterValue) {
+            return targetValue === normalizeValue(filterValue);
           });
-        } else {
-          var v = o.value.toLowerCase();
-          var t = item[o.dataIndex] || '';
-          return t.toLowerCase().includes(v);
         }
+        return targetValue.includes(normalizeValue(value));
       });
     });
-  }, [data, filterRecords]);
+  }, [columnMap, data, filterRecords]);
   return {
     data: filtered,
+    filterRecords: filterRecords,
     onFilter: onFilter
   };
 }