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

package/es/filter/index.js

@@ -8,14 +8,18 @@ import Switch from "./components/FilterSwitch";
 import Wrap from "./components/FilterWrap";
 import ResponsiveGroup from "./components/ResponsiveFilterGroup";
 export { FilterProvider, useFilterContext } from "./FilterContext";
+function markAsFilterComponent(component) {
+  component.__isFilterComponent = true;
+  return component;
+}
 var Filter = {
-  Select: Select,
-  Checkbox: Checkbox,
-  Range: Range,
+  Select: markAsFilterComponent(Select),
+  Checkbox: markAsFilterComponent(Checkbox),
+  Range: markAsFilterComponent(Range),
   Wrap: Wrap,
-  Cascader: Cascader,
-  Switch: Switch,
-  Input: Input,
+  Cascader: markAsFilterComponent(Cascader),
+  Switch: markAsFilterComponent(Switch),
+  Input: markAsFilterComponent(Input),
   ResponsiveGroup: ResponsiveGroup
 };
 export default Filter;

package/lib/alert/index.d.ts

@@ -6,7 +6,7 @@ export interface AlertProps extends AntAlertProps {
     mini?: boolean;
 }
 declare const Alert: {
-    ({ type: typeProp, showIcon, closable, ghost, mini, banner, action, prefixCls: customizePrefixCls, className, ...restProps }: AlertProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
+    ({ type: typeProp, showIcon, closable, closeIcon, ghost, mini, banner, action, prefixCls: customizePrefixCls, className, ...restProps }: AlertProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
     ErrorBoundary: typeof import("antd/es/alert/ErrorBoundary").default;
     displayName: string;
 };

package/lib/alert/index.js

@@ -37,6 +37,7 @@ const Alert = ({
   type: typeProp,
   showIcon = true,
   closable,
+  closeIcon,
   ghost,
   mini,
   banner,
@@ -53,7 +54,7 @@ const Alert = ({
   const prefixCls = getPrefixCls('alert', customizePrefixCls);
   const [wrapCSSVar] = (0, _style.default)(prefixCls);
   const alertCls = (0, _classnames.default)({
-    [`${prefixCls}-closable`]: closable,
+    [`${prefixCls}-closable`]: closable || closeIcon,
     [`${prefixCls}-ghost`]: ghost,
     [`${prefixCls}-mini`]: mini,
     [`${prefixCls}-with-action`]: !!action
@@ -62,6 +63,7 @@ const Alert = ({
     type: type,
     showIcon: showIcon,
     closable: closable,
+    closeIcon: closeIcon,
     banner: banner,
     icon: iconMapOutlined[type],
     action: action,

package/lib/filter/components/FilterButton.js

@@ -111,6 +111,7 @@ const FilterButton = /*#__PURE__*/(0, _react.forwardRef)(({
     content: popoverContent,
     open: open && !disabled,
     onOpenChange: handleOpenChange,
+    forceRender: _isInWrapComponent,
     styles: {
       body: {
         padding: 0,

package/lib/filter/components/FilterCheckbox.js

@@ -143,8 +143,30 @@ const FilterCheckbox = ({
     const iconWidth = 10;
     const iconWidthUnselected = 8;
     const overlapDistance = 6;
-    const containerWidth = iconWidth + (options.length - 1) * overlapDistance + 1;
-    const selectedStatuses = selectedValues || [];
+
+    // 按颜色分组选项，并检查每种颜色是否有选中的选项
+    const colorGroups = [];
+    const colorMap = new Map();
+    options.forEach(option => {
+      if (option.color) {
+        const isSelected = selectedValues.includes(option.value);
+        const existing = colorMap.get(option.color);
+        if (existing) {
+          // 如果已有该颜色，更新选中状态（只要有一个选中即为选中）
+          if (isSelected) {
+            existing.hasSelected = true;
+          }
+        } else {
+          const group = {
+            color: option.color,
+            hasSelected: isSelected
+          };
+          colorMap.set(option.color, group);
+          colorGroups.push(group);
+        }
+      }
+    });
+    const containerWidth = iconWidth + (colorGroups.length - 1) * overlapDistance + 1;
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       style: {
         position: 'relative',
@@ -153,8 +175,8 @@ const FilterCheckbox = ({
         display: 'flex',
         alignItems: 'center'
       },
-      children: options.map((item, index) => {
-        const isSelected = selectedStatuses.includes(item.value) && item.color;
+      children: colorGroups.map((group, index) => {
+        const isSelected = group.hasSelected;
         const baseSize = isSelected ? iconWidth : iconWidthUnselected;
         return isSelected ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           style: {
@@ -164,10 +186,10 @@ const FilterCheckbox = ({
             height: baseSize,
             borderRadius: '50%',
             zIndex: index,
-            backgroundColor: item.color,
+            backgroundColor: group.color,
             border: `1px solid ${token.white}`
           }
-        }, item.value) : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        }, group.color) : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           style: {
             position: 'absolute',
             left: index * overlapDistance,
@@ -184,7 +206,7 @@ const FilterCheckbox = ({
               border: `1px solid ${token.colorBorderSecondary}`
             }
           })
-        }, item.value);
+        }, group.color);
       })
     });
   }, [isStatusMode, options, selectedValues, token]);

package/lib/filter/components/FilterWrap.js

@@ -56,12 +56,39 @@ const FilterWrap = ({
       value: item.value
     })));
   }, [collapsed, contextValue.filterValues]);
-  const filterValues = (0, _react.useMemo)(() => {
+  const allFilterValues = (0, _react.useMemo)(() => {
     if (!collapsed) return [];
     return contextValue.filterValues || [];
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [collapsed, stableFilterValuesKey]);
 
+  // 从 children 中递归提取 label 集合，用于过滤 filterValues 只保留当前折叠项的值
+  // children 结构可能是 Fragment → Form.Item → Filter.Select，需要递归查找
+  const childLabelSet = (0, _react.useMemo)(() => {
+    const labels = new Set();
+    const extractLabel = node => {
+      if (! /*#__PURE__*/(0, _react.isValidElement)(node)) return;
+      const props = node.props;
+      if (props.label !== undefined) {
+        labels.add(props.label);
+        return;
+      }
+      if (props.children) {
+        if ( /*#__PURE__*/(0, _react.isValidElement)(props.children)) {
+          extractLabel(props.children);
+        } else if (Array.isArray(props.children)) {
+          props.children.forEach(extractLabel);
+        }
+      }
+    };
+    _react.Children.forEach(children, extractLabel);
+    return labels;
+  }, [children]);
+  const filterValues = (0, _react.useMemo)(() => {
+    if (childLabelSet.size === 0) return allFilterValues;
+    return allFilterValues.filter(item => childLabelSet.has(item.label));
+  }, [allFilterValues, childLabelSet]);
+
   // 格式化值用于 Tooltip 显示
   const formatValueForTooltip = (0, _react.useCallback)((value, options, componentName) => {
     if (!value) return '';