@hsu-react/ui 0.0.9 → 0.0.11

package/src/components/Search/_utils/calculateButtonGroupAndColumnWidth.ts

@@ -1,4 +1,5 @@
 import { RefObject } from "react";
+import { measureButtonGroupWidth } from "./measureButtonGroupWidth";
 
 /**
  * 计算按钮组宽度和列宽
@@ -26,16 +27,7 @@ export function calculateButtonGroupAndColumnWidth(
     const gap = 10; // 项之间的间距
 
     // 计算按钮组宽度
-    const buttonChildren = Array.from(buttonGroupRef.current.children);
-    if (buttonChildren.length > 0) {
-      let totalWidth = 0;
-      buttonChildren?.forEach((child) => {
-        totalWidth += (child as HTMLElement).offsetWidth;
-      });
-      const childGap = 5;
-      totalWidth += (buttonChildren.length - 1) * childGap;
-      buttonGroupWidth = totalWidth;
-    }
+    buttonGroupWidth = measureButtonGroupWidth(buttonGroupRef.current);
 
     // 计算列宽（单个搜索项的默认宽度）
     if (adaptiveColumnNum > 0) {

package/src/components/Search/_utils/calculateVisibleItems.ts

@@ -1,4 +1,5 @@
 import { FormItemProps } from "../../FormItem";
+import { shouldDisplayExtraItem } from "./shouldDisplayExtraItem";
 
 /**
  * 计算当前应该显示的搜索项
@@ -21,7 +22,7 @@ export function calculateVisibleItems(
   columnWidth?: number,
 ): FormItemProps[] {
   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) {
     // 当有自定义宽度时，使用自适应计算
@@ -32,16 +33,14 @@ export function calculateVisibleItems(
     } 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 = shouldDisplayExtraItem(
+        buttonGroupWidth,
+        columnWidth,
+        columnNum,
+        visibleItems.length,
+      )
+        ? columnNum + 1
+        : columnNum;
       if (visibleItems.length >= displayCount) {
         return visibleItems.slice(0, displayCount);
       }

package/src/components/Search/_utils/index.ts

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

package/src/components/Search/_utils/measureButtonGroupWidth.ts

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

package/src/components/Search/_utils/shouldDisplayExtraItem.ts

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

package/src/components/Search/index.tsx

@@ -1,17 +1,10 @@
-import { Form as AntdForm } from "antd";
-import FormItem from "../FormItem";
-import React, { CSSProperties } from "react";
-import classNames from "classnames";
-import styles from "./index.module.scss";
-import { useSearchCommon } from "./_hooks";
+import React from "react";
 import SearchCard, { SearchCardProps } from "./SearchCard";
 import SearchAdvanced from "./SearchAdvanced";
 import SearchCollapsible from "./SearchCollapsible";
 import SearchWithFilter from "./SearchWithFilter";
 import SearchWithMore from "./SearchWithMore";
-import { ButtonGroup } from "./_components/ButtonGroup";
-import { SearchButtons } from "./_components/SearchButtons";
-import { ExpandButton } from "./_components/ExpandButton";
+import SearchBase from "./_components/SearchBase";
 import { BaseSearchProps } from "./_types";
 import { ChakraButtonProps } from "../Button";
 
@@ -43,151 +36,12 @@ export type SearchModePropsMap = {
   WithMore: React.ComponentProps<SearchFC["WithMore"]>;
 };
 
+/**
+ * 基础 Search 组件
+ * - 标准的搜索表单布局，自适应列数与展开/收起
+ */
 const Search: SearchFC = (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] = AntdForm.useForm(externalForm);
-
-  const {
-    containerRef,
-    buttonGroupRef,
-    cls,
-    getLabelWidth,
-    currentSearchItems,
-    totalColumnNum,
-    expand,
-    toggleExpand,
-    showExpandButton,
-    onSearchClick,
-    onResetClick,
-    shouldRender,
-    permitted,
-  } = useSearchCommon({
-    form,
-    searchItems,
-    moreSearchItems,
-    searchData,
-    hasPermi,
-    beforeButtonGroup,
-    affterButtonGroup,
-    columnNum,
-    autoAdaptWidth,
-    defaultExpanded,
-    onExpandChange,
-    showAllSearchItems,
-    minLabelWidth,
-    baseWidth,
-    onSearch,
-    onReset,
-    columnOffsetWidth,
-  });
-
-  if (!shouldRender) {
-    return null;
-  }
-
-  return (
-    <div
-      ref={containerRef}
-      className={classNames(styles.Search, className)}
-      style={
-        {
-          "--column-number": totalColumnNum,
-          "--column-offset-width": `${columnOffsetWidth}px`,
-        } as CSSProperties
-      }
-    >
-      <div
-        className={classNames(styles.searchOption, styles[expand.toString()])}
-      >
-        <AntdForm
-          form={form}
-          className={classNames(styles.option, cls)}
-          onValuesChange={onValuesChange}
-        >
-          {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 (
-                <FormItem
-                  {...item}
-                  key={item.name}
-                  className={classNames(styles.item, item.className, {
-                    [styles.unFill]: item.width !== undefined,
-                  })}
-                  labelWidth={
-                    item.width !== undefined
-                      ? undefined
-                      : getLabelWidth(sameColumnItems, undefined, minLabelWidth)
-                  }
-                />
-              );
-            })}
-          {(beforeButtonGroup?.length ||
-            affterButtonGroup?.length ||
-            permitted) && (
-            <ButtonGroup
-              beforeButtonGroup={beforeButtonGroup}
-              affterButtonGroup={affterButtonGroup}
-              expandButton={
-                <ExpandButton
-                  expand={expand}
-                  toggleExpand={toggleExpand}
-                  advancedFilters={false}
-                  showExpandButton={showExpandButton}
-                  showAllSearchItems={
-                    showAllSearchItems || !!moreSearchItems?.length
-                  }
-                />
-              }
-              permitted={permitted}
-              ref={buttonGroupRef}
-            >
-              {currentSearchItems.length > 0 && (
-                <SearchButtons
-                  onSearch={onSearchClick}
-                  onReset={onResetClick}
-                  searchDisabled={searchDisabled}
-                  searchText={searchText}
-                  resetText={resetText}
-                />
-              )}
-            </ButtonGroup>
-          )}
-        </AntdForm>
-      </div>
-    </div>
-  );
+  return <SearchBase {...props} />;
 };
 
 Search.Card = SearchCard;

package/src/components/Table/_hooks/useEllipsisTooltip.ts

@@ -32,11 +32,9 @@ const useEllipsisTooltip = <T extends AnyObject>(
                   ? text
                   : String(text ?? "");
 
+              // 不传 width：由 TextEllipsis 实测单元格实际渲染宽度作为 Tooltip 宽度
+              // （声明的列宽经 fixedWidth 比例分配后与实际宽度并不一致）
               return React.createElement(TextEllipsis, {
-                width:
-                  Math.max(Number(column.width ?? 0), 300) === 300
-                    ? undefined
-                    : Math.max(Number(column.width ?? 0), 300),
                 tooltipConfig: tooltipConfig,
                 children: displayValue,
                 ellipsisPosition:

package/src/components/Table/_hooks/useTableColumns.tsx

@@ -23,6 +23,29 @@ import { PaginationProps } from "../_components/Pagination";
 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;
+
+/**
+ * 解析 tdPadding（CSS padding 简写）的左右内边距合计；
+ * 未传或解析不出时回退默认值（与默认 --td-padding: 4px 8px 一致）。
+ */
+const getCellHorizontalPadding = (tdPadding?: string): number => {
+  if (!tdPadding) return MEASURE_ALIGN_CELL_PADDING_PX;
+
+  const parts = tdPadding
+    .trim()
+    .split(/\s+/)
+    .map((v) => parseFloat(v));
+  if (!parts.length || parts.some((v) => Number.isNaN(v))) {
+    return MEASURE_ALIGN_CELL_PADDING_PX;
+  }
+
+  // CSS 简写：1 值=四边；2/3 值=第 2 个为左右；4 值=右+左
+  if (parts.length === 1) return parts[0] * 2;
+  if (parts.length === 4) return parts[1] + parts[3];
+  return parts[1] * 2;
+};
 
 // 计算 measureAlign 列的定宽（取本列所有行展示文本的最大像素宽）
 const getMeasureAlignWidth = <T extends AnyObject>(
@@ -63,6 +86,7 @@ interface UseTableColumnsParams<T extends AnyObject> {
   bordered?: boolean;
   rowSelection?: TableRowSelection<T>;
   expandable?: TableProps<T>["expandable"];
+  tdPadding?: string;
 }
 
 const useTableColumns = <T extends AnyObject>(
@@ -92,6 +116,7 @@ const useTableColumns = <T extends AnyObject>(
     bordered,
     rowSelection,
     expandable,
+    tdPadding,
   } = params;
   const { checkPermission } = usePermissions();
   const [tableWidth, setTableWidth] = useState<number | null>(null);
@@ -159,6 +184,21 @@ const useTableColumns = <T extends AnyObject>(
           item.width = Math.max(titleWidth, dataIndexWidth) + 32;
         }
 
+        // measureAlign 列：列宽须容得下最宽行的定宽内容块 + 单元格左右内边距，
+        // 否则出现超长值（如 +3357.52%）时内容会被列宽截断；声明的 width 只作下限。
+        if (item.measureAlign && typeof item.width === "number") {
+          const measured = getMeasureAlignWidth(
+            item as ColumnType<T>,
+            dataSource
+          );
+          if (measured > 0) {
+            item.width = Math.max(
+              item.width,
+              measured + getCellHorizontalPadding(tdPadding)
+            );
+          }
+        }
+
         return item;
       })
       ?.map((item) => {
@@ -173,7 +213,7 @@ const useTableColumns = <T extends AnyObject>(
       });
 
     return newColumns;
-  }, [autoWidth, columns, dataSource, checkPermission, scroll]);
+  }, [autoWidth, columns, dataSource, checkPermission, scroll, tdPadding]);
 
   // 渲染列标题
   const renderColumnTitle = useCallback(

package/src/components/Table/index.md

@@ -82,6 +82,8 @@ export default () => (
 | measureAlign | 开启定宽右对齐（配合列 `align: "center"` 使用） | `boolean` | - |
 | measureText | 测量宽度所用文本；当单元格由 `render` 产出复合/JSX 内容时，用它提供与展示一致的文本（默认取 `dataIndex` 原始值） | `(record) => string` | - |
 
+- 列宽自适应：声明的 `width` 只作下限——实际列宽会按「本列最宽内容块的测量宽 + 单元格左右内边距」自动抬升，出现超长值（如 `+3357.52%`）时内容不会被声明宽度截断。
+
 > 注意：不适用于 `render` 返回 `{ children, rowSpan }` 这类合并单元格场景。
 
 > 另导出 `TableDrag`，用于行拖拽排序场景。

package/src/components/Table/index.tsx

@@ -222,6 +222,7 @@ const Table: TableFC = <T extends AnyObject>(props: TableProps<T>) => {
     bordered,
     rowSelection,
     expandable,
+    tdPadding,
   });
 
   useSetTableHeight({

package/src/components/TextEllipsis/index.md

@@ -37,7 +37,7 @@ export default () => (
 | --- | --- | --- | --- |
 | children | 要显示的文本内容 | `ReactNode` | - |
 | width | 容器宽度，用于计算 Tooltip 宽度 | `number \| string` | - |
-| tooltipConfig | Tooltip 配置（可附加 `defaultWidth`） | `Omit<TooltipProps, 'title' \| 'children'> & { defaultWidth?: number }` | - |
+| tooltipConfig | Tooltip 配置（可附加 `defaultWidth`：容器实际宽度实测不到时的兜底宽） | `Omit<TooltipProps, 'title' \| 'children'> & { defaultWidth?: number }` | - |
 | disabled | 是否禁用 Tooltip（即使溢出也不显示） | `boolean` | `false` |
 | ellipsisPosition | 省略号位置，`start` 省略前面，`end` 省略后面 | `'start' \| 'end'` | `'end'` |
 | style | 文本自定义样式 | `React.CSSProperties` | - |

package/src/components/TextEllipsis/index.tsx

@@ -45,6 +45,8 @@ const TextEllipsis: React.FC<TextEllipsisProps> = ({
   const measureRef = useRef<HTMLSpanElement>(null);
   const [isOverflow, setIsOverflow] = useState(false);
   const [truncatedText, setTruncatedText] = useState<ReactNode>(children);
+  // 容器实际渲染宽度：未声明 width 时（如表格列宽动态分配）作为 Tooltip 宽度
+  const [measuredWidth, setMeasuredWidth] = useState(0);
 
   useEffect(() => {
     const element = textRef.current;
@@ -105,29 +107,42 @@ const TextEllipsis: React.FC<TextEllipsisProps> = ({
     };
 
     const textContent = getTextContent(children);
-    const isTextOverflow =
-      element.scrollWidth > element.clientWidth ||
-      element.scrollHeight > element.clientHeight;
-
-    setIsOverflow(isTextOverflow);
-
-    // 如果是省略前面且文本溢出，需要计算截断后的文本
-    if (ellipsisPosition === "start" && isTextOverflow && textContent) {
-      const maxWidth = element.clientWidth;
-      const truncated = calculateTruncatedText(textContent, maxWidth);
-      setTruncatedText(truncated);
-    } else {
-      setTruncatedText(children);
-    }
+
+    const update = () => {
+      const isTextOverflow =
+        element.scrollWidth > element.clientWidth ||
+        element.scrollHeight > element.clientHeight;
+
+      setIsOverflow(isTextOverflow);
+      setMeasuredWidth(element.clientWidth);
+
+      // 如果是省略前面且文本溢出，需要计算截断后的文本
+      if (ellipsisPosition === "start" && isTextOverflow && textContent) {
+        const maxWidth = element.clientWidth;
+        const truncated = calculateTruncatedText(textContent, maxWidth);
+        setTruncatedText(truncated);
+      } else {
+        setTruncatedText(children);
+      }
+    };
+
+    update();
+
+    // 容器宽度动态变化（如表格列宽重分配、窗口 resize）时重测溢出与宽度
+    const resizeObserver = new ResizeObserver(update);
+    resizeObserver.observe(element);
+    return () => resizeObserver.disconnect();
   }, [children, ellipsisPosition, style]);
 
-  // 计算 Tooltip 的宽度
+  // 计算 Tooltip 的宽度：显式 width 优先；未声明（或百分比）时用容器实际渲染宽度，
+  // 实测不到再回退 defaultWidth
   const getTooltipWidth = () => {
     const defaultWidth = tooltipConfig?.defaultWidth ?? DEFAULT_TOOLTIP_WIDTH;
-    if (!width) return defaultWidth;
+    const dynamicWidth = measuredWidth > 0 ? measuredWidth : defaultWidth;
+    if (!width) return dynamicWidth;
     if (typeof width === "number") return width;
-    if (typeof width === "string" && width.includes("%")) return defaultWidth;
-    return parseInt(width) || defaultWidth;
+    if (typeof width === "string" && width.includes("%")) return dynamicWidth;
+    return parseInt(width) || dynamicWidth;
   };
 
   const tooltipWidth = getTooltipWidth();