@hsu-react/ui 0.0.9 → 0.0.10

package/lib/components/Search/_components/SearchBase/index.js

@@ -0,0 +1,169 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _FormItem = _interopRequireDefault(require("../../../FormItem"));
+var _indexModule = _interopRequireDefault(require("../../index.module.scss"));
+var _hooks = require("../../_hooks");
+var _ButtonGroup = require("../ButtonGroup");
+var _SearchButtons = require("../SearchButtons");
+var _ExpandButton = require("../ExpandButton");
+var _FilterDropdown = require("../FilterDropdown");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+/** 暴露给变体扩展渲染（如高级筛选抽屉）的上下文 */
+
+/**
+ * Search 各变体共享的基础实现：
+ * 表单渲染、列布局、展开/收起、按钮组、权限控制。
+ * 变体只负责自身差异（筛选器、折叠开关、高级筛选抽屉等）。
+ */
+const SearchBase = props => {
+  const {
+    searchItems = [],
+    moreSearchItems = [],
+    className,
+    onSearch,
+    onReset,
+    externalForm,
+    hasPermi,
+    columnNum = 4,
+    beforeButtonGroup,
+    affterButtonGroup,
+    searchData,
+    minLabelWidth,
+    defaultExpanded = false,
+    onExpandChange,
+    autoAdaptWidth = true,
+    baseWidth,
+    onValuesChange,
+    searchDisabled = false,
+    showAllSearchItems = false,
+    searchText,
+    resetText,
+    onFilterChange,
+    columnOffsetWidth = 0,
+    advancedFilters = false,
+    showFilter = false,
+    afterForm,
+    renderOutside
+  } = props;
+  const [form] = _antd.Form.useForm(externalForm);
+  const {
+    containerRef,
+    buttonGroupRef,
+    cls,
+    getLabelWidth,
+    processedSearchItems,
+    setSearchItems,
+    currentSearchItems,
+    totalColumnNum,
+    expand,
+    setExpand,
+    toggleExpand,
+    showExpandButton,
+    onSearchClick,
+    onResetClick,
+    shouldRender,
+    permitted
+  } = (0, _hooks.useSearchCommon)({
+    form,
+    searchItems,
+    moreSearchItems,
+    searchData,
+    hasPermi,
+    beforeButtonGroup,
+    affterButtonGroup,
+    columnNum,
+    autoAdaptWidth,
+    defaultExpanded,
+    onExpandChange,
+    showAllSearchItems,
+    minLabelWidth,
+    baseWidth,
+    onSearch,
+    onReset,
+    columnOffsetWidth
+  });
+
+  // 按列分组预计算（用于对齐同列 label 宽度），避免在 map 中逐项重复 filter
+  const columnGroups = (0, _react.useMemo)(() => {
+    const groups = Array.from({
+      length: totalColumnNum
+    }, () => []);
+    currentSearchItems.forEach((item, idx) => {
+      groups[idx % totalColumnNum].push(item);
+    });
+    return groups;
+  }, [currentSearchItems, totalColumnNum]);
+  if (!shouldRender) {
+    return null;
+  }
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      ref: containerRef,
+      className: (0, _classnames.default)(_indexModule.default.Search, className),
+      style: {
+        "--column-number": totalColumnNum,
+        "--column-offset-width": `${columnOffsetWidth}px`
+      },
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        className: (0, _classnames.default)(_indexModule.default.searchOption, _indexModule.default[expand.toString()]),
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Form, {
+          form: form,
+          className: (0, _classnames.default)(_indexModule.default.option, cls),
+          onValuesChange: onValuesChange,
+          children: [permitted && currentSearchItems.map((item, idx) => /*#__PURE__*/(0, _react.createElement)(_FormItem.default, {
+            ...item,
+            key: item.name,
+            className: (0, _classnames.default)(_indexModule.default.item, item.className, {
+              [_indexModule.default.unFill]: item.width !== undefined
+            }),
+            label: advancedFilters ? undefined : item.label,
+            labelWidth: advancedFilters || item.width !== undefined ? undefined : getLabelWidth(columnGroups[idx % totalColumnNum], undefined, minLabelWidth)
+          })), (beforeButtonGroup?.length || affterButtonGroup?.length || permitted) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ButtonGroup.ButtonGroup, {
+            beforeButtonGroup: beforeButtonGroup,
+            affterButtonGroup: affterButtonGroup,
+            expandButton: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandButton.ExpandButton, {
+              expand: expand,
+              toggleExpand: toggleExpand,
+              advancedFilters: advancedFilters,
+              showExpandButton: showExpandButton,
+              showAllSearchItems: showAllSearchItems || !!moreSearchItems?.length
+            }),
+            permitted: permitted,
+            ref: buttonGroupRef,
+            children: [currentSearchItems.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchButtons.SearchButtons, {
+              onSearch: onSearchClick,
+              onReset: onResetClick,
+              searchDisabled: searchDisabled,
+              searchText: searchText,
+              resetText: resetText
+            }), showFilter && /*#__PURE__*/(0, _jsxRuntime.jsx)(_FilterDropdown.FilterDropdown, {
+              searchItems: processedSearchItems,
+              originalSearchItems: searchItems,
+              setSearchItems: setSearchItems,
+              onFilterChange: onFilterChange
+            })]
+          })]
+        })
+      }), permitted && afterForm]
+    }), permitted && renderOutside?.({
+      form,
+      expand,
+      setExpand,
+      processedSearchItems,
+      getLabelWidth,
+      onSearchClick,
+      onResetClick
+    })]
+  });
+};
+var _default = exports.default = SearchBase;

package/lib/components/Search/_hooks/useSearchCommon.js

@@ -61,12 +61,10 @@ const useSearchCommon = params => {
   }, [moreSearchItems]);
 
   // 计算可见的搜索项数量
-  const visibleSearchItemCount = (0, _react.useMemo)(() => {
-    return visibleSearchItems.length;
-  }, [visibleSearchItems]);
+  const visibleSearchItemCount = visibleSearchItems.length;
 
   // 计算总列数（包括按钮组）
-  const baseTotalColumnNum = (0, _react.useMemo)(() => columnNum + 1, [columnNum]);
+  const baseTotalColumnNum = columnNum + 1;
 
   // 根据容器宽度动态调整列数
   const totalColumnNum = (0, _useAdaptiveColumnNum.useAdaptiveColumnNum)(containerRef, baseTotalColumnNum, autoAdaptWidth, 1,
@@ -78,7 +76,7 @@ const useSearchCommon = params => {
   baseWidth);
 
   // 计算调整后的搜索项列数（不包括按钮组）
-  const adaptiveColumnNum = (0, _react.useMemo)(() => Math.max(1, totalColumnNum - 1), [totalColumnNum]);
+  const adaptiveColumnNum = Math.max(1, totalColumnNum - 1);
 
   // 使用基于宽度的展开/收起控制
   const {
@@ -142,7 +140,7 @@ const useSearchCommon = params => {
     } = (0, _utils.calculateButtonGroupAndColumnWidth)(containerRef, buttonGroupRef, adaptiveColumnNum, columnOffsetWidth);
 
     // 判断按钮组宽度是否大于列宽，如果是，则显示 实际搜索项数量+1
-    if (buttonGroupWidth !== undefined && columnWidth !== undefined && (buttonGroupWidth > columnWidth || buttonGroupWidth < columnWidth && adaptiveColumnNum + 1 === visibleSearchItemCount)) {
+    if ((0, _utils.shouldDisplayExtraItem)(buttonGroupWidth, columnWidth, adaptiveColumnNum, visibleSearchItemCount)) {
       return adaptiveColumnNum + 1;
     }
     return adaptiveColumnNum;

package/lib/components/Search/_hooks/useSearchExpand.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useSearchExpand = useSearchExpand;
 var _react = require("react");
+var _utils = require("../_utils");
 /**
  * 基于宽度自适应控制展开/收起的Hook
  * @param containerRef 容器引用
@@ -34,19 +35,7 @@ function useSearchExpand(containerRef, buttonGroupRef, itemClassName, itemCount,
       const availableWidth = containerWidth - 30; // 15px padding on each side
 
       // 获取按钮组的实际宽度（计算所有子元素宽度总和）
-      let buttonGroupWidth = 0;
-      const buttonChildren = Array.from(buttonGroupRef.current.children);
-      if (buttonChildren.length > 0) {
-        // 计算所有子元素的宽度总和
-        let totalWidth = 0;
-        buttonChildren?.forEach(child => {
-          totalWidth += child.offsetWidth;
-        });
-        // 加上子元素之间的间距（column-gap: 10px）
-        const childGap = 5;
-        totalWidth += (buttonChildren.length - 1) * childGap;
-        buttonGroupWidth = totalWidth;
-      }
+      const buttonGroupWidth = (0, _utils.measureButtonGroupWidth)(buttonGroupRef.current) ?? 0;
 
       // 获取所有搜索项元素
       const items = container.querySelectorAll(`${itemClassName}`);

package/lib/components/Search/_utils/calculateButtonGroupAndColumnWidth.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.calculateButtonGroupAndColumnWidth = calculateButtonGroupAndColumnWidth;
+var _measureButtonGroupWidth = require("./measureButtonGroupWidth");
 /**
  * 计算按钮组宽度和列宽
  * @param containerRef 容器引用
@@ -21,16 +22,7 @@ function calculateButtonGroupAndColumnWidth(containerRef, buttonGroupRef, adapti
     const gap = 10; // 项之间的间距
 
     // 计算按钮组宽度
-    const buttonChildren = Array.from(buttonGroupRef.current.children);
-    if (buttonChildren.length > 0) {
-      let totalWidth = 0;
-      buttonChildren?.forEach(child => {
-        totalWidth += child.offsetWidth;
-      });
-      const childGap = 5;
-      totalWidth += (buttonChildren.length - 1) * childGap;
-      buttonGroupWidth = totalWidth;
-    }
+    buttonGroupWidth = (0, _measureButtonGroupWidth.measureButtonGroupWidth)(buttonGroupRef.current);
 
     // 计算列宽（单个搜索项的默认宽度）
     if (adaptiveColumnNum > 0) {

package/lib/components/Search/_utils/calculateVisibleItems.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.calculateVisibleItems = calculateVisibleItems;
+var _shouldDisplayExtraItem = require("./shouldDisplayExtraItem");
 /**
  * 计算当前应该显示的搜索项
  * @param searchItems 所有搜索项
@@ -17,7 +18,7 @@ exports.calculateVisibleItems = calculateVisibleItems;
  */
 function calculateVisibleItems(searchItems, expand, columnNum, visibleItemCount, autoAdaptWidth, buttonGroupWidth, columnWidth) {
   const visibleItems = searchItems.filter(item => item.visible);
-  const hasCustomWidth = searchItems.find(item => item.width !== undefined);
+  const hasCustomWidth = searchItems.some(item => item.width !== undefined);
   if (!expand) {
     // 当有自定义宽度时，使用自适应计算
     if (hasCustomWidth && autoAdaptWidth) {
@@ -27,10 +28,7 @@ function calculateVisibleItems(searchItems, expand, columnNum, visibleItemCount,
     } else if (!hasCustomWidth) {
       // 没有自定义宽度时，使用 columnNum（实际搜索项数量）
       // 判断按钮组宽度是否大于列宽，如果是，则显示 实际搜索项数量+1
-      let displayCount = columnNum;
-      if (buttonGroupWidth !== undefined && columnWidth !== undefined && (buttonGroupWidth > columnWidth || buttonGroupWidth < columnWidth && columnNum + 1 === visibleItems.length)) {
-        displayCount = columnNum + 1;
-      }
+      const displayCount = (0, _shouldDisplayExtraItem.shouldDisplayExtraItem)(buttonGroupWidth, columnWidth, columnNum, visibleItems.length) ? columnNum + 1 : columnNum;
       if (visibleItems.length >= displayCount) {
         return visibleItems.slice(0, displayCount);
       }

package/lib/components/Search/_utils/index.d.ts

@@ -1,3 +1,5 @@
 export { cleanSearchData } from "./cleanSearchData";
 export { calculateVisibleItems } from "./calculateVisibleItems";
 export { calculateButtonGroupAndColumnWidth } from "./calculateButtonGroupAndColumnWidth";
+export { measureButtonGroupWidth } from "./measureButtonGroupWidth";
+export { shouldDisplayExtraItem } from "./shouldDisplayExtraItem";

package/lib/components/Search/_utils/index.js

@@ -21,6 +21,20 @@ Object.defineProperty(exports, "cleanSearchData", {
     return _cleanSearchData.cleanSearchData;
   }
 });
+Object.defineProperty(exports, "measureButtonGroupWidth", {
+  enumerable: true,
+  get: function () {
+    return _measureButtonGroupWidth.measureButtonGroupWidth;
+  }
+});
+Object.defineProperty(exports, "shouldDisplayExtraItem", {
+  enumerable: true,
+  get: function () {
+    return _shouldDisplayExtraItem.shouldDisplayExtraItem;
+  }
+});
 var _cleanSearchData = require("./cleanSearchData");
 var _calculateVisibleItems = require("./calculateVisibleItems");
-var _calculateButtonGroupAndColumnWidth = require("./calculateButtonGroupAndColumnWidth");
+var _calculateButtonGroupAndColumnWidth = require("./calculateButtonGroupAndColumnWidth");
+var _measureButtonGroupWidth = require("./measureButtonGroupWidth");
+var _shouldDisplayExtraItem = require("./shouldDisplayExtraItem");

package/lib/components/Search/_utils/measureButtonGroupWidth.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 计算按钮组的实际宽度（所有子元素宽度总和 + 子元素间距）
+ * @param buttonGroupEl 按钮组元素
+ * @returns 按钮组宽度；无子元素时返回 undefined
+ */
+export declare function measureButtonGroupWidth(buttonGroupEl: HTMLElement | null): number | undefined;

package/lib/components/Search/_utils/measureButtonGroupWidth.js

@@ -0,0 +1,24 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.measureButtonGroupWidth = measureButtonGroupWidth;
+/**
+ * 计算按钮组的实际宽度（所有子元素宽度总和 + 子元素间距）
+ * @param buttonGroupEl 按钮组元素
+ * @returns 按钮组宽度；无子元素时返回 undefined
+ */
+function measureButtonGroupWidth(buttonGroupEl) {
+  if (!buttonGroupEl) return undefined;
+  const buttonChildren = Array.from(buttonGroupEl.children);
+  if (buttonChildren.length === 0) return undefined;
+  let totalWidth = 0;
+  buttonChildren.forEach(child => {
+    totalWidth += child.offsetWidth;
+  });
+  // 加上子元素之间的间距
+  const childGap = 5;
+  totalWidth += (buttonChildren.length - 1) * childGap;
+  return totalWidth;
+}

package/lib/components/Search/_utils/shouldDisplayExtraItem.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 判断收起状态下是否应多显示一个搜索项
+ *
+ * 规则：按钮组宽度大于列宽（按钮组独占更宽空间，首行有富余）；
+ * 或按钮组宽度小于列宽且可见项刚好比列数多 1（此时收起只会藏起 1 项，不如直接放下）。
+ * @param buttonGroupWidth 按钮组宽度
+ * @param columnWidth 列宽
+ * @param columnNum 搜索项列数（不含按钮组）
+ * @param visibleCount 可见搜索项总数
+ */
+export declare function shouldDisplayExtraItem(buttonGroupWidth: number | undefined, columnWidth: number | undefined, columnNum: number, visibleCount: number): boolean;

package/lib/components/Search/_utils/shouldDisplayExtraItem.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.shouldDisplayExtraItem = shouldDisplayExtraItem;
+/**
+ * 判断收起状态下是否应多显示一个搜索项
+ *
+ * 规则：按钮组宽度大于列宽（按钮组独占更宽空间，首行有富余）；
+ * 或按钮组宽度小于列宽且可见项刚好比列数多 1（此时收起只会藏起 1 项，不如直接放下）。
+ * @param buttonGroupWidth 按钮组宽度
+ * @param columnWidth 列宽
+ * @param columnNum 搜索项列数（不含按钮组）
+ * @param visibleCount 可见搜索项总数
+ */
+function shouldDisplayExtraItem(buttonGroupWidth, columnWidth, columnNum, visibleCount) {
+  return buttonGroupWidth !== undefined && columnWidth !== undefined && (buttonGroupWidth > columnWidth || buttonGroupWidth < columnWidth && columnNum + 1 === visibleCount);
+}

package/lib/components/Search/index.d.ts

@@ -26,5 +26,9 @@ export type SearchModePropsMap = {
     WithFilter: React.ComponentProps<SearchFC["WithFilter"]>;
     WithMore: React.ComponentProps<SearchFC["WithMore"]>;
 };
+/**
+ * 基础 Search 组件
+ * - 标准的搜索表单布局，自适应列数与展开/收起
+ */
 declare const Search: SearchFC;
 export default Search;

package/lib/components/Search/index.js

@@ -4,137 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _antd = require("antd");
-var _FormItem = _interopRequireDefault(require("../FormItem"));
-var _react = _interopRequireWildcard(require("react"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _indexModule = _interopRequireDefault(require("./index.module.scss"));
-var _hooks = require("./_hooks");
+var _react = _interopRequireDefault(require("react"));
 var _SearchCard = _interopRequireDefault(require("./SearchCard"));
 var _SearchAdvanced = _interopRequireDefault(require("./SearchAdvanced"));
 var _SearchCollapsible = _interopRequireDefault(require("./SearchCollapsible"));
 var _SearchWithFilter = _interopRequireDefault(require("./SearchWithFilter"));
 var _SearchWithMore = _interopRequireDefault(require("./SearchWithMore"));
-var _ButtonGroup = require("./_components/ButtonGroup");
-var _SearchButtons = require("./_components/SearchButtons");
-var _ExpandButton = require("./_components/ExpandButton");
+var _SearchBase = _interopRequireDefault(require("./_components/SearchBase"));
 var _jsxRuntime = require("react/jsx-runtime");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // 导出所有可用的 Search 模式键名
 
 // 导出 Search 模式映射类型
 
+/**
+ * 基础 Search 组件
+ * - 标准的搜索表单布局，自适应列数与展开/收起
+ */
 const Search = props => {
-  const {
-    searchItems = [],
-    moreSearchItems = [],
-    className,
-    onSearch,
-    onReset,
-    externalForm,
-    hasPermi,
-    columnNum = 4,
-    beforeButtonGroup,
-    affterButtonGroup,
-    searchData,
-    minLabelWidth,
-    defaultExpanded = false,
-    onExpandChange,
-    autoAdaptWidth = true,
-    baseWidth,
-    onValuesChange,
-    searchDisabled = false,
-    showAllSearchItems = false,
-    searchText,
-    resetText,
-    columnOffsetWidth = 0
-  } = props;
-  const [form] = _antd.Form.useForm(externalForm);
-  const {
-    containerRef,
-    buttonGroupRef,
-    cls,
-    getLabelWidth,
-    currentSearchItems,
-    totalColumnNum,
-    expand,
-    toggleExpand,
-    showExpandButton,
-    onSearchClick,
-    onResetClick,
-    shouldRender,
-    permitted
-  } = (0, _hooks.useSearchCommon)({
-    form,
-    searchItems,
-    moreSearchItems,
-    searchData,
-    hasPermi,
-    beforeButtonGroup,
-    affterButtonGroup,
-    columnNum,
-    autoAdaptWidth,
-    defaultExpanded,
-    onExpandChange,
-    showAllSearchItems,
-    minLabelWidth,
-    baseWidth,
-    onSearch,
-    onReset,
-    columnOffsetWidth
-  });
-  if (!shouldRender) {
-    return null;
-  }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-    ref: containerRef,
-    className: (0, _classnames.default)(_indexModule.default.Search, className),
-    style: {
-      "--column-number": totalColumnNum,
-      "--column-offset-width": `${columnOffsetWidth}px`
-    },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: (0, _classnames.default)(_indexModule.default.searchOption, _indexModule.default[expand.toString()]),
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Form, {
-        form: form,
-        className: (0, _classnames.default)(_indexModule.default.option, cls),
-        onValuesChange: onValuesChange,
-        children: [permitted && currentSearchItems?.map((item, idx) => {
-          const visibleCurrentItems = currentSearchItems.filter(i => i.visible !== false);
-          const columnIndex = idx % totalColumnNum;
-          const sameColumnItems = visibleCurrentItems.filter((_, _idx) => _idx % totalColumnNum === columnIndex);
-          return /*#__PURE__*/(0, _react.createElement)(_FormItem.default, {
-            ...item,
-            key: item.name,
-            className: (0, _classnames.default)(_indexModule.default.item, item.className, {
-              [_indexModule.default.unFill]: item.width !== undefined
-            }),
-            labelWidth: item.width !== undefined ? undefined : getLabelWidth(sameColumnItems, undefined, minLabelWidth)
-          });
-        }), (beforeButtonGroup?.length || affterButtonGroup?.length || permitted) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ButtonGroup.ButtonGroup, {
-          beforeButtonGroup: beforeButtonGroup,
-          affterButtonGroup: affterButtonGroup,
-          expandButton: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandButton.ExpandButton, {
-            expand: expand,
-            toggleExpand: toggleExpand,
-            advancedFilters: false,
-            showExpandButton: showExpandButton,
-            showAllSearchItems: showAllSearchItems || !!moreSearchItems?.length
-          }),
-          permitted: permitted,
-          ref: buttonGroupRef,
-          children: currentSearchItems.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchButtons.SearchButtons, {
-            onSearch: onSearchClick,
-            onReset: onResetClick,
-            searchDisabled: searchDisabled,
-            searchText: searchText,
-            resetText: resetText
-          })
-        })]
-      })
-    })
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchBase.default, {
+    ...props
   });
 };
 Search.Card = _SearchCard.default;

package/lib/components/Table/_hooks/useTableColumns.js

@@ -19,6 +19,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const MEASURE_ALIGN_FONT_SIZE = 14;
 // Canvas measureText 仅返回 advance width，较 DOM 实际渲染偏窄约 1px，补 2px 缓冲避免最宽行被挤压
 const MEASURE_ALIGN_BUFFER_PX = 2;
+// 单元格左右内边距合计（--td-padding: 4px 8px），用于把列宽抬到能放下定宽内容块
+const MEASURE_ALIGN_CELL_PADDING_PX = 16;
 
 // 计算 measureAlign 列的定宽（取本列所有行展示文本的最大像素宽）
 const getMeasureAlignWidth = (column, dataSource) => {
@@ -109,6 +111,15 @@ const useTableColumns = params => {
         }, 0) ?? 0 : 0;
         item.width = Math.max(titleWidth, dataIndexWidth) + 32;
       }
+
+      // measureAlign 列：列宽须容得下最宽行的定宽内容块 + 单元格左右内边距，
+      // 否则出现超长值（如 +3357.52%）时内容会被列宽截断；声明的 width 只作下限。
+      if (item.measureAlign && typeof item.width === "number") {
+        const measured = getMeasureAlignWidth(item, dataSource);
+        if (measured > 0) {
+          item.width = Math.max(item.width, measured + MEASURE_ALIGN_CELL_PADDING_PX);
+        }
+      }
       return item;
     })?.map(item => {
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hsu-react/ui",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "一套基于 React + Ant Design 的中后台业务组件库",
   "license": "MIT",
   "type": "module",

package/src/components/FormItem/ItemContainer/index.tsx

@@ -46,6 +46,8 @@ export interface ItemContainerProps extends FormItemProps {
   labelBreak?: boolean;
   hideAdditiona?: boolean;
   hideLabel?: boolean;
+  /** 显隐开关，由 FormItem 消费；在此解构剥离，避免透传到 DOM */
+  visible?: boolean;
 }
 
 const ItemContainer: React.FC<ItemContainerProps> = (props) => {
@@ -84,6 +86,7 @@ const ItemContainer: React.FC<ItemContainerProps> = (props) => {
     labelBreak = false,
     hideAdditiona = false,
     hideLabel = false,
+    visible: _visible,
     ...formItemProps
   } = props;
   const { icon = "material-symbols:help", iconClassName, ...tipsConfig } = tips;
@@ -198,15 +201,9 @@ const ItemContainer: React.FC<ItemContainerProps> = (props) => {
     return null;
   }
 
-  // 页面层 FormItemProps 的展示控制属性（如 visible）不属于 antd Form.Item，
-  // 剥离后再透传，避免被 antd 转发到 DOM 触发 React 非法属性警告。
-  const restFormItemProps = Object.fromEntries(
-    Object.entries(formItemProps).filter(([key]) => key !== "visible")
-  );
-
   return (
     <Form.Item
-      {...restFormItemProps}
+      {...formItemProps}
       name={name}
       rules={[
         {

package/src/components/Search/{_components → SearchAdvanced/_components}/AdvancedFiltersDrawer/index.tsx

@@ -1,12 +1,12 @@
 import React from "react";
 import type { FormInstance } from "antd";
-import Form from "../../../Form";
+import Form from "../../../../Form";
 import { FilterFilled } from "@ant-design/icons";
-import { FormItemProps } from "../../../FormItem";
-import { DrawerFormProps } from "../../../Form/DrawerForm";
-import Icon from "../../../Icon";
-import type useLabelWidth from "../../../../hooks/useLabelWidth";
-import styles from "../../index.module.scss";
+import { FormItemProps } from "../../../../FormItem";
+import { DrawerFormProps } from "../../../../Form/DrawerForm";
+import Icon from "../../../../Icon";
+import type useLabelWidth from "../../../../../hooks/useLabelWidth";
+import styles from "../../../index.module.scss";
 
 interface AdvancedFiltersDrawerProps {
   expand: boolean;