@oceanbase/design 1.0.0-alpha.17 → 1.0.0-alpha.18

package/es/_util/genComponentStyleHook.js

@@ -35,8 +35,12 @@ export var genSelectCommonStyle = function genSelectCommonStyle(token) {
 export function genStyleHooks(componentName, styleFn, getDefaultToken, options) {
   var normalizedComponentName = Array.isArray(componentName) ? componentName[0] : componentName;
 
-  // Create the component name with OB- prefix
-  var obComponentName = Array.isArray(componentName) ? ["OB-".concat(normalizedComponentName), componentName[1]] : "OB-".concat(normalizedComponentName);
+  /**
+   * 使用 [Component, subName] 注册，第一维与 antd 一致以便合并 `theme.components[Component]`（如 Table.cellFontSize）；
+   * 第二维与 antd 默认样式区分，避免覆盖/顶替同组件的主样式钩子。
+   */
+  var OCEANBASE_SUB_STYLE = 'oceanbase';
+  var obComponentName = Array.isArray(componentName) ? [normalizedComponentName, "".concat(OCEANBASE_SUB_STYLE, "-").concat(componentName[1])] : [normalizedComponentName, OCEANBASE_SUB_STYLE];
   return antGenStyleHooks(obComponentName, function (token) {
     var styles = [];
 

package/es/config-provider/index.d.ts

@@ -63,5 +63,7 @@ export type ConfigProviderType = React.FC<ConfigProviderProps> & {
     config: typeof AntConfigProvider.config;
     useConfig: typeof AntConfigProvider.useConfig;
 };
+/** Cn 字号补丁（正文 + Table 单元格），供单测与 ConfigProvider 共用。 */
+export declare function getLocaleFontSizeThemePatch(mergedLocale: Locale, mergedTheme: ThemeConfig, resolvedFontSize: number | undefined): ThemeConfig;
 declare const ConfigProvider: ConfigProviderType;
 export default ConfigProvider;

package/es/config-provider/index.js

@@ -24,7 +24,7 @@ import { merge } from 'lodash';
 import App from "../app";
 import StaticFunction from "../static-function";
 import themeConfig from "../theme";
-import defaultTheme, { fontFamilyEn, fontWeightWeakEn, fontWeightEn, fontWeightStrongEn } from "../theme/default";
+import defaultTheme, { fontFamilyEn, fontSizeCn, fontHeightCn, lineHeightCn, fontSizeEn, fontWeightWeakEn, fontWeightEn, fontWeightStrongEn, isCnLikeLocale, tableCellFontSizeEn } from "../theme/default";
 import darkTheme from "../theme/dark";
 import compactTheme from "../theme/compact";
 import DefaultRenderEmpty from "./DefaultRenderEmpty";
@@ -42,26 +42,55 @@ var ExtendedConfigContext = /*#__PURE__*/React.createContext({
   hideOnSinglePage: false,
   injectStaticFunction: true
 });
+/** `en` / `en-gb` → `tokenValueEn`（与 `fontFamilyEn` 等一致）。 */
 var getLocaleTokenValue = function getLocaleTokenValue(mergedThemeToken, locale, tokenKey, tokenValue, tokenValueEn) {
   return tokenValue !== mergedThemeToken[tokenKey] ? _defineProperty({}, tokenKey, tokenValue) : ['en', 'en-gb'].includes(locale.locale) ? _defineProperty({}, tokenKey, tokenValueEn) : {};
 };
-var ConfigProvider = function ConfigProvider(_ref3) {
-  var _mergedTheme$token, _mergedTheme$token2, _mergedTheme$token3, _mergedTheme$token4, _parentContext$pagina;
-  var children = _ref3.children,
-    theme = _ref3.theme,
-    locale = _ref3.locale,
-    wave = _ref3.wave,
-    navigate = _ref3.navigate,
-    hideOnSinglePage = _ref3.hideOnSinglePage,
-    card = _ref3.card,
-    collapse = _ref3.collapse,
-    form = _ref3.form,
-    spin = _ref3.spin,
-    table = _ref3.table,
-    tabs = _ref3.tabs,
-    styleProviderProps = _ref3.styleProviderProps,
-    appProps = _ref3.appProps,
-    restProps = _objectWithoutProperties(_ref3, _excluded);
+
+/** Cn（zh/ja/ko）且仍为拉丁基线 `tokenValueEn` 时 → `tokenValueCn`，结构上与 {@link getLocaleTokenValue} 对称。 */
+var getLocaleTokenValueCn = function getLocaleTokenValueCn(mergedThemeToken, locale, tokenKey, tokenValue, tokenValueEn, tokenValueCn) {
+  return tokenValue !== mergedThemeToken[tokenKey] ? _defineProperty({}, tokenKey, tokenValue) : isCnLikeLocale(locale.locale) && (tokenValue === undefined || tokenValue === tokenValueEn) ? _defineProperty({}, tokenKey, tokenValueCn) : {};
+};
+
+/** Cn 字号补丁（正文 + Table 单元格），供单测与 ConfigProvider 共用。 */
+export function getLocaleFontSizeThemePatch(mergedLocale, mergedTheme, resolvedFontSize) {
+  var _mergedTheme$token, _mergedTheme$componen;
+  var tokenPatch = getLocaleTokenValueCn((_mergedTheme$token = mergedTheme.token) !== null && _mergedTheme$token !== void 0 ? _mergedTheme$token : {}, mergedLocale, 'fontSize', resolvedFontSize, fontSizeEn, fontSizeCn);
+  var patch = {};
+  if ('fontSize' in tokenPatch && tokenPatch.fontSize !== undefined) {
+    patch.token = {
+      fontSize: tokenPatch.fontSize,
+      lineHeight: lineHeightCn,
+      fontHeight: fontHeightCn
+    };
+  }
+  var cellFs = (_mergedTheme$componen = mergedTheme.components) === null || _mergedTheme$componen === void 0 || (_mergedTheme$componen = _mergedTheme$componen.Table) === null || _mergedTheme$componen === void 0 ? void 0 : _mergedTheme$componen.cellFontSize;
+  if ((cellFs === undefined || cellFs === tableCellFontSizeEn) && isCnLikeLocale(mergedLocale.locale)) {
+    patch.components = {
+      Table: {
+        cellFontSize: fontSizeCn
+      }
+    };
+  }
+  return patch;
+}
+var ConfigProvider = function ConfigProvider(_ref5) {
+  var _mergedTheme$token2, _mergedTheme$token$fo, _mergedTheme$token3, _mergedTheme$token4, _mergedTheme$token5, _mergedTheme$token6, _parentContext$pagina;
+  var children = _ref5.children,
+    theme = _ref5.theme,
+    locale = _ref5.locale,
+    wave = _ref5.wave,
+    navigate = _ref5.navigate,
+    hideOnSinglePage = _ref5.hideOnSinglePage,
+    card = _ref5.card,
+    collapse = _ref5.collapse,
+    form = _ref5.form,
+    spin = _ref5.spin,
+    table = _ref5.table,
+    tabs = _ref5.tabs,
+    styleProviderProps = _ref5.styleProviderProps,
+    appProps = _ref5.appProps,
+    restProps = _objectWithoutProperties(_ref5, _excluded);
   // inherit from parent ConfigProvider
   var parentContext = React.useContext(AntConfigProvider.ConfigContext);
   var parentExtendedContext = React.useContext(ExtendedConfigContext);
@@ -71,28 +100,29 @@ var ConfigProvider = function ConfigProvider(_ref3) {
     isCompact = _merge.isCompact;
   var aliyunThemeConfig = isAliyun ? aliyunTheme : undefined;
   var darkThemeConfig = isDark && !isAliyun ? isCompact ? darkTheme : _objectSpread(_objectSpread({}, darkTheme), {}, {
-    token: _objectSpread(_objectSpread({}, darkTheme.token), Object.fromEntries(Object.entries(defaultTheme.token).filter(function (_ref4) {
+    token: _objectSpread(_objectSpread({}, darkTheme.token), Object.fromEntries(Object.entries(defaultTheme.token).filter(function (_ref6) {
       var _key$toLowerCase;
-      var _ref5 = _slicedToArray(_ref4, 1),
-        key = _ref5[0];
+      var _ref7 = _slicedToArray(_ref6, 1),
+        key = _ref7[0];
       return !(key !== null && key !== void 0 && (_key$toLowerCase = key.toLowerCase()) !== null && _key$toLowerCase !== void 0 && _key$toLowerCase.startsWith('color'));
     })))
   }) : undefined;
   var compactThemeConfig = isCompact && !isAliyun ? isDark ? compactTheme : _objectSpread(_objectSpread({}, compactTheme), {}, {
-    token: _objectSpread(_objectSpread({}, compactTheme.token), Object.fromEntries(Object.entries(defaultTheme.token).filter(function (_ref6) {
+    token: _objectSpread(_objectSpread({}, compactTheme.token), Object.fromEntries(Object.entries(defaultTheme.token).filter(function (_ref8) {
       var _key$toLowerCase2;
-      var _ref7 = _slicedToArray(_ref6, 1),
-        key = _ref7[0];
+      var _ref9 = _slicedToArray(_ref8, 1),
+        key = _ref9[0];
       return (key === null || key === void 0 || (_key$toLowerCase2 = key.toLowerCase()) === null || _key$toLowerCase2 === void 0 ? void 0 : _key$toLowerCase2.startsWith('color')) && !['colorBgBase', 'colorTextBase'].includes(key);
     })))
   }) : undefined;
   var mergedTheme = merge({}, isAliyun ? {} : isDark || isCompact ? themeConfig.defaultSeed : defaultTheme, parentContext.theme, aliyunThemeConfig, darkThemeConfig, compactThemeConfig, theme);
   var _themeConfig$useToken = themeConfig.useToken(),
     token = _themeConfig$useToken.token;
-  var fontFamily = ((_mergedTheme$token = mergedTheme.token) === null || _mergedTheme$token === void 0 ? void 0 : _mergedTheme$token.fontFamily) || token.fontFamily;
-  var fontWeightWeak = ((_mergedTheme$token2 = mergedTheme.token) === null || _mergedTheme$token2 === void 0 ? void 0 : _mergedTheme$token2.fontWeightWeak) || token.fontWeightWeak;
-  var fontWeight = ((_mergedTheme$token3 = mergedTheme.token) === null || _mergedTheme$token3 === void 0 ? void 0 : _mergedTheme$token3.fontWeight) || token.fontWeight;
-  var fontWeightStrong = ((_mergedTheme$token4 = mergedTheme.token) === null || _mergedTheme$token4 === void 0 ? void 0 : _mergedTheme$token4.fontWeightStrong) || token.fontWeightStrong;
+  var fontFamily = ((_mergedTheme$token2 = mergedTheme.token) === null || _mergedTheme$token2 === void 0 ? void 0 : _mergedTheme$token2.fontFamily) || token.fontFamily;
+  var fontSize = (_mergedTheme$token$fo = (_mergedTheme$token3 = mergedTheme.token) === null || _mergedTheme$token3 === void 0 ? void 0 : _mergedTheme$token3.fontSize) !== null && _mergedTheme$token$fo !== void 0 ? _mergedTheme$token$fo : token.fontSize;
+  var fontWeightWeak = ((_mergedTheme$token4 = mergedTheme.token) === null || _mergedTheme$token4 === void 0 ? void 0 : _mergedTheme$token4.fontWeightWeak) || token.fontWeightWeak;
+  var fontWeight = ((_mergedTheme$token5 = mergedTheme.token) === null || _mergedTheme$token5 === void 0 ? void 0 : _mergedTheme$token5.fontWeight) || token.fontWeight;
+  var fontWeightStrong = ((_mergedTheme$token6 = mergedTheme.token) === null || _mergedTheme$token6 === void 0 ? void 0 : _mergedTheme$token6.fontWeightStrong) || token.fontWeightStrong;
 
   // inherit from parent StyleProvider
   var parentStyleContext = React.useContext(StyleContext);
@@ -105,8 +135,8 @@ var ConfigProvider = function ConfigProvider(_ref3) {
     }, parentContext.wave, wave),
     card: merge({}, parentContext.card, card),
     collapse: merge({}, {
-      expandIcon: function expandIcon(_ref8) {
-        var isActive = _ref8.isActive;
+      expandIcon: function expandIcon(_ref10) {
+        var isActive = _ref10.isActive;
         return /*#__PURE__*/_jsx(CaretRightOutlined, {
           rotate: isActive ? 90 : 0
         });
@@ -118,12 +148,12 @@ var ConfigProvider = function ConfigProvider(_ref3) {
     spin: merge({}, parentContext.spin, spin),
     table: merge({}, {
       expandable: {
-        expandIcon: function expandIcon(_ref9) {
-          var _mergedTheme$token5, _mergedTheme$token6;
-          var expandable = _ref9.expandable,
-            expanded = _ref9.expanded,
-            onExpand = _ref9.onExpand,
-            record = _ref9.record;
+        expandIcon: function expandIcon(_ref11) {
+          var _mergedTheme$token7, _mergedTheme$token8;
+          var expandable = _ref11.expandable,
+            expanded = _ref11.expanded,
+            onExpand = _ref11.onExpand,
+            record = _ref11.record;
           return expandable && /*#__PURE__*/_jsx(CaretRightOutlined, {
             onClick: function onClick(e) {
               return onExpand(record, e);
@@ -132,14 +162,14 @@ var ConfigProvider = function ConfigProvider(_ref3) {
               // marginRight: mergedTheme.token?.marginXS || 8,
               transition: "transform 0.2s",
               transform: expanded ? 'rotate(90deg)' : undefined,
-              color: ((_mergedTheme$token5 = mergedTheme.token) === null || _mergedTheme$token5 === void 0 ? void 0 : _mergedTheme$token5.colorIcon) || ((_mergedTheme$token6 = mergedTheme.token) === null || _mergedTheme$token6 === void 0 ? void 0 : _mergedTheme$token6.colorTextSecondary)
+              color: ((_mergedTheme$token7 = mergedTheme.token) === null || _mergedTheme$token7 === void 0 ? void 0 : _mergedTheme$token7.colorIcon) || ((_mergedTheme$token8 = mergedTheme.token) === null || _mergedTheme$token8 === void 0 ? void 0 : _mergedTheme$token8.colorTextSecondary)
             }
           });
         }
       }
     }, parentContext.table, table),
     tabs: merge({}, parentContext.tabs, tabs),
-    theme: merge({}, mergedTheme, {
+    theme: merge({}, mergedTheme, getLocaleFontSizeThemePatch(mergedLocale, mergedTheme, fontSize), {
       token: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, getLocaleTokenValue(mergedTheme.token || {}, mergedLocale, 'fontFamily', fontFamily, fontFamilyEn)), getLocaleTokenValue(mergedTheme.token || {}, mergedLocale, 'fontWeightWeak', fontWeightWeak, fontWeightWeakEn)), getLocaleTokenValue(mergedTheme.token || {}, mergedLocale, 'fontWeight', fontWeight, fontWeightEn)), getLocaleTokenValue(mergedTheme.token || {}, mergedLocale, 'fontWeightStrong', fontWeightStrong, fontWeightStrongEn))
     }),
     renderEmpty: parentContext.renderEmpty || function (componentName) {

package/es/filter/FilterContext.d.ts

@@ -1,5 +1,5 @@
 import type { FC, ReactNode } from 'react';
-export type FilterComponentName = 'select' | 'checkbox' | 'cascader' | 'switch' | 'range' | 'input';
+export type FilterComponentName = 'select' | 'checkbox' | 'cascader' | 'switch' | 'range' | 'input' | 'slot';
 export type FilterValue = string | string[] | string[][] | boolean | [any, any] | null | undefined;
 export interface FilterValueItem {
     id: string;

package/es/filter/components/FilterButton.js

@@ -1,6 +1,6 @@
 "use client";
 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 = ["children", "icon", "label", "bordered", "onClear", "content", "footer", "trigger", "placement", "disabled", "loading", "selected", "extra", "autoCloseOnSelect", "onSelect", "showLabelDivider", "showSuffixIcon", "_isInWrapComponent", "_isFlat", "style"],
+var _excluded = ["children", "icon", "label", "bordered", "onClear", "content", "footer", "trigger", "placement", "disabled", "loading", "selected", "extra", "autoCloseOnSelect", "onSelect", "showLabelDivider", "showSuffixIcon", "_isInWrapComponent", "_isFlat", "style", "allowClear"],
   _excluded2 = ["onOpenChange"];
 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; }
@@ -15,7 +15,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { Flex, Popover } from 'antd';
 import Spin from "../../spin";
 import theme from "../../theme";
@@ -58,6 +58,8 @@ var FilterButton = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _ref$_isFlat = _ref._isFlat,
     _isFlat = _ref$_isFlat === void 0 ? false : _ref$_isFlat,
     style = _ref.style,
+    _ref$allowClear = _ref.allowClear,
+    allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _theme$useToken = theme.useToken(),
     token = _theme$useToken.token;
@@ -67,6 +69,10 @@ var FilterButton = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var _useState3 = useState(),
+    _useState4 = _slicedToArray(_useState3, 2),
+    popoverWidth = _useState4[0],
+    setPopoverWidth = _useState4[1];
   var _useFilterStyle = useFilterStyle(),
     wrapSSR = _useFilterStyle.wrapSSR,
     prefixCls = _useFilterStyle.prefixCls;
@@ -97,11 +103,26 @@ var FilterButton = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var handleOpenChange = function handleOpenChange(newOpen) {
     if (!disabled) {
       setOpen(newOpen);
-      // 调用外部传入的 onOpenChange 回调，让父组件能够实时监听状态变化
       externalOnOpenChange === null || externalOnOpenChange === void 0 || externalOnOpenChange(newOpen);
     }
   };
 
+  // 折叠模式下实时监听按钮宽度变化，同步到 Popover 面板宽度
+  useEffect(function () {
+    if (!open || !isCollapsed || _isInWrapComponent || !innerRef.current) {
+      return;
+    }
+    var el = innerRef.current;
+    setPopoverWidth(el.offsetWidth);
+    var observer = new ResizeObserver(function () {
+      setPopoverWidth(el.offsetWidth);
+    });
+    observer.observe(el);
+    return function () {
+      return observer.disconnect();
+    };
+  }, [open, isCollapsed, _isInWrapComponent]);
+
   // 使用 useMemo 缓存 content，避免每次都重新创建
   var popoverContent = useMemo(function () {
     return /*#__PURE__*/_jsxs(_Fragment, {
@@ -135,11 +156,13 @@ var FilterButton = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onOpenChange: handleOpenChange,
     forceRender: _isInWrapComponent,
     styles: {
-      body: {
+      body: _objectSpread({
         padding: 0,
         maxWidth: 300,
         minWidth: 120
-      }
+      }, isCollapsed && !_isInWrapComponent && popoverWidth ? {
+        width: popoverWidth
+      } : {})
     }
   }, popoverProps), {}, {
     children: /*#__PURE__*/_jsx("div", {
@@ -175,11 +198,11 @@ var FilterButton = /*#__PURE__*/forwardRef(function (_ref, ref) {
           }) : showSuffixIcon ? /*#__PURE__*/_jsxs("div", {
             className: getFilterCls(prefixCls, 'icon-wrapper'),
             children: [/*#__PURE__*/_jsx(DownOutlined, {
-              className: selected ? getFilterCls(prefixCls, 'arrow-icon') : '',
+              className: selected && allowClear ? getFilterCls(prefixCls, 'arrow-icon') : '',
               style: disabled ? {
                 color: 'var(--ob-color-icon-disabled)'
               } : undefined
-            }), selected && /*#__PURE__*/_jsx("div", {
+            }), selected && allowClear && /*#__PURE__*/_jsx("div", {
               className: getFilterCls(prefixCls, 'clear-icon'),
               onClick: function onClick(e) {
                 if (!disabled) {

package/es/filter/components/FilterCascader/components/FlatCascaderContent/index.d.ts

@@ -1,12 +1,13 @@
 import React from 'react';
+import type { CascaderPanelProps } from 'antd';
 import type { CascaderOption } from '../../types';
 import type { FilterButtonRef } from '../../../FilterButton';
-interface FlatCascaderContentProps {
+interface FlatCascaderContentProps extends CascaderPanelProps {
     options: CascaderOption[];
-    currentValue: string[][];
+    currentValue: (string | number)[][];
     multiple: boolean;
     filterButtonRef: React.RefObject<FilterButtonRef>;
-    onValueChange: (value: string[][]) => void;
+    onValueChange: (value: (string | number)[][]) => void;
 }
 /**
  * Flat 模式的级联内容容器组件

package/es/filter/components/FilterCascader/components/FlatCascaderContent/index.js

@@ -1,4 +1,13 @@
 "use client";
+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 = ["options", "currentValue", "filterButtonRef", "multiple", "onValueChange"];
+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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+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 _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 React, { useMemo } from 'react';
 import { Cascader } from 'antd';
 
@@ -18,7 +27,8 @@ export var FlatCascaderContent = function FlatCascaderContent(_ref) {
     filterButtonRef = _ref.filterButtonRef,
     _ref$multiple = _ref.multiple,
     multiple = _ref$multiple === void 0 ? false : _ref$multiple,
-    onValueChange = _ref.onValueChange;
+    onValueChange = _ref.onValueChange,
+    restProps = _objectWithoutProperties(_ref, _excluded);
   // 将组件内部的值格式转换为 Cascader.Panel 需要的格式
   // 组件内部：[[parent, child], ...] 或 [[parent, child]]
   // Cascader.Panel：
@@ -37,7 +47,7 @@ export var FlatCascaderContent = function FlatCascaderContent(_ref) {
   }, [currentValue, multiple]);
 
   // 处理 Cascader.Panel 的值变化
-  var handleCascaderChange = function handleCascaderChange(value, _selectedOptions) {
+  var handleCascaderChange = function handleCascaderChange(value) {
     if (multiple) {
       // 多选：value 是 string[][]，如 [['frontend', 'react'], ['backend', 'java']]
       onValueChange(value);
@@ -50,15 +60,19 @@ export var FlatCascaderContent = function FlatCascaderContent(_ref) {
   };
 
   // 使用条件渲染来处理 multiple 属性的类型问题
-  return multiple ? /*#__PURE__*/_jsx(Cascader.Panel, {
+  return multiple ?
+  /*#__PURE__*/
+  // @ts-ignore-next-line
+  _jsx(Cascader.Panel, _objectSpread({
     options: options,
     value: cascaderValue,
     onChange: handleCascaderChange,
-    multiple: multiple
-  }) : /*#__PURE__*/_jsx(Cascader.Panel, {
+    multiple: multiple,
+    showCheckedStrategy: Cascader.SHOW_CHILD
+  }, restProps)) : /*#__PURE__*/_jsx(Cascader.Panel, _objectSpread({
     options: options,
     value: cascaderValue,
     onChange: handleCascaderChange,
     multiple: false
-  });
+  }, restProps));
 };

package/es/filter/components/FilterCascader/components/NormalCascaderContent.js

@@ -1,8 +1,4 @@
 "use client";
-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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-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 _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 _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); }
@@ -16,7 +12,6 @@ import theme from "../../../../theme";
 import Input from "../../../../input";
 import Empty from "../../../../empty";
 import { CheckOutlined, CloseOutlined, RightOutlined, SearchOutlined } from '@oceanbase/icons';
-import classNames from 'classnames';
 import { getFilterCls } from "../../../style";
 import { MAX_HEIGHT, PADDING_VERTICAL, PADDING_HORIZONTAL, GAP_SIZE_SMALL } from "../constants";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -133,7 +128,7 @@ export var NormalCascaderContent = function NormalCascaderContent(_ref) {
           },
           children: /*#__PURE__*/_jsx(Flex, {
             gap: GAP_SIZE_SMALL * 2,
-            className: classNames(getFilterCls(prefixCls, 'select-option'), _defineProperty({}, getFilterCls(prefixCls, 'has-selected'), isNodeSelected)),
+            className: getFilterCls(prefixCls, 'select-option'),
             justify: "space-between",
             align: "center",
             onClick: handleNodeClick,
@@ -229,7 +224,7 @@ export var NormalCascaderContent = function NormalCascaderContent(_ref) {
           },
           children: /*#__PURE__*/_jsxs(Flex, {
             gap: GAP_SIZE_SMALL * 2,
-            className: classNames(getFilterCls(prefixCls, 'select-option'), _defineProperty({}, getFilterCls(prefixCls, 'has-selected'), hasSelectedChildren)),
+            className: getFilterCls(prefixCls, 'select-option'),
             justify: "space-between",
             align: "center",
             style: {

package/es/filter/components/FilterInput.d.ts

@@ -11,6 +11,8 @@ export interface FilterInputProps extends BaseFilterProps {
     inputProps?: InputProps;
     /** Switch 组件的额外属性 */
     switchProps?: SwitchProps;
+    /** 是否显示开关，默认为 false */
+    showSwitch?: boolean;
 }
 declare const FilterInput: FC<FilterInputProps>;
 export default FilterInput;

package/es/filter/components/FilterInput.js

@@ -1,6 +1,6 @@
 "use client";
 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 = ["value", "onChange", "icon", "label", "bordered", "inputProps", "switchProps"];
+var _excluded = ["value", "onChange", "icon", "label", "bordered", "inputProps", "switchProps", "showSwitch"];
 function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 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; }
@@ -36,6 +36,7 @@ var FilterInput = function FilterInput(_ref) {
     bordered = _ref$bordered === void 0 ? true : _ref$bordered,
     inputProps = _ref.inputProps,
     switchProps = _ref.switchProps,
+    showSwitch = _ref.showSwitch,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _theme$useToken = theme.useToken(),
     token = _theme$useToken.token;
@@ -93,14 +94,16 @@ var FilterInput = function FilterInput(_ref) {
       align: "center",
       children: [/*#__PURE__*/_jsx("span", {
         children: label
-      }), /*#__PURE__*/_jsx(Switch, _objectSpread({
+      }), showSwitch && /*#__PURE__*/_jsx(Switch, _objectSpread({
         checked: switchValue,
         onChange: function onChange(val) {
           return setSwitchValue(val);
         },
         size: "small"
       }, switchProps))]
-    }), switchValue ? /*#__PURE__*/_jsx("div", {
+    }), showSwitch ?
+    // 有开关：根据 switchValue 决定是否显示 Input
+    switchValue && /*#__PURE__*/_jsx("div", {
       style: {
         marginTop: 8
       },
@@ -108,7 +111,18 @@ var FilterInput = function FilterInput(_ref) {
         value: currentValue,
         onChange: handleChange
       }, inputProps))
-    }) : null]
+    }) :
+    /*#__PURE__*/
+    // 无开关：直接显示 Input
+    _jsx("div", {
+      style: {
+        marginTop: 8
+      },
+      children: /*#__PURE__*/_jsx(Input, _objectSpread({
+        value: currentValue,
+        onChange: handleChange
+      }, inputProps))
+    })]
   });
 
   // 如果处于折叠模式，只渲染内容部分

package/es/filter/components/FilterSlot.d.ts

@@ -0,0 +1,28 @@
+import type { FC, ReactNode } from 'react';
+import type { BaseFilterProps, InternalFilterProps } from '../type';
+export interface FilterSlotProps extends BaseFilterProps, InternalFilterProps {
+    /**
+     * 直接渲染的自定义内容，不包裹 FilterButton + Popover。
+     * Filter.Slot 仅作为响应式收集的包裹容器，
+     * 会通过 cloneElement 自动注入 value/onChange。
+     */
+    children?: ReactNode;
+    /**
+     * Popover 弹框中的自定义筛选内容。
+     * 设置后使用 FilterButton + Popover 模式，
+     * 会通过 cloneElement 自动注入 value/onChange。
+     */
+    dropdownRender?: ReactNode;
+    /** 当前筛选值（受控） */
+    value?: any;
+    /** 默认筛选值（非受控） */
+    defaultValue?: any;
+    /** 值变化回调 */
+    onChange?: (value: any) => void;
+    /** 将 value 格式化为展示文本，用于 FilterButton 标签和折叠态 Tooltip */
+    formatValue?: (value: any) => string;
+    /** 未选值时的占位文本 */
+    placeholder?: string;
+}
+declare const FilterSlot: FC<FilterSlotProps>;
+export default FilterSlot;