@hsu-react/ui 0.0.9 → 0.0.10

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

@@ -5,16 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
-var _FormItem = _interopRequireDefault(require("../../FormItem"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _indexModule = _interopRequireDefault(require("../index.module.scss"));
-var _hooks = require("../_hooks");
-var _ButtonGroup = require("../_components/ButtonGroup");
-var _SearchButtons = require("../_components/SearchButtons");
-var _FilterDropdown = require("../_components/FilterDropdown");
-var _ExpandButton = require("../_components/ExpandButton");
-var _CollapseToggle = require("../_components/CollapseToggle");
+var _SearchBase = _interopRequireDefault(require("../_components/SearchBase"));
+var _CollapseToggle = require("./_components/CollapseToggle");
 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); }
@@ -27,70 +21,15 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 const SearchCollapsible = props => {
   const {
-    searchItems = [],
-    moreSearchItems = [],
     className,
-    onSearch,
-    onReset,
-    externalForm,
-    hasPermi,
-    columnNum = 4,
-    beforeButtonGroup,
-    affterButtonGroup,
-    searchData,
-    setFilter,
-    minLabelWidth,
     defaultExpanded = false,
     onCollapseToggle,
-    onExpandChange,
-    autoAdaptWidth = true,
-    baseWidth,
-    onValuesChange,
-    searchDisabled = false,
-    showAllSearchItems = false,
-    searchText,
-    resetText,
-    onFilterChange,
-    columnOffsetWidth = 0
+    setFilter,
+    ...rest
   } = props;
-  const [form] = _antd.Form.useForm(externalForm);
+
   // collapse 的语义是反的，所以需要取反 defaultExpanded
   const [collapse, setCollapse] = (0, _react.useState)(!defaultExpanded);
-  const {
-    containerRef,
-    buttonGroupRef,
-    cls,
-    getLabelWidth,
-    processedSearchItems,
-    setSearchItems,
-    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
-  });
 
   // 处理折叠切换
   const handleCollapseToggle = (0, _react.useCallback)(() => {
@@ -100,68 +39,17 @@ const SearchCollapsible = props => {
       return newCollapse;
     });
   }, [onCollapseToggle]);
-  if (!shouldRender) {
-    return null;
-  }
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    ref: containerRef,
-    className: (0, _classnames.default)(_indexModule.default.Search, className, {
-      [_indexModule.default.collapseExpand]: true,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchBase.default, {
+    ...rest,
+    defaultExpanded: defaultExpanded,
+    showFilter: !!setFilter,
+    className: (0, _classnames.default)(className, _indexModule.default.collapseExpand, {
       [_indexModule.default.collapse]: collapse
     }),
-    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.jsxs)(_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
-          }), setFilter && /*#__PURE__*/(0, _jsxRuntime.jsx)(_FilterDropdown.FilterDropdown, {
-            searchItems: processedSearchItems,
-            originalSearchItems: searchItems,
-            setSearchItems: setSearchItems,
-            onFilterChange: onFilterChange
-          })]
-        })]
-      })
-    }), permitted && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CollapseToggle.CollapseToggle, {
+    afterForm: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CollapseToggle.CollapseToggle, {
       collapse: collapse,
       onToggle: handleCollapseToggle
-    })]
+    })
   });
 };
 var _default = exports.default = SearchCollapsible;

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

@@ -4,20 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
-var _FormItem = _interopRequireDefault(require("../../FormItem"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _indexModule = _interopRequireDefault(require("../index.module.scss"));
-var _hooks = require("../_hooks");
-var _ButtonGroup = require("../_components/ButtonGroup");
-var _SearchButtons = require("../_components/SearchButtons");
-var _FilterDropdown = require("../_components/FilterDropdown");
-var _ExpandButton = require("../_components/ExpandButton");
+var _react = _interopRequireDefault(require("react"));
+var _SearchBase = _interopRequireDefault(require("../_components/SearchBase"));
 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 组件
  * - 提供下拉菜单，允许用户动态选择显示哪些搜索项
@@ -25,123 +15,9 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  * - 提供更灵活的搜索体验
  */
 const SearchWithFilter = 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
-  } = props;
-  const [form] = _antd.Form.useForm(externalForm);
-  const {
-    containerRef,
-    buttonGroupRef,
-    cls,
-    getLabelWidth,
-    processedSearchItems,
-    setSearchItems,
-    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.jsxs)(_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
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_FilterDropdown.FilterDropdown, {
-            searchItems: processedSearchItems,
-            originalSearchItems: searchItems,
-            setSearchItems: setSearchItems,
-            onFilterChange: onFilterChange
-          })]
-        })]
-      })
-    })
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchBase.default, {
+    ...props,
+    showFilter: true
   });
 };
 var _default = exports.default = SearchWithFilter;

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

@@ -4,20 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _antd = require("antd");
-var _FormItem = _interopRequireDefault(require("../../FormItem"));
-var _classnames = _interopRequireDefault(require("classnames"));
-var _indexModule = _interopRequireDefault(require("../index.module.scss"));
-var _hooks = require("../_hooks");
-var _ButtonGroup = require("../_components/ButtonGroup");
-var _SearchButtons = require("../_components/SearchButtons");
-var _FilterDropdown = require("../_components/FilterDropdown");
-var _ExpandButton = require("../_components/ExpandButton");
+var _react = _interopRequireDefault(require("react"));
+var _SearchBase = _interopRequireDefault(require("../_components/SearchBase"));
 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 组件
  * - 将搜索项分为基础项和更多项两组
@@ -26,123 +16,14 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 const SearchWithMore = props => {
   const {
-    searchItems = [],
-    moreSearchItems,
-    className,
-    onSearch,
-    onReset,
-    externalForm,
-    hasPermi,
-    columnNum = 4,
-    beforeButtonGroup,
-    affterButtonGroup,
-    searchData,
     setFilter,
-    minLabelWidth,
-    defaultExpanded = false,
-    onExpandChange,
-    autoAdaptWidth = true,
-    baseWidth,
-    onValuesChange,
-    searchDisabled = false,
-    searchText,
-    resetText,
-    onFilterChange,
-    columnOffsetWidth = 0
+    ...rest
   } = props;
-  const [form] = _antd.Form.useForm(externalForm);
-  const {
-    containerRef,
-    buttonGroupRef,
-    cls,
-    getLabelWidth,
-    processedSearchItems,
-    setSearchItems,
-    currentSearchItems,
-    totalColumnNum,
-    expand,
-    toggleExpand,
-    showExpandButton,
-    onSearchClick,
-    onResetClick,
-    shouldRender,
-    permitted
-  } = (0, _hooks.useSearchCommon)({
-    form,
-    searchItems,
-    moreSearchItems,
-    searchData,
-    hasPermi,
-    beforeButtonGroup,
-    affterButtonGroup,
-    columnNum,
-    autoAdaptWidth,
-    defaultExpanded,
-    onExpandChange,
-    showAllSearchItems: true,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchBase.default, {
+    ...rest,
     // SearchWithMore 始终显示所有搜索项
-    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.jsxs)(_ButtonGroup.ButtonGroup, {
-          beforeButtonGroup: beforeButtonGroup,
-          affterButtonGroup: affterButtonGroup,
-          expandButton: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandButton.ExpandButton, {
-            expand: expand,
-            toggleExpand: toggleExpand,
-            advancedFilters: false,
-            showExpandButton: showExpandButton,
-            showAllSearchItems: true
-          }),
-          permitted: permitted,
-          ref: buttonGroupRef,
-          children: [currentSearchItems.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchButtons.SearchButtons, {
-            onSearch: onSearchClick,
-            onReset: onResetClick,
-            searchDisabled: searchDisabled,
-            searchText: searchText,
-            resetText: resetText
-          }), setFilter && /*#__PURE__*/(0, _jsxRuntime.jsx)(_FilterDropdown.FilterDropdown, {
-            searchItems: processedSearchItems,
-            originalSearchItems: searchItems,
-            setSearchItems: setSearchItems,
-            onFilterChange: onFilterChange
-          })]
-        })]
-      })
-    })
+    showAllSearchItems: true,
+    showFilter: !!setFilter
   });
 };
 var _default = exports.default = SearchWithMore;

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

@@ -22,15 +22,14 @@ const FilterDropdown = ({
 }) => {
   const [open, setOpen] = (0, _react.useState)(false);
   (0, _react.useEffect)(() => {
-    document.addEventListener("click", () => {
+    const handleDocumentClick = () => {
       setOpen(false);
-    });
+    };
+    document.addEventListener("click", handleDocumentClick);
     return () => {
-      document.removeEventListener("click", () => {
-        setOpen(false);
-      });
+      document.removeEventListener("click", handleDocumentClick);
     };
-  }, [searchItems]);
+  }, []);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Dropdown, {
     open: open,
     overlayClassName: _indexModule.default.filterDropdown,

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

@@ -0,0 +1,32 @@
+import React, { ReactNode } from "react";
+import { FormInstance } from "antd";
+import { FormItemProps } from "../../../FormItem";
+import type useLabelWidth from "../../../../hooks/useLabelWidth";
+import { SearchPropsWithFilter } from "../../_types";
+/** 暴露给变体扩展渲染（如高级筛选抽屉）的上下文 */
+export interface SearchBaseContext {
+    form: FormInstance;
+    expand: boolean;
+    setExpand?: (expand: boolean) => void;
+    processedSearchItems: FormItemProps[];
+    getLabelWidth: ReturnType<typeof useLabelWidth>[1];
+    onSearchClick: () => void;
+    onResetClick: () => void;
+}
+export interface SearchBaseProps extends SearchPropsWithFilter {
+    /** 高级筛选模式：搜索项不显示 label，展开按钮显示为"高级筛选" */
+    advancedFilters?: boolean;
+    /** 是否渲染 FilterDropdown（筛选器设置下拉） */
+    showFilter?: boolean;
+    /** 表单区域之后、容器之内的附加内容（如折叠开关），仅在有权限时渲染 */
+    afterForm?: ReactNode;
+    /** 容器之外的附加内容（如高级筛选抽屉），仅在有权限时渲染 */
+    renderOutside?: (ctx: SearchBaseContext) => ReactNode;
+}
+/**
+ * Search 各变体共享的基础实现：
+ * 表单渲染、列布局、展开/收起、按钮组、权限控制。
+ * 变体只负责自身差异（筛选器、折叠开关、高级筛选抽屉等）。
+ */
+declare const SearchBase: React.FC<SearchBaseProps>;
+export default SearchBase;