@hsu-react/ui 0.0.8 → 0.0.10

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

@@ -0,0 +1,185 @@
+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 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useMemo } from "react";
+import { Form as AntdForm } from "antd";
+import classNames from "classnames";
+import FormItem from "../../../FormItem";
+import styles from "../../index.module.scss";
+import { useSearchCommon } from "../../_hooks";
+import { ButtonGroup } from "../ButtonGroup";
+import { SearchButtons } from "../SearchButtons";
+import { ExpandButton } from "../ExpandButton";
+import { FilterDropdown } from "../FilterDropdown";
+
+/** 暴露给变体扩展渲染（如高级筛选抽屉）的上下文 */
+import { createElement as _createElement } from "react";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * Search 各变体共享的基础实现：
+ * 表单渲染、列布局、展开/收起、按钮组、权限控制。
+ * 变体只负责自身差异（筛选器、折叠开关、高级筛选抽屉等）。
+ */
+var SearchBase = function SearchBase(props) {
+  var _props$searchItems = props.searchItems,
+    searchItems = _props$searchItems === void 0 ? [] : _props$searchItems,
+    _props$moreSearchItem = props.moreSearchItems,
+    moreSearchItems = _props$moreSearchItem === void 0 ? [] : _props$moreSearchItem,
+    className = props.className,
+    onSearch = props.onSearch,
+    onReset = props.onReset,
+    externalForm = props.externalForm,
+    hasPermi = props.hasPermi,
+    _props$columnNum = props.columnNum,
+    columnNum = _props$columnNum === void 0 ? 4 : _props$columnNum,
+    beforeButtonGroup = props.beforeButtonGroup,
+    affterButtonGroup = props.affterButtonGroup,
+    searchData = props.searchData,
+    minLabelWidth = props.minLabelWidth,
+    _props$defaultExpande = props.defaultExpanded,
+    defaultExpanded = _props$defaultExpande === void 0 ? false : _props$defaultExpande,
+    onExpandChange = props.onExpandChange,
+    _props$autoAdaptWidth = props.autoAdaptWidth,
+    autoAdaptWidth = _props$autoAdaptWidth === void 0 ? true : _props$autoAdaptWidth,
+    baseWidth = props.baseWidth,
+    onValuesChange = props.onValuesChange,
+    _props$searchDisabled = props.searchDisabled,
+    searchDisabled = _props$searchDisabled === void 0 ? false : _props$searchDisabled,
+    _props$showAllSearchI = props.showAllSearchItems,
+    showAllSearchItems = _props$showAllSearchI === void 0 ? false : _props$showAllSearchI,
+    searchText = props.searchText,
+    resetText = props.resetText,
+    onFilterChange = props.onFilterChange,
+    _props$columnOffsetWi = props.columnOffsetWidth,
+    columnOffsetWidth = _props$columnOffsetWi === void 0 ? 0 : _props$columnOffsetWi,
+    _props$advancedFilter = props.advancedFilters,
+    advancedFilters = _props$advancedFilter === void 0 ? false : _props$advancedFilter,
+    _props$showFilter = props.showFilter,
+    showFilter = _props$showFilter === void 0 ? false : _props$showFilter,
+    afterForm = props.afterForm,
+    renderOutside = props.renderOutside;
+  var _AntdForm$useForm = AntdForm.useForm(externalForm),
+    _AntdForm$useForm2 = _slicedToArray(_AntdForm$useForm, 1),
+    form = _AntdForm$useForm2[0];
+  var _useSearchCommon = useSearchCommon({
+      form: form,
+      searchItems: searchItems,
+      moreSearchItems: moreSearchItems,
+      searchData: searchData,
+      hasPermi: hasPermi,
+      beforeButtonGroup: beforeButtonGroup,
+      affterButtonGroup: affterButtonGroup,
+      columnNum: columnNum,
+      autoAdaptWidth: autoAdaptWidth,
+      defaultExpanded: defaultExpanded,
+      onExpandChange: onExpandChange,
+      showAllSearchItems: showAllSearchItems,
+      minLabelWidth: minLabelWidth,
+      baseWidth: baseWidth,
+      onSearch: onSearch,
+      onReset: onReset,
+      columnOffsetWidth: columnOffsetWidth
+    }),
+    containerRef = _useSearchCommon.containerRef,
+    buttonGroupRef = _useSearchCommon.buttonGroupRef,
+    cls = _useSearchCommon.cls,
+    getLabelWidth = _useSearchCommon.getLabelWidth,
+    processedSearchItems = _useSearchCommon.processedSearchItems,
+    setSearchItems = _useSearchCommon.setSearchItems,
+    currentSearchItems = _useSearchCommon.currentSearchItems,
+    totalColumnNum = _useSearchCommon.totalColumnNum,
+    expand = _useSearchCommon.expand,
+    setExpand = _useSearchCommon.setExpand,
+    toggleExpand = _useSearchCommon.toggleExpand,
+    showExpandButton = _useSearchCommon.showExpandButton,
+    onSearchClick = _useSearchCommon.onSearchClick,
+    onResetClick = _useSearchCommon.onResetClick,
+    shouldRender = _useSearchCommon.shouldRender,
+    permitted = _useSearchCommon.permitted;
+
+  // 按列分组预计算（用于对齐同列 label 宽度），避免在 map 中逐项重复 filter
+  var columnGroups = useMemo(function () {
+    var groups = Array.from({
+      length: totalColumnNum
+    }, function () {
+      return [];
+    });
+    currentSearchItems.forEach(function (item, idx) {
+      groups[idx % totalColumnNum].push(item);
+    });
+    return groups;
+  }, [currentSearchItems, totalColumnNum]);
+  if (!shouldRender) {
+    return null;
+  }
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsxs("div", {
+      ref: containerRef,
+      className: classNames(styles.Search, className),
+      style: {
+        "--column-number": totalColumnNum,
+        "--column-offset-width": "".concat(columnOffsetWidth, "px")
+      },
+      children: [/*#__PURE__*/_jsx("div", {
+        className: classNames(styles.searchOption, styles[expand.toString()]),
+        children: /*#__PURE__*/_jsxs(AntdForm, {
+          form: form,
+          className: classNames(styles.option, cls),
+          onValuesChange: onValuesChange,
+          children: [permitted && currentSearchItems.map(function (item, idx) {
+            return /*#__PURE__*/_createElement(FormItem, _objectSpread(_objectSpread({}, item), {}, {
+              key: item.name,
+              className: classNames(styles.item, item.className, _defineProperty({}, styles.unFill, item.width !== undefined)),
+              label: advancedFilters ? undefined : item.label,
+              labelWidth: advancedFilters || item.width !== undefined ? undefined : getLabelWidth(columnGroups[idx % totalColumnNum], undefined, minLabelWidth)
+            }));
+          }), ((beforeButtonGroup === null || beforeButtonGroup === void 0 ? void 0 : beforeButtonGroup.length) || (affterButtonGroup === null || affterButtonGroup === void 0 ? void 0 : affterButtonGroup.length) || permitted) && /*#__PURE__*/_jsxs(ButtonGroup, {
+            beforeButtonGroup: beforeButtonGroup,
+            affterButtonGroup: affterButtonGroup,
+            expandButton: /*#__PURE__*/_jsx(ExpandButton, {
+              expand: expand,
+              toggleExpand: toggleExpand,
+              advancedFilters: advancedFilters,
+              showExpandButton: showExpandButton,
+              showAllSearchItems: showAllSearchItems || !!(moreSearchItems !== null && moreSearchItems !== void 0 && moreSearchItems.length)
+            }),
+            permitted: permitted,
+            ref: buttonGroupRef,
+            children: [currentSearchItems.length > 0 && /*#__PURE__*/_jsx(SearchButtons, {
+              onSearch: onSearchClick,
+              onReset: onResetClick,
+              searchDisabled: searchDisabled,
+              searchText: searchText,
+              resetText: resetText
+            }), showFilter && /*#__PURE__*/_jsx(FilterDropdown, {
+              searchItems: processedSearchItems,
+              originalSearchItems: searchItems,
+              setSearchItems: setSearchItems,
+              onFilterChange: onFilterChange
+            })]
+          })]
+        })
+      }), permitted && afterForm]
+    }), permitted && (renderOutside === null || renderOutside === void 0 ? void 0 : renderOutside({
+      form: form,
+      expand: expand,
+      setExpand: setExpand,
+      processedSearchItems: processedSearchItems,
+      getLabelWidth: getLabelWidth,
+      onSearchClick: onSearchClick,
+      onResetClick: onResetClick
+    }))]
+  });
+};
+export default SearchBase;

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

@@ -16,7 +16,7 @@ import { useSearchItems } from "./useSearchItems";
 import { useSearchForm } from "./useSearchForm";
 import { useAdaptiveColumnNum } from "./useAdaptiveColumnNum";
 import { useSearchExpand } from "./useSearchExpand";
-import { cleanSearchData, calculateVisibleItems, calculateButtonGroupAndColumnWidth } from "../_utils";
+import { cleanSearchData, calculateVisibleItems, calculateButtonGroupAndColumnWidth, shouldDisplayExtraItem } from "../_utils";
 import styles from "../index.module.scss";
 /**
  * 提取所有 Search 组件的通用逻辑
@@ -70,14 +70,10 @@ export var useSearchCommon = function useSearchCommon(params) {
   }, [moreSearchItems]);
 
   // 计算可见的搜索项数量
-  var visibleSearchItemCount = useMemo(function () {
-    return visibleSearchItems.length;
-  }, [visibleSearchItems]);
+  var visibleSearchItemCount = visibleSearchItems.length;
 
   // 计算总列数（包括按钮组）
-  var baseTotalColumnNum = useMemo(function () {
-    return columnNum + 1;
-  }, [columnNum]);
+  var baseTotalColumnNum = columnNum + 1;
 
   // 根据容器宽度动态调整列数
   var totalColumnNum = useAdaptiveColumnNum(containerRef, baseTotalColumnNum, autoAdaptWidth, 1,
@@ -89,9 +85,7 @@ export var useSearchCommon = function useSearchCommon(params) {
   baseWidth);
 
   // 计算调整后的搜索项列数（不包括按钮组）
-  var adaptiveColumnNum = useMemo(function () {
-    return Math.max(1, totalColumnNum - 1);
-  }, [totalColumnNum]);
+  var adaptiveColumnNum = Math.max(1, totalColumnNum - 1);
 
   // 使用基于宽度的展开/收起控制
   var _useSearchExpand = useSearchExpand(containerRef, buttonGroupRef, ".".concat(cls, " .").concat(styles.item), visibleSearchItemCount, adaptiveColumnNum, autoAdaptWidth, defaultExpanded, onExpandChange, processedSearchItems, showAllSearchItems || !!(moreSearchItems !== null && moreSearchItems !== void 0 && moreSearchItems.length), columnOffsetWidth),
@@ -155,7 +149,7 @@ export var useSearchCommon = function useSearchCommon(params) {
       columnWidth = _calculateButtonGroup.columnWidth;
 
     // 判断按钮组宽度是否大于列宽，如果是，则显示 实际搜索项数量+1
-    if (buttonGroupWidth !== undefined && columnWidth !== undefined && (buttonGroupWidth > columnWidth || buttonGroupWidth < columnWidth && adaptiveColumnNum + 1 === visibleSearchItemCount)) {
+    if (shouldDisplayExtraItem(buttonGroupWidth, columnWidth, adaptiveColumnNum, visibleSearchItemCount)) {
       return adaptiveColumnNum + 1;
     }
     return adaptiveColumnNum;

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

@@ -5,6 +5,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useState, useEffect, useCallback } from "react";
+import { measureButtonGroupWidth } from "../_utils";
+
 /**
  * 基于宽度自适应控制展开/收起的Hook
  * @param containerRef 容器引用
@@ -35,25 +37,14 @@ export function useSearchExpand(containerRef, buttonGroupRef, itemClassName, ite
     }
     var container = containerRef.current;
     var calculateVisibleItems = function calculateVisibleItems() {
+      var _measureButtonGroupWi;
       if (!containerRef.current || !buttonGroupRef.current) return;
       var containerWidth = container.offsetWidth;
       // 减去padding
       var availableWidth = containerWidth - 30; // 15px padding on each side
 
       // 获取按钮组的实际宽度（计算所有子元素宽度总和）
-      var buttonGroupWidth = 0;
-      var buttonChildren = Array.from(buttonGroupRef.current.children);
-      if (buttonChildren.length > 0) {
-        // 计算所有子元素的宽度总和
-        var totalWidth = 0;
-        buttonChildren === null || buttonChildren === void 0 || buttonChildren.forEach(function (child) {
-          totalWidth += child.offsetWidth;
-        });
-        // 加上子元素之间的间距（column-gap: 10px）
-        var childGap = 5;
-        totalWidth += (buttonChildren.length - 1) * childGap;
-        buttonGroupWidth = totalWidth;
-      }
+      var buttonGroupWidth = (_measureButtonGroupWi = measureButtonGroupWidth(buttonGroupRef.current)) !== null && _measureButtonGroupWi !== void 0 ? _measureButtonGroupWi : 0;
 
       // 获取所有搜索项元素
       var items = container.querySelectorAll("".concat(itemClassName));

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

@@ -1,3 +1,5 @@
+import { measureButtonGroupWidth } from "./measureButtonGroupWidth";
+
 /**
  * 计算按钮组宽度和列宽
  * @param containerRef 容器引用
@@ -16,16 +18,7 @@ export function calculateButtonGroupAndColumnWidth(containerRef, buttonGroupRef,
     var gap = 10; // 项之间的间距
 
     // 计算按钮组宽度
-    var buttonChildren = Array.from(buttonGroupRef.current.children);
-    if (buttonChildren.length > 0) {
-      var totalWidth = 0;
-      buttonChildren === null || buttonChildren === void 0 || buttonChildren.forEach(function (child) {
-        totalWidth += child.offsetWidth;
-      });
-      var childGap = 5;
-      totalWidth += (buttonChildren.length - 1) * childGap;
-      buttonGroupWidth = totalWidth;
-    }
+    buttonGroupWidth = measureButtonGroupWidth(buttonGroupRef.current);
 
     // 计算列宽（单个搜索项的默认宽度）
     if (adaptiveColumnNum > 0) {

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

@@ -1,3 +1,5 @@
+import { shouldDisplayExtraItem } from "./shouldDisplayExtraItem";
+
 /**
  * 计算当前应该显示的搜索项
  * @param searchItems 所有搜索项
@@ -13,7 +15,7 @@ export function calculateVisibleItems(searchItems, expand, columnNum, visibleIte
   var visibleItems = searchItems.filter(function (item) {
     return item.visible;
   });
-  var hasCustomWidth = searchItems.find(function (item) {
+  var hasCustomWidth = searchItems.some(function (item) {
     return item.width !== undefined;
   });
   if (!expand) {
@@ -25,10 +27,7 @@ export function calculateVisibleItems(searchItems, expand, columnNum, visibleIte
     } else if (!hasCustomWidth) {
       // 没有自定义宽度时，使用 columnNum（实际搜索项数量）
       // 判断按钮组宽度是否大于列宽，如果是，则显示 实际搜索项数量+1
-      var displayCount = columnNum;
-      if (buttonGroupWidth !== undefined && columnWidth !== undefined && (buttonGroupWidth > columnWidth || buttonGroupWidth < columnWidth && columnNum + 1 === visibleItems.length)) {
-        displayCount = columnNum + 1;
-      }
+      var displayCount = shouldDisplayExtraItem(buttonGroupWidth, columnWidth, columnNum, visibleItems.length) ? columnNum + 1 : columnNum;
       if (visibleItems.length >= displayCount) {
         return visibleItems.slice(0, displayCount);
       }

package/es/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/es/components/Search/_utils/index.js

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

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

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

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

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

package/es/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/es/components/Search/_utils/shouldDisplayExtraItem.js

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

package/es/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/es/components/Search/index.js

@@ -4,151 +4,24 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Form as AntdForm } from "antd";
-import FormItem from "../FormItem";
 import React from "react";
-import classNames from "classnames";
-import styles from "./index.module.scss";
-import { useSearchCommon } from "./_hooks";
 import SearchCard 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";
 
 // 导出所有可用的 Search 模式键名
 
 // 导出 Search 模式映射类型
-import { createElement as _createElement } from "react";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * 基础 Search 组件
+ * - 标准的搜索表单布局，自适应列数与展开/收起
+ */
 var Search = function Search(props) {
-  var _props$searchItems = props.searchItems,
-    searchItems = _props$searchItems === void 0 ? [] : _props$searchItems,
-    _props$moreSearchItem = props.moreSearchItems,
-    moreSearchItems = _props$moreSearchItem === void 0 ? [] : _props$moreSearchItem,
-    className = props.className,
-    onSearch = props.onSearch,
-    onReset = props.onReset,
-    externalForm = props.externalForm,
-    hasPermi = props.hasPermi,
-    _props$columnNum = props.columnNum,
-    columnNum = _props$columnNum === void 0 ? 4 : _props$columnNum,
-    beforeButtonGroup = props.beforeButtonGroup,
-    affterButtonGroup = props.affterButtonGroup,
-    searchData = props.searchData,
-    minLabelWidth = props.minLabelWidth,
-    _props$defaultExpande = props.defaultExpanded,
-    defaultExpanded = _props$defaultExpande === void 0 ? false : _props$defaultExpande,
-    onExpandChange = props.onExpandChange,
-    _props$autoAdaptWidth = props.autoAdaptWidth,
-    autoAdaptWidth = _props$autoAdaptWidth === void 0 ? true : _props$autoAdaptWidth,
-    baseWidth = props.baseWidth,
-    onValuesChange = props.onValuesChange,
-    _props$searchDisabled = props.searchDisabled,
-    searchDisabled = _props$searchDisabled === void 0 ? false : _props$searchDisabled,
-    _props$showAllSearchI = props.showAllSearchItems,
-    showAllSearchItems = _props$showAllSearchI === void 0 ? false : _props$showAllSearchI,
-    searchText = props.searchText,
-    resetText = props.resetText,
-    _props$columnOffsetWi = props.columnOffsetWidth,
-    columnOffsetWidth = _props$columnOffsetWi === void 0 ? 0 : _props$columnOffsetWi;
-  var _AntdForm$useForm = AntdForm.useForm(externalForm),
-    _AntdForm$useForm2 = _slicedToArray(_AntdForm$useForm, 1),
-    form = _AntdForm$useForm2[0];
-  var _useSearchCommon = useSearchCommon({
-      form: form,
-      searchItems: searchItems,
-      moreSearchItems: moreSearchItems,
-      searchData: searchData,
-      hasPermi: hasPermi,
-      beforeButtonGroup: beforeButtonGroup,
-      affterButtonGroup: affterButtonGroup,
-      columnNum: columnNum,
-      autoAdaptWidth: autoAdaptWidth,
-      defaultExpanded: defaultExpanded,
-      onExpandChange: onExpandChange,
-      showAllSearchItems: showAllSearchItems,
-      minLabelWidth: minLabelWidth,
-      baseWidth: baseWidth,
-      onSearch: onSearch,
-      onReset: onReset,
-      columnOffsetWidth: columnOffsetWidth
-    }),
-    containerRef = _useSearchCommon.containerRef,
-    buttonGroupRef = _useSearchCommon.buttonGroupRef,
-    cls = _useSearchCommon.cls,
-    getLabelWidth = _useSearchCommon.getLabelWidth,
-    currentSearchItems = _useSearchCommon.currentSearchItems,
-    totalColumnNum = _useSearchCommon.totalColumnNum,
-    expand = _useSearchCommon.expand,
-    toggleExpand = _useSearchCommon.toggleExpand,
-    showExpandButton = _useSearchCommon.showExpandButton,
-    onSearchClick = _useSearchCommon.onSearchClick,
-    onResetClick = _useSearchCommon.onResetClick,
-    shouldRender = _useSearchCommon.shouldRender,
-    permitted = _useSearchCommon.permitted;
-  if (!shouldRender) {
-    return null;
-  }
-  return /*#__PURE__*/_jsx("div", {
-    ref: containerRef,
-    className: classNames(styles.Search, className),
-    style: {
-      "--column-number": totalColumnNum,
-      "--column-offset-width": "".concat(columnOffsetWidth, "px")
-    },
-    children: /*#__PURE__*/_jsx("div", {
-      className: classNames(styles.searchOption, styles[expand.toString()]),
-      children: /*#__PURE__*/_jsxs(AntdForm, {
-        form: form,
-        className: classNames(styles.option, cls),
-        onValuesChange: onValuesChange,
-        children: [permitted && (currentSearchItems === null || currentSearchItems === void 0 ? void 0 : currentSearchItems.map(function (item, idx) {
-          var visibleCurrentItems = currentSearchItems.filter(function (i) {
-            return i.visible !== false;
-          });
-          var columnIndex = idx % totalColumnNum;
-          var sameColumnItems = visibleCurrentItems.filter(function (_, _idx) {
-            return _idx % totalColumnNum === columnIndex;
-          });
-          return /*#__PURE__*/_createElement(FormItem, _objectSpread(_objectSpread({}, item), {}, {
-            key: item.name,
-            className: classNames(styles.item, item.className, _defineProperty({}, styles.unFill, item.width !== undefined)),
-            labelWidth: item.width !== undefined ? undefined : getLabelWidth(sameColumnItems, undefined, minLabelWidth)
-          }));
-        })), ((beforeButtonGroup === null || beforeButtonGroup === void 0 ? void 0 : beforeButtonGroup.length) || (affterButtonGroup === null || affterButtonGroup === void 0 ? void 0 : affterButtonGroup.length) || permitted) && /*#__PURE__*/_jsx(ButtonGroup, {
-          beforeButtonGroup: beforeButtonGroup,
-          affterButtonGroup: affterButtonGroup,
-          expandButton: /*#__PURE__*/_jsx(ExpandButton, {
-            expand: expand,
-            toggleExpand: toggleExpand,
-            advancedFilters: false,
-            showExpandButton: showExpandButton,
-            showAllSearchItems: showAllSearchItems || !!(moreSearchItems !== null && moreSearchItems !== void 0 && moreSearchItems.length)
-          }),
-          permitted: permitted,
-          ref: buttonGroupRef,
-          children: currentSearchItems.length > 0 && /*#__PURE__*/_jsx(SearchButtons, {
-            onSearch: onSearchClick,
-            onReset: onResetClick,
-            searchDisabled: searchDisabled,
-            searchText: searchText,
-            resetText: resetText
-          })
-        })]
-      })
-    })
-  });
+  return /*#__PURE__*/_jsx(SearchBase, _objectSpread({}, props));
 };
 Search.Card = SearchCard;
 Search.Advanced = SearchAdvanced;

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

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

package/lib/components/Chart/Bar/index.d.ts

@@ -1,7 +1,7 @@
 import * as echarts from "echarts";
 import { ChartCommonProps, SeriesDataType } from "..";
 import React from "react";
-import { ChartScrollConfig } from "../_utils/cartesian";
+import { ChartScrollConfig, DataZoomIndexWindow } from "../_utils/cartesian";
 export interface ChartBarProps extends ChartCommonProps {
     chartTitle?: string;
     xAxisData?: Array<string>;
@@ -9,6 +9,10 @@ export interface ChartBarProps extends ChartCommonProps {
     legendData?: string[];
     scrollConfig?: ChartScrollConfig;
     onClick?: (event: echarts.ECElementEvent) => void;
+    /** 图例点选变化回调，参数为当前各系列选中状态（配合 legend.selected 可实现坐标轴重算） */
+    onLegendSelectChanged?: (selected: Record<string, boolean>) => void;
+    /** dataZoom 可见窗口变化回调（滑块/滚轮/自动滚动/初始同步均触发），参数为当前可见的 x 轴索引区间（配合 useDataZoomWindow 可按展示部分重算坐标轴） */
+    onDataZoomWindowChanged?: (window: DataZoomIndexWindow) => void;
     /** 是否启用图例自动滚动，默认 false */
     enableLegendAutoScroll?: boolean;
     /** 图例每页可见数量，默认 8 */