@rainbow-oh/yee-c 0.8.12 → 0.8.14

package/dist/esm/Table/interface.d.ts

@@ -23,7 +23,7 @@ export interface ExpandableType {
     /**
      * Default expanded rows
      */
-    defaultExpandedRowKeys?: string[];
+    defaultExpandedRowKeys?: SelectionKeyType[];
     /**
      * Expanded rows
      */
@@ -51,6 +51,7 @@ export interface ExpandableType {
     expandedRowRender?: (record: object, index: number, page: Record<string, any>) => React.ReactNode;
 }
 export type SelectionKeyType = string | number;
+export type FilterValue = string | number;
 export type ColumnSemanticType = 'inner' | 'action';
 export interface HeadCellProps extends Omit<WrapedColumnProps, 'title'> {
     prefixCls?: string;
@@ -186,7 +187,7 @@ export interface ColumnProps {
         /**
          * Filter callback function
          */
-        onFilter?: (value: string, record: Record<string, any>) => boolean;
+        onFilter?: (value: FilterValue, record: Record<string, any>) => boolean;
     };
     /**
      * Sorter config
@@ -195,9 +196,10 @@ export interface ColumnProps {
         /**
          * Sort function
          */
-        sort?: () => number | boolean;
+        sort?: (a: Record<string, unknown>, b: Record<string, unknown>) => number;
         /**
-         * Whether to support multi-column sort, if set to a number, it indicates the number of sortable columns
+         * Enable multi-column sorting. A positive number limits the active
+         * sorters; when exceeded, the earliest activated sorter is removed.
          */
         multiple?: boolean | number;
         /**
@@ -359,6 +361,7 @@ export interface TableRowProps {
     pageSize: number;
     index: number;
     record: Record<string, any>;
+    rowKeyValue: SelectionKeyType;
     columns: ColumnProps[];
     expandable?: ExpandableType;
     expandedRowKeys?: Array<string | number>;
@@ -375,7 +378,7 @@ export interface TableRowProps {
         record: Record<string, any>;
         index: number;
     }) => void;
-    onSelectionChange: (event: ChangeEvent<HTMLInputElement>) => void;
+    onSelectionChange: (event: ChangeEvent<HTMLInputElement>, key: SelectionKeyType) => void;
 }
 type LazyLoadType = {
     lazyLoadRows?: number;
@@ -389,7 +392,7 @@ export interface LazyRowProps extends TableRowProps {
     };
     lazyLoad?: boolean | LazyLoadType;
 }
-export interface TableBodyProps extends Omit<LazyRowProps, 'index' | 'record'> {
+export interface TableBodyProps extends Omit<LazyRowProps, 'index' | 'record' | 'rowKeyValue'> {
     pageData: Array<Record<string, any>>;
     noData?: React.ReactNode;
 }
@@ -542,7 +545,7 @@ export interface TableProps extends FooterProps, Omit<HeaderProps, 'pageData'>,
      * Set the unique key for rows
      * @default id
      */
-    rowKey?: string | ((record: Record<string, any>) => string);
+    rowKey?: string | ((record: Record<string, any>) => SelectionKeyType);
     /**
      * Summary bar
      */

package/dist/esm/Table/table.js

@@ -93,10 +93,19 @@ var Table = /*#__PURE__*/React.forwardRef(function (baseprops, ref) {
 
   // Filter
   var _useFilter = useFilter({
-      data: dataSource
+      data: dataSource,
+      columns: wrapedColumns
     }),
     filteredData = _useFilter.data,
+    filterRecords = _useFilter.filterRecords,
     onFilterInternal = _useFilter.onFilter;
+  var filters = useMemo(function () {
+    return Object.fromEntries(filterRecords.map(function (_ref) {
+      var dataIndex = _ref.dataIndex,
+        value = _ref.value;
+      return [dataIndex, value];
+    }));
+  }, [filterRecords]);
 
   // Sort
   var _useSorter = useSorter({
@@ -105,7 +114,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (baseprops, ref) {
     }),
     sortedData = _useSorter.data,
     sorters = _useSorter.sorters,
-    onSort = _useSorter.onSort;
+    onSortInternal = _useSorter.onSort;
   // Pagination
   var _usePagination = usePagination({
       data: sortedData,
@@ -114,8 +123,7 @@ var Table = /*#__PURE__*/React.forwardRef(function (baseprops, ref) {
         onChange({
           pagination: info,
           sorter: sorters,
-          filters: undefined,
-          // TODO: Extract filter info from onFilterInternal
+          filters: filters,
           currentDataSource: sortedData,
           action: 'paginate'
         });
@@ -125,6 +133,19 @@ var Table = /*#__PURE__*/React.forwardRef(function (baseprops, ref) {
     current = _usePagination.current,
     pageSize = _usePagination.pageSize,
     pagination = _usePagination.pagination;
+  var handleSort = React.useCallback(function (dataIndex) {
+    var next = onSortInternal(dataIndex);
+    onChange === null || onChange === void 0 || onChange({
+      pagination: pagination === false ? undefined : {
+        current: current,
+        pageSize: pageSize
+      },
+      sorter: next.sorters,
+      filters: filters,
+      currentDataSource: next.data,
+      action: 'sort'
+    });
+  }, [onSortInternal, onChange, pagination, current, pageSize, filters]);
 
   // Expanded row data
   var _useExpand = useExpand(expandable, allKeys, getRowKey),
@@ -142,8 +163,8 @@ var Table = /*#__PURE__*/React.forwardRef(function (baseprops, ref) {
     onCheckAll = _useSelection.onCheckAll,
     onSelectionChange = _useSelection.onChange;
 
-  // Track previous values to determine what action triggered onChange
-  var prevSortersRef = useRef({});
+  // Track filter changes to emit onChange after filtered data is recalculated
+  var prevFilterRecordsRef = useRef(filterRecords);
   var contentWrapperRef = useRef(null);
   var contentRef = useRef(null);
   var _React$useState = React.useState({
@@ -168,47 +189,21 @@ var Table = /*#__PURE__*/React.forwardRef(function (baseprops, ref) {
       return current.left === next.left && current.right === next.right ? current : next;
     });
   }, []);
-
-  // Wrap onFilter to trigger onChange
-  var onFilter = React.useCallback(function () {
-    onFilterInternal.apply(void 0, arguments);
-    // Trigger onChange for filter action
-    if (onChange) {
-      onChange({
-        pagination: pagination === false ? undefined : {
-          current: current,
-          pageSize: pageSize
-        },
-        sorter: sorters,
-        filters: undefined,
-        // TODO: Extract filter info from args
-        currentDataSource: filteredData,
-        action: 'filter'
-      });
-    }
-  }, [onChange, pagination, current, pageSize, sorters, filteredData, onFilterInternal]);
-
-  // Trigger onChange when sorter, pagination, or filter changes
   useEffect(function () {
+    if (prevFilterRecordsRef.current === filterRecords) return;
+    prevFilterRecordsRef.current = filterRecords;
     if (!onChange) return;
-
-    // Check if sorters changed
-    var sortersChanged = JSON.stringify(prevSortersRef.current) !== JSON.stringify(sorters);
-    if (sortersChanged && prevSortersRef.current !== sorters) {
-      prevSortersRef.current = sorters;
-      onChange({
-        pagination: pagination === false ? undefined : {
-          current: current,
-          pageSize: pageSize
-        },
-        sorter: sorters,
-        filters: undefined,
-        currentDataSource: sortedData,
-        action: 'sort'
-      });
-      return;
-    }
-  }, [sorters, current, pageSize, pageData, sortedData, onChange]);
+    onChange({
+      pagination: pagination === false ? undefined : {
+        current: current,
+        pageSize: pageSize
+      },
+      sorter: sorters,
+      filters: filters,
+      currentDataSource: sortedData,
+      action: 'filter'
+    });
+  }, [filterRecords, filters, sortedData, pagination, current, pageSize, sorters, onChange]);
   useEffect(function () {
     updateHorizontalScroll();
     var wrapper = contentWrapperRef.current;
@@ -246,9 +241,9 @@ var Table = /*#__PURE__*/React.forwardRef(function (baseprops, ref) {
       headerRows: headerRows,
       checkedAll: checkedAll,
       sorters: sorters,
-      onSort: onSort,
+      onSort: handleSort,
       onCheckAll: onCheckAll,
-      onInternalFilter: onFilter
+      onInternalFilter: onFilterInternal
     }));
   };
   var renderTBody = function renderTBody() {

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

@@ -39,26 +39,29 @@ var TableBody = function TableBody(props) {
     if (lazyLoad) {
       return /*#__PURE__*/React.createElement(LazyRow, _extends({}, rest, {
         pageData: pageData,
-        columns: columns
+        columns: columns,
+        resolveRowKey: resolveRowKey
       }));
     }
     return pageData.map(function (record, index) {
+      var resolvedRowKey = resolveRowKey(record);
+
       // 整行接管：由外部组件渲染 <tr> + 单元格（可放拖拽手柄等）
       if (RowRenderer) {
-        var rk = resolveRowKey(record);
         return /*#__PURE__*/React.createElement(RowRenderer, {
-          key: rk !== null && rk !== void 0 ? rk : index,
+          key: resolvedRowKey !== null && resolvedRowKey !== void 0 ? resolvedRowKey : index,
           record: record,
           index: index,
           columns: columns,
-          rowKey: rk
+          rowKey: resolvedRowKey
         });
       }
       return /*#__PURE__*/React.createElement(TableRow, _extends({}, rest, {
         columns: columns,
         record: record,
+        rowKeyValue: resolvedRowKey,
         index: index,
-        key: "row-".concat(record.key || index)
+        key: resolvedRowKey !== null && resolvedRowKey !== void 0 ? resolvedRowKey : "row-".concat(index)
       }));
     });
   };

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

@@ -1,4 +1,4 @@
-var _excluded = ["range", "pageData", "columns"];
+var _excluded = ["range", "pageData", "columns", "resolveRowKey"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -17,6 +17,7 @@ var LazyRow = function LazyRow(props) {
   var range = props.range,
     pageData = props.pageData,
     columns = props.columns,
+    resolveRowKey = props.resolveRowKey,
     rest = _objectWithoutProperties(props, _excluded);
   var start = range.start,
     end = range.end;
@@ -25,11 +26,14 @@ var LazyRow = function LazyRow(props) {
   var startBlank = createBlank(start, 'row-start');
   result = result.concat(startBlank);
   for (var i = start; i < (end > pl ? pl : end); i++) {
+    var record = pageData[i];
+    var rowKeyValue = resolveRowKey(record);
     result.push( /*#__PURE__*/React.createElement(TableRow, _extends({}, rest, {
       columns: columns,
-      record: pageData[i],
+      record: record,
+      rowKeyValue: rowKeyValue,
       index: i,
-      key: 'row-' + i
+      key: rowKeyValue !== null && rowKeyValue !== void 0 ? rowKeyValue : "row-".concat(i)
     })));
   }
   var maxLength = end > pl ? 0 : pl - end;

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

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["index", "record", "columns", "highlight", "stripe", "expandedKeyType", "expandedRowKeys", "selectedRowKeys", "expandable", "onExpand", "onRow", "rowClassName", "rowStyle", "onDoubleClick", "onSelectionChange"];
+var _excluded = ["index", "record", "rowKeyValue", "columns", "highlight", "stripe", "expandedKeyType", "expandedRowKeys", "selectedRowKeys", "expandable", "onExpand", "onRow", "rowClassName", "rowStyle", "onDoubleClick", "onSelectionChange"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -20,6 +20,7 @@ import { TableCtx } from "../table";
 var TableRow = function TableRow(props) {
   var index = props.index,
     record = props.record,
+    rowKeyValue = props.rowKeyValue,
     columns = props.columns,
     highlight = props.highlight,
     stripe = props.stripe,
@@ -35,9 +36,8 @@ var TableRow = function TableRow(props) {
     onSelectionChange = props.onSelectionChange,
     rest = _objectWithoutProperties(props, _excluded);
   var _useContext = useContext(TableCtx),
-    prefixCls = _useContext.prefixCls,
-    rowKey = _useContext.rowKey;
-  var expanded = expandedRowKeys === null || expandedRowKeys === void 0 ? void 0 : expandedRowKeys.includes(expandedKeyType === 'index' ? index + 1 : record[rowKey]);
+    prefixCls = _useContext.prefixCls;
+  var expanded = expandedRowKeys === null || expandedRowKeys === void 0 ? void 0 : expandedRowKeys.includes(expandedKeyType === 'index' ? index + 1 : rowKeyValue);
   var high = React.useMemo(function () {
     if (typeof highlight === 'undefined') return false;
     if (highlight === 'odd') {
@@ -59,7 +59,6 @@ var TableRow = function TableRow(props) {
     var type = column.type,
       colDisabled = column.disabled,
       onCell = column.onCell;
-    var rowKeyValue = record[rowKey];
     var props = (onCell === null || onCell === void 0 ? void 0 : onCell(record, index)) || {};
     var checked = selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.includes(rowKeyValue);
 
@@ -72,7 +71,9 @@ var TableRow = function TableRow(props) {
     var commonProps = _objectSpread({
       checked: checked,
       value: rowKeyValue,
-      onChange: onSelectionChange,
+      onChange: function onChange(event) {
+        return onSelectionChange(event, rowKeyValue);
+      },
       disabled: disabled
     }, props);
     if (type === 'checkbox') {

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

@@ -1,4 +1,3 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _excluded = ["fixed", "isFixedLeftLast", "isFixedRightFirst", "align", "title", "dataIndex", "sorter", "filter", "sorters", "className", "styles", "classNames", "showSorterTooltip", "tableActionBarShowOnHover", "internalFilters", "style", "width", "colSpan", "rowSpan", "onHeaderCell", "onSort", "onInternalFilter"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -6,6 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import clsx from 'clsx';
@@ -52,12 +52,18 @@ var HeadCell = function HeadCell(props) {
   // Convert -1 to 2 for UI display (2 = descend)
   var sortOrder = dataIndex && (sorters === null || sorters === void 0 ? void 0 : sorters[dataIndex]) || 0;
   var displaySortOrder = sortOrder === -1 ? 2 : sortOrder;
+  var currentSortOrder = sortOrder === 1 ? 'ascend' : sortOrder === -1 ? 'descend' : null;
   var handleSort = function handleSort() {
     if (dataIndex && onSort) {
       onSort(dataIndex, sorter);
     }
   };
   var renderSort = function renderSort() {
+    if (_typeof(sorter) === 'object' && sorter.icon) {
+      return /*#__PURE__*/React.createElement("span", {
+        className: "".concat(prefixCls, "-column-sorter")
+      }, sorter.icon(currentSortOrder));
+    }
     var trigger = /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-column-sorter")
     }, /*#__PURE__*/React.createElement(ArrowIcon, {

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

@@ -1,3 +1,7 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -21,6 +25,15 @@ var getStrLower = function getStrLower(str) {
   }
   return str;
 };
+var areFilterValuesEqual = function areFilterValuesEqual(a, b) {
+  if (!Array.isArray(a) || !Array.isArray(b)) return a === b;
+  return a.length === b.length && a.every(function (value, index) {
+    return value === b[index];
+  });
+};
+var hasFilterValue = function hasFilterValue(value) {
+  return Array.isArray(value) ? value.length > 0 : value !== '';
+};
 var HeaderFilter = /*#__PURE__*/React.memo(function (props) {
   var filter = props.filter,
     column = props.column,
@@ -32,19 +45,35 @@ var HeaderFilter = /*#__PURE__*/React.memo(function (props) {
     locale = _useLocale.locale;
   var tableLocale = locale.table;
   var dataIndex = column.dataIndex;
+  var items = filter.items,
+    icon = filter.icon,
+    _filter$searchable = filter.searchable,
+    searchable = _filter$searchable === void 0 ? true : _filter$searchable,
+    _filter$filterMode = filter.filterMode,
+    filterMode = _filter$filterMode === void 0 ? 'menu' : _filter$filterMode,
+    filtered = filter.filtered,
+    _filter$filterOnClose = filter.filterOnClose,
+    filterOnClose = _filter$filterOnClose === void 0 ? true : _filter$filterOnClose,
+    render = filter.render;
   var inputRef = useRef(null);
-  var _useState = useState(false),
+  var initialValue = items ? [] : '';
+  var committedValueRef = useRef(initialValue);
+  var _useState = useState(initialValue),
     _useState2 = _slicedToArray(_useState, 2),
-    open = _useState2[0],
-    setOpen = _useState2[1];
-  var _useState3 = useState([]),
+    committedValue = _useState2[0],
+    setCommittedValue = _useState2[1];
+  var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    selectNodes = _useState4[0],
-    setSelectNodes = _useState4[1];
-  var _useState5 = useState(''),
+    open = _useState4[0],
+    setOpen = _useState4[1];
+  var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    searchValue = _useState6[0],
-    setSearchValue = _useState6[1];
+    selectNodes = _useState6[0],
+    setSelectNodes = _useState6[1];
+  var _useState7 = useState(''),
+    _useState8 = _slicedToArray(_useState7, 2),
+    searchValue = _useState8[0],
+    setSearchValue = _useState8[1];
   useEffect(function () {
     if (!open) return;
     var raf = requestAnimationFrame(function () {
@@ -65,31 +94,40 @@ var HeaderFilter = /*#__PURE__*/React.memo(function (props) {
   //     setSelectNodes(node);
   //   };
 
-  var reset = function reset() {
-    setSearchValue('');
-    setSelectNodes([]);
+  var getCurrentValue = function getCurrentValue(type) {
+    return type === 'search' ? searchValue : selectNodes;
+  };
+  var commitValue = function commitValue(value) {
+    var committed = Array.isArray(value) ? _toConsumableArray(value) : value;
+    committedValueRef.current = committed;
+    setCommittedValue(committed);
+  };
+  var applyFilter = function applyFilter(type) {
+    var value = getCurrentValue(type);
+    commitValue(value);
     onInternalFilter({
       dataIndex: dataIndex,
-      value: '',
+      value: value,
+      type: type,
       column: column
     });
   };
-  var ok = function ok(type) {
+  var reset = function reset() {
+    var value = items ? [] : '';
+    setSearchValue('');
+    setSelectNodes([]);
+    commitValue(value);
     onInternalFilter({
       dataIndex: dataIndex,
-      value: type === 'search' ? searchValue : selectNodes,
-      type: type,
+      value: value,
       column: column
     });
+  };
+  var ok = function ok(type) {
+    applyFilter(type);
     setOpen(false);
   };
   var popup;
-  var items = filter.items,
-    icon = filter.icon,
-    _filter$searchable = filter.searchable,
-    searchable = _filter$searchable === void 0 ? true : _filter$searchable,
-    _filter$filterMode = filter.filterMode,
-    filterMode = _filter$filterMode === void 0 ? 'menu' : _filter$filterMode;
   var searchInputNode = searchable ? /*#__PURE__*/React.createElement(Input, {
     prefix: /*#__PURE__*/React.createElement(Search, {
       size: 14,
@@ -105,7 +143,9 @@ var HeaderFilter = /*#__PURE__*/React.memo(function (props) {
     size: "small",
     ref: inputRef
   }) : null;
-  if (items) {
+  if (render) {
+    popup = render();
+  } else if (items) {
     var dataSource = [];
     var inputValue = getStrLower(searchValue);
     var filteredItems = inputValue ? items.filter(function (item) {
@@ -176,11 +216,19 @@ var HeaderFilter = /*#__PURE__*/React.memo(function (props) {
   } else {
     return null;
   }
-  var handleOpenChange = function handleOpenChange(o) {
-    setOpen(o);
+  var handleOpenChange = function handleOpenChange(nextOpen) {
+    if (!nextOpen && open && filterOnClose && !render) {
+      var type = items ? 'filter' : 'search';
+      var value = getCurrentValue(type);
+      if (!areFilterValuesEqual(value, committedValueRef.current)) {
+        applyFilter(type);
+      }
+    }
+    setOpen(nextOpen);
   };
+  var isFiltered = filtered !== null && filtered !== void 0 ? filtered : hasFilterValue(committedValue);
   var renderTrigger = function renderTrigger() {
-    var trigger = typeof icon === 'function' ? icon() : /*#__PURE__*/React.createElement(Button, {
+    var trigger = typeof icon === 'function' ? icon(isFiltered) : /*#__PURE__*/React.createElement(Button, {
       icon: items ? /*#__PURE__*/React.createElement(ListFilter, {
         size: 14,
         strokeWidth: 1.5
@@ -188,7 +236,7 @@ var HeaderFilter = /*#__PURE__*/React.memo(function (props) {
         size: 14,
         strokeWidth: 1.5
       }),
-      variant: selectNodes.length || searchValue ? 'filled' : undefined,
+      variant: isFiltered ? 'filled' : undefined,
       type: "text",
       size: "small"
     });

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

@@ -10,11 +10,14 @@ export function handleColumns(columns) {
   for (var i = 0; i < columns.length; i++) {
     var col = columns[i] || {};
     if (col.fixed === true || col.fixed === 'left') {
+      var _columns;
       col.fixed = 'left';
       col.style = _objectSpread(_objectSpread({}, col.style), {}, {
         left: leftWidthCount
       });
-      if (!columns[i + 1].fixed) {
+      var nextFixed = (_columns = columns[i + 1]) === null || _columns === void 0 ? void 0 : _columns.fixed;
+      var nextIsFixedLeft = nextFixed === true || nextFixed === 'left';
+      if (!nextIsFixedLeft) {
         col.isFixedLeftLast = true;
       }
       leftWidthCount = leftWidthCount + (col.width ? parseFloat(col.width) : 0);
@@ -23,11 +26,11 @@ export function handleColumns(columns) {
   for (var j = columns.length - 1; j >= 0; j--) {
     var _col = columns[j] || {};
     if (_col.fixed === 'right') {
-      var _columns;
+      var _columns2;
       _col.style = _objectSpread(_objectSpread({}, _col.style), {}, {
         right: rightWidthCount
       });
-      if (((_columns = columns[j - 1]) === null || _columns === void 0 ? void 0 : _columns.fixed) !== 'right') {
+      if (((_columns2 = columns[j - 1]) === null || _columns2 === void 0 ? void 0 : _columns2.fixed) !== 'right') {
         _col.isFixedRightFirst = true;
       }
       rightWidthCount = rightWidthCount + (_col.width ? parseFloat(_col.width) : 0);

package/dist/esm/style/themes.css

@@ -1,7 +1,7 @@
 /*!
  * @rainbow-oh/yee-c CSS Variables
  * Auto-generated, do not edit manually
- * Generated on 2026-07-29T04:29:09.688Z
+ * Generated on 2026-07-30T09:31:08.775Z
  */
 
 /* ========== color.blue.css ========== */

package/dist/esm/style/variables.css

@@ -1,7 +1,7 @@
 /*!
  * @rainbow-oh/yee-c CSS Variables
  * Auto-generated, do not edit manually
- * Generated on 2026-07-29T04:29:09.688Z
+ * Generated on 2026-07-30T09:31:08.775Z
  */
 
 /* ========== color.css ========== */

package/dist/esm/version.d.ts

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

package/dist/esm/version.js

@@ -1,4 +1,4 @@
-export var version = "0.8.12";
+export var version = "0.8.14";
 if (typeof window !== 'undefined') {
   window.__yee_c_version__ = version;
 }