@hsu-react/ui 0.0.9 → 0.0.11

package/README.md

@@ -30,10 +30,10 @@ export default function App() {
 - `ConfigProvider.permissions` — 当前用户权限码，驱动所有 `hasPermi` 的显隐校验。
 - `ConfigProvider.request` — 注入 HTTP 请求实现（库本身不绑定 HTTP 客户端）。
 
-可选引入全局 antd 观感覆盖：
+可选引入全局 antd 观感覆盖（产物为 scss，宿主项目需具备 scss 编译能力）：
 
 ```ts
-import "@hsu-react/ui/es/styles/antd-overload.less";
+import "@hsu-react/ui/es/styles/antd-overload.scss";
 ```
 
 ## 开发

package/es/components/FormItem/ItemContainer/index.d.ts

@@ -35,6 +35,8 @@ export interface ItemContainerProps extends FormItemProps {
     labelBreak?: boolean;
     hideAdditiona?: boolean;
     hideLabel?: boolean;
+    /** 显隐开关，由 FormItem 消费；在此解构剥离，避免透传到 DOM */
+    visible?: boolean;
 }
 declare const ItemContainer: React.FC<ItemContainerProps>;
 export default ItemContainer;

package/es/components/FormItem/ItemContainer/index.js

@@ -1,16 +1,12 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["children", "className", "required", "rules", "name", "labelWidth", "labelHeight", "labelMinHeight", "inputWidth", "inputMinWidth", "inputHeight", "inputMinHeight", "height", "width", "style", "requiredMsg", "layout", "requiredPosition", "colon", "label", "labelRender", "tips", "horizontalAlignment", "hideRequired", "labelClassName", "en", "type", "hasPermi", "labelExtra", "labelExtraClassName", "labelEllipsis", "labelBreak", "hideAdditiona", "hideLabel"],
+var _excluded = ["children", "className", "required", "rules", "name", "labelWidth", "labelHeight", "labelMinHeight", "inputWidth", "inputMinWidth", "inputHeight", "inputMinHeight", "height", "width", "style", "requiredMsg", "layout", "requiredPosition", "colon", "label", "labelRender", "tips", "horizontalAlignment", "hideRequired", "labelClassName", "en", "type", "hasPermi", "labelExtra", "labelExtraClassName", "labelEllipsis", "labelBreak", "hideAdditiona", "hideLabel", "visible"],
   _excluded2 = ["icon", "iconClassName"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-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; }
 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; }
@@ -79,6 +75,7 @@ var ItemContainer = function ItemContainer(props) {
     hideAdditiona = _props$hideAdditiona === void 0 ? false : _props$hideAdditiona,
     _props$hideLabel = props.hideLabel,
     hideLabel = _props$hideLabel === void 0 ? false : _props$hideLabel,
+    _visible = props.visible,
     formItemProps = _objectWithoutProperties(props, _excluded);
   var _tips$icon = tips.icon,
     icon = _tips$icon === void 0 ? "material-symbols:help" : _tips$icon,
@@ -164,15 +161,7 @@ var ItemContainer = function ItemContainer(props) {
   if (!permitted) {
     return null;
   }
-
-  // 页面层 FormItemProps 的展示控制属性（如 visible）不属于 antd Form.Item，
-  // 剥离后再透传，避免被 antd 转发到 DOM 触发 React 非法属性警告。
-  var restFormItemProps = Object.fromEntries(Object.entries(formItemProps).filter(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 1),
-      key = _ref2[0];
-    return key !== "visible";
-  }));
-  return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, restFormItemProps), {}, {
+  return /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, formItemProps), {}, {
     name: name,
     rules: [{
       required: required,

package/es/components/Search/{_components → SearchAdvanced/_components}/AdvancedFiltersDrawer/index.d.ts

@@ -1,8 +1,8 @@
 import React from "react";
 import type { FormInstance } from "antd";
-import { FormItemProps } from "../../../FormItem";
-import { DrawerFormProps } from "../../../Form/DrawerForm";
-import type useLabelWidth from "../../../../hooks/useLabelWidth";
+import { FormItemProps } from "../../../../FormItem";
+import { DrawerFormProps } from "../../../../Form/DrawerForm";
+import type useLabelWidth from "../../../../../hooks/useLabelWidth";
 interface AdvancedFiltersDrawerProps {
     expand: boolean;
     setExpand: (expand: boolean) => void;

package/es/components/Search/{_components → SearchAdvanced/_components}/AdvancedFiltersDrawer/index.js

@@ -5,10 +5,10 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import React from "react";
-import Form from "../../../Form";
+import Form from "../../../../Form";
 import { FilterFilled } from "@ant-design/icons";
-import Icon from "../../../Icon";
-import styles from "../../index.module.scss";
+import Icon from "../../../../Icon";
+import styles from "../../../index.module.scss";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var AdvancedFiltersDrawer = function AdvancedFiltersDrawer(_ref) {

package/es/components/Search/SearchAdvanced/index.js

@@ -1,30 +1,18 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["className", "advancedFiltersProps", "setFilter", "minLabelWidth"];
 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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from "react";
-import { Form as AntdForm } from "antd";
-import FormItem from "../../FormItem";
 import classNames from "classnames";
 import styles from "../index.module.scss";
-import { useSearchCommon } from "../_hooks";
-import { ButtonGroup } from "../_components/ButtonGroup";
-import { SearchButtons } from "../_components/SearchButtons";
-import { FilterDropdown } from "../_components/FilterDropdown";
-import { ExpandButton } from "../_components/ExpandButton";
-import { AdvancedFiltersDrawer } from "../_components/AdvancedFiltersDrawer";
-import { createElement as _createElement } from "react";
+import SearchBase from "../_components/SearchBase";
+import { AdvancedFiltersDrawer } from "./_components/AdvancedFiltersDrawer";
 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 组件
  * - 不显示标签（label）
@@ -32,139 +20,29 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
  * - 更适合复杂的筛选场景
  */
 var SearchAdvanced = function SearchAdvanced(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,
+  var className = props.className,
     advancedFiltersProps = props.advancedFiltersProps,
     setFilter = props.setFilter,
     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;
-  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;
-  if (!shouldRender) {
-    return null;
-  }
-  return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx("div", {
-      ref: containerRef,
-      className: classNames(styles.Search, className, _defineProperty({}, styles.advancedFilters, true)),
-      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) {
-            return /*#__PURE__*/_createElement(FormItem, _objectSpread(_objectSpread({}, item), {}, {
-              key: item.name,
-              className: classNames(styles.item, item.className, _defineProperty({}, styles.unFill, item.width !== undefined)),
-              label: undefined,
-              labelWidth: undefined
-            }));
-          })), ((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: true,
-              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
-            }), setFilter && /*#__PURE__*/_jsx(FilterDropdown, {
-              searchItems: processedSearchItems,
-              originalSearchItems: searchItems,
-              setSearchItems: setSearchItems,
-              onFilterChange: onFilterChange
-            })]
-          })]
-        })
-      })
-    }), permitted && setExpand && /*#__PURE__*/_jsx(AdvancedFiltersDrawer, {
-      expand: expand,
-      setExpand: setExpand,
-      searchItems: processedSearchItems,
-      form: form,
-      getLabelWidth: getLabelWidth,
-      minLabelWidth: minLabelWidth,
-      onSearchClick: onSearchClick,
-      onResetClick: onResetClick,
-      advancedFiltersProps: advancedFiltersProps
-    })]
-  });
+    rest = _objectWithoutProperties(props, _excluded);
+  return /*#__PURE__*/_jsx(SearchBase, _objectSpread(_objectSpread({}, rest), {}, {
+    minLabelWidth: minLabelWidth,
+    advancedFilters: true,
+    showFilter: !!setFilter,
+    className: classNames(className, styles.advancedFilters),
+    renderOutside: function renderOutside(ctx) {
+      return ctx.setExpand && /*#__PURE__*/_jsx(AdvancedFiltersDrawer, {
+        expand: ctx.expand,
+        setExpand: ctx.setExpand,
+        searchItems: ctx.processedSearchItems,
+        form: ctx.form,
+        getLabelWidth: ctx.getLabelWidth,
+        minLabelWidth: minLabelWidth,
+        onSearchClick: ctx.onSearchClick,
+        onResetClick: ctx.onResetClick,
+        advancedFiltersProps: advancedFiltersProps
+      });
+    }
+  }));
 };
 export default SearchAdvanced;

package/es/components/Search/SearchCard/index.js

@@ -66,7 +66,7 @@ var SearchCard = /*#__PURE__*/memo(function (props) {
     className: classNames(styles.SearchCard, className, _defineProperty(_defineProperty({}, styles.collapse, collapse), styles.legacyHasSearchBox, legacyHasSelector && showSearchBox)),
     style: {
       "--searchCard-column-gap": "".concat(gap, "px"),
-      " --searchCard-padding-left-right": "".concat(padding, "px")
+      "--searchCard-padding-left-right": "".concat(padding, "px")
     },
     children: [showSearchBox && /*#__PURE__*/_jsx(SearchBox, {
       value: internalValue,

package/es/components/Search/{_components → SearchCollapsible/_components}/CollapseToggle/index.js

@@ -3,9 +3,9 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import React from "react";
-import Icon from "../../../Icon";
+import Icon from "../../../../Icon";
 import classNames from "classnames";
-import styles from "../../index.module.scss";
+import styles from "../../../index.module.scss";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var CollapseToggle = function CollapseToggle(_ref) {
   var collapse = _ref.collapse,

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

@@ -1,4 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["className", "defaultExpanded", "onCollapseToggle", "setFilter"];
 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; }
@@ -10,21 +11,14 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 from "react";
-import { Form as AntdForm } from "antd";
-import FormItem from "../../FormItem";
-import { useCallback, useState } from "react";
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React, { useCallback, useState } from "react";
 import classNames from "classnames";
 import styles from "../index.module.scss";
-import { useSearchCommon } from "../_hooks";
-import { ButtonGroup } from "../_components/ButtonGroup";
-import { SearchButtons } from "../_components/SearchButtons";
-import { FilterDropdown } from "../_components/FilterDropdown";
-import { ExpandButton } from "../_components/ExpandButton";
-import { CollapseToggle } from "../_components/CollapseToggle";
-import { createElement as _createElement } from "react";
+import SearchBase from "../_components/SearchBase";
+import { CollapseToggle } from "./_components/CollapseToggle";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * 可折叠模式的 Search 组件
  * - 可以完全折叠/展开整个搜索区域
@@ -32,81 +26,18 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
  * - 适合需要隐藏搜索栏以获得更多展示空间的场景
  */
 var SearchCollapsible = function SearchCollapsible(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,
-    setFilter = props.setFilter,
-    minLabelWidth = props.minLabelWidth,
+  var className = props.className,
     _props$defaultExpande = props.defaultExpanded,
     defaultExpanded = _props$defaultExpande === void 0 ? false : _props$defaultExpande,
     onCollapseToggle = props.onCollapseToggle,
-    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;
-  var _AntdForm$useForm = AntdForm.useForm(externalForm),
-    _AntdForm$useForm2 = _slicedToArray(_AntdForm$useForm, 1),
-    form = _AntdForm$useForm2[0];
+    setFilter = props.setFilter,
+    rest = _objectWithoutProperties(props, _excluded);
+
   // collapse 的语义是反的，所以需要取反 defaultExpanded
   var _useState = useState(!defaultExpanded),
     _useState2 = _slicedToArray(_useState, 2),
     collapse = _useState2[0],
     setCollapse = _useState2[1];
-  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,
-    toggleExpand = _useSearchCommon.toggleExpand,
-    showExpandButton = _useSearchCommon.showExpandButton,
-    onSearchClick = _useSearchCommon.onSearchClick,
-    onResetClick = _useSearchCommon.onResetClick,
-    shouldRender = _useSearchCommon.shouldRender,
-    permitted = _useSearchCommon.permitted;
 
   // 处理折叠切换
   var handleCollapseToggle = useCallback(function () {
@@ -116,66 +47,14 @@ var SearchCollapsible = function SearchCollapsible(props) {
       return newCollapse;
     });
   }, [onCollapseToggle]);
-  if (!shouldRender) {
-    return null;
-  }
-  return /*#__PURE__*/_jsxs("div", {
-    ref: containerRef,
-    className: classNames(styles.Search, className, _defineProperty(_defineProperty({}, styles.collapseExpand, true), styles.collapse, collapse)),
-    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__*/_jsxs(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
-          }), setFilter && /*#__PURE__*/_jsx(FilterDropdown, {
-            searchItems: processedSearchItems,
-            originalSearchItems: searchItems,
-            setSearchItems: setSearchItems,
-            onFilterChange: onFilterChange
-          })]
-        })]
-      })
-    }), permitted && /*#__PURE__*/_jsx(CollapseToggle, {
+  return /*#__PURE__*/_jsx(SearchBase, _objectSpread(_objectSpread({}, rest), {}, {
+    defaultExpanded: defaultExpanded,
+    showFilter: !!setFilter,
+    className: classNames(className, styles.collapseExpand, _defineProperty({}, styles.collapse, collapse)),
+    afterForm: /*#__PURE__*/_jsx(CollapseToggle, {
       collapse: collapse,
       onToggle: handleCollapseToggle
-    })]
-  });
+    })
+  }));
 };
 export default SearchCollapsible;