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

package/es/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/es/alert/index.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 = ["type", "showIcon", "closable", "ghost", "mini", "banner", "action", "prefixCls", "className"];
+var _excluded = ["type", "showIcon", "closable", "closeIcon", "ghost", "mini", "banner", "action", "prefixCls", "className"];
 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; }
@@ -33,6 +33,7 @@ var Alert = function Alert(_ref) {
     _ref$showIcon = _ref.showIcon,
     showIcon = _ref$showIcon === void 0 ? true : _ref$showIcon,
     closable = _ref.closable,
+    closeIcon = _ref.closeIcon,
     ghost = _ref.ghost,
     mini = _ref.mini,
     banner = _ref.banner,
@@ -48,11 +49,12 @@ var Alert = function Alert(_ref) {
   var _useStyle = useStyle(prefixCls),
     _useStyle2 = _slicedToArray(_useStyle, 1),
     wrapCSSVar = _useStyle2[0];
-  var alertCls = classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-closable"), closable), "".concat(prefixCls, "-ghost"), ghost), "".concat(prefixCls, "-mini"), mini), "".concat(prefixCls, "-with-action"), !!action), className);
+  var alertCls = classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-closable"), closable || closeIcon), "".concat(prefixCls, "-ghost"), ghost), "".concat(prefixCls, "-mini"), mini), "".concat(prefixCls, "-with-action"), !!action), className);
   return wrapCSSVar( /*#__PURE__*/_jsx(AntAlert, _objectSpread({
     type: type,
     showIcon: showIcon,
     closable: closable,
+    closeIcon: closeIcon,
     banner: banner,
     icon: iconMapOutlined[type],
     action: action,

package/es/filter/components/FilterButton.js

@@ -133,6 +133,7 @@ var FilterButton = /*#__PURE__*/forwardRef(function (_ref, ref) {
     content: popoverContent,
     open: open && !disabled,
     onOpenChange: handleOpenChange,
+    forceRender: _isInWrapComponent,
     styles: {
       body: {
         padding: 0,

package/es/filter/components/FilterCheckbox.js

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

package/es/filter/components/FilterWrap.js

@@ -67,12 +67,41 @@ var FilterWrap = function FilterWrap(_ref) {
       };
     }));
   }, [collapsed, contextValue.filterValues]);
-  var filterValues = useMemo(function () {
+  var allFilterValues = useMemo(function () {
     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，需要递归查找
+  var childLabelSet = useMemo(function () {
+    var labels = new Set();
+    var extractLabel = function extractLabel(node) {
+      if (! /*#__PURE__*/isValidElement(node)) return;
+      var props = node.props;
+      if (props.label !== undefined) {
+        labels.add(props.label);
+        return;
+      }
+      if (props.children) {
+        if ( /*#__PURE__*/isValidElement(props.children)) {
+          extractLabel(props.children);
+        } else if (Array.isArray(props.children)) {
+          props.children.forEach(extractLabel);
+        }
+      }
+    };
+    Children.forEach(children, extractLabel);
+    return labels;
+  }, [children]);
+  var filterValues = useMemo(function () {
+    if (childLabelSet.size === 0) return allFilterValues;
+    return allFilterValues.filter(function (item) {
+      return childLabelSet.has(item.label);
+    });
+  }, [allFilterValues, childLabelSet]);
+
   // 格式化值用于 Tooltip 显示
   var formatValueForTooltip = useCallback(function (value, options, componentName) {
     if (!value) return '';