@hkyhy/marsun-components-core 0.1.28 → 0.1.30

package/dist/components/Filter/FilterInput/index.js

@@ -1,56 +1,74 @@
-import { jsx as f } from "react/jsx-runtime";
-import { Input as F } from "antd";
-import { useState as I, useEffect as c } from "react";
-import x from "../FilterPopover/index.js";
-import { useFilterRegister as E } from "../useFilterState.js";
-import { resolveHidden as l } from "../types.js";
-const S = ({
+import { jsx as d } from "react/jsx-runtime";
+import { Input as E } from "antd";
+import { useState as L, useRef as P, useEffect as f } from "react";
+import V from "../FilterPopover/index.js";
+import { useFilterFieldBridge as j, useFilterRegister as w } from "../useFilterState.js";
+import { resolveHidden as F } from "../types.js";
+const q = ({
   filterKey: e,
-  label: s,
+  label: v,
   value: t,
   onChange: r,
-  placeholder: d,
-  active: R,
-  hidden: o
+  placeholder: R,
+  active: b,
+  hidden: u,
+  dependsOn: I,
+  clearOnDepsChange: x = !0
 }) => {
-  const [u, m] = I(t ?? ""), i = E();
-  if (c(() => {
+  const [p, m] = L(t ?? ""), s = P(r);
+  s.current = r;
+  const { resolvedLabel: i } = j({
+    filterKey: e,
+    value: t,
+    label: v,
+    dependsOn: I,
+    clearOnDepsChange: x,
+    onDepsClear: () => {
+      var l;
+      return (l = s.current) == null ? void 0 : l.call(s, void 0);
+    }
+  }), o = w();
+  if (f(() => {
     m(t ?? "");
-  }, [t]), c(() => {
-    if (i) {
-      if (l(o)) {
-        i.unregister(e);
+  }, [t]), f(() => {
+    if (o) {
+      if (F(u)) {
+        o.unregister(e);
         return;
       }
-      t ? i.register(e, { label: s, valueLabel: t, onRemove: () => r == null ? void 0 : r(void 0) }) : i.unregister(e);
+      t ? o.register(e, {
+        label: i,
+        valueLabel: t,
+        onRemove: () => r == null ? void 0 : r(void 0)
+      }) : o.unregister(e);
     }
-  }, [t, e, s, o]), l(o)) return null;
-  const p = () => {
-    r == null || r(u || void 0);
+  }, [t, e, i, u]), F(u)) return null;
+  const c = () => {
+    r == null || r(p || void 0);
   };
-  return /* @__PURE__ */ f(
-    x,
+  return /* @__PURE__ */ d(
+    V,
     {
-      label: s,
-      active: R || !!t,
-      onConfirm: p,
+      label: i,
+      active: b || !!t,
+      onConfirm: c,
       onReset: () => {
         m(""), r == null || r(void 0);
       },
-      children: /* @__PURE__ */ f(
-        F,
+      children: /* @__PURE__ */ d(
+        E,
         {
-          placeholder: d ?? `请输入${s}`,
+          placeholder: R ?? `请输入${i}`,
           allowClear: !0,
-          value: u,
-          onChange: (v) => m(v.target.value),
-          onPressEnter: p
+          value: p,
+          onChange: (l) => m(l.target.value),
+          onPressEnter: c
         }
       )
     }
   );
 };
 export {
-  S as default
+  q as default
 };
 //# sourceMappingURL=index.js.map

package/dist/components/Filter/FilterInput/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/components/Filter/FilterInput/index.tsx"],"sourcesContent":["import { Input } from 'antd';\nimport React, { useEffect, useState } from 'react';\nimport FilterPopover from '../FilterPopover';\nimport { useFilterRegister } from '../useFilterState';\nimport type { BaseFilterProps } from '../types';\nimport { resolveHidden } from '../types';\n\ninterface FilterInputProps extends BaseFilterProps {\n  value?: string;\n  onChange?: (value: string | undefined) => void;\n  placeholder?: string;\n}\n\nconst FilterInput: React.FC<FilterInputProps> = ({\n  filterKey,\n  label,\n  value,\n  onChange,\n  placeholder,\n  active,\n  hidden,\n}) => {\n  const [inputValue, setInputValue] = useState(value ?? '');\n\n  // ── 自动注册到 CommonFilter ──\n  const registerFn = useFilterRegister();\n\n  // 同步外部 value 到内部 inputValue\n  useEffect(() => {\n    setInputValue(value ?? '');\n  }, [value]);\n\n  useEffect(() => {\n    if (!registerFn) return;\n    if (resolveHidden(hidden)) {\n      registerFn.unregister(filterKey);\n      return;\n    }\n    if (value) {\n      registerFn.register(filterKey, { label, valueLabel: value, onRemove: () => onChange?.(undefined) });\n    } else {\n      registerFn.unregister(filterKey);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [value, filterKey, label, hidden]);\n\n  // hidden 处理 - 必须在所有 hooks 之后\n  if (resolveHidden(hidden)) return null;\n\n  const handleConfirm = () => {\n    onChange?.(inputValue || undefined);\n  };\n\n  const handleReset = () => {\n    setInputValue('');\n    onChange?.(undefined);\n  };\n\n  return (\n    <FilterPopover\n      label={label}\n      active={active || !!value}\n      onConfirm={handleConfirm}\n      onReset={handleReset}\n    >\n      <Input\n        placeholder={placeholder ?? `请输入${label}`}\n        allowClear\n        value={inputValue}\n        onChange={(e) => setInputValue(e.target.value)}\n        onPressEnter={handleConfirm}\n      />\n    </FilterPopover>\n  );\n};\n\nexport default FilterInput;\nexport type { FilterInputProps };\n"],"names":["FilterInput","filterKey","label","value","onChange","placeholder","active","hidden","inputValue","setInputValue","useState","registerFn","useFilterRegister","useEffect","resolveHidden","handleConfirm","jsx","FilterPopover","Input","e"],"mappings":";;;;;;AAaA,MAAMA,IAA0C,CAAC;AAAA,EAC/C,WAAAC;AAAA,EACA,OAAAC;AAAA,EACA,OAAAC;AAAA,EACA,UAAAC;AAAA,EACA,aAAAC;AAAA,EACA,QAAAC;AAAA,EACA,QAAAC;AACF,MAAM;AACJ,QAAM,CAACC,GAAYC,CAAa,IAAIC,EAASP,KAAS,EAAE,GAGlDQ,IAAaC,EAAA;AAsBnB,MAnBAC,EAAU,MAAM;AACd,IAAAJ,EAAcN,KAAS,EAAE;AAAA,EAC3B,GAAG,CAACA,CAAK,CAAC,GAEVU,EAAU,MAAM;AACd,QAAKF,GACL;AAAA,UAAIG,EAAcP,CAAM,GAAG;AACzB,QAAAI,EAAW,WAAWV,CAAS;AAC/B;AAAA,MACF;AACA,MAAIE,IACFQ,EAAW,SAASV,GAAW,EAAE,OAAAC,GAAO,YAAYC,GAAO,UAAU,MAAMC,KAAA,gBAAAA,EAAW,QAAS,CAAG,IAElGO,EAAW,WAAWV,CAAS;AAAA;AAAA,EAGnC,GAAG,CAACE,GAAOF,GAAWC,GAAOK,CAAM,CAAC,GAGhCO,EAAcP,CAAM,EAAG,QAAO;AAElC,QAAMQ,IAAgB,MAAM;AAC1B,IAAAX,KAAA,QAAAA,EAAWI,KAAc;AAAA,EAC3B;AAOA,SACE,gBAAAQ;AAAA,IAACC;AAAA,IAAA;AAAA,MACC,OAAAf;AAAA,MACA,QAAQI,KAAU,CAAC,CAACH;AAAA,MACpB,WAAWY;AAAA,MACX,SAVgB,MAAM;AACxB,QAAAN,EAAc,EAAE,GAChBL,KAAA,QAAAA,EAAW;AAAA,MACb;AAAA,MASI,UAAA,gBAAAY;AAAA,QAACE;AAAA,QAAA;AAAA,UACC,aAAab,KAAe,MAAMH,CAAK;AAAA,UACvC,YAAU;AAAA,UACV,OAAOM;AAAA,UACP,UAAU,CAACW,MAAMV,EAAcU,EAAE,OAAO,KAAK;AAAA,UAC7C,cAAcJ;AAAA,QAAA;AAAA,MAAA;AAAA,IAChB;AAAA,EAAA;AAGN;"}
+{"version":3,"file":"index.js","sources":["../../../../src/components/Filter/FilterInput/index.tsx"],"sourcesContent":["import { Input } from 'antd';\nimport React, { useEffect, useRef, useState } from 'react';\nimport FilterPopover from '../FilterPopover';\nimport { useFilterFieldBridge, useFilterRegister } from '../useFilterState';\nimport type { BaseFilterProps } from '../types';\nimport { resolveHidden } from '../types';\n\ninterface FilterInputProps extends BaseFilterProps {\n  value?: string;\n  onChange?: (value: string | undefined) => void;\n  placeholder?: string;\n}\n\nconst FilterInput: React.FC<FilterInputProps> = ({\n  filterKey,\n  label,\n  value,\n  onChange,\n  placeholder,\n  active,\n  hidden,\n  dependsOn,\n  clearOnDepsChange = true,\n}) => {\n  const [inputValue, setInputValue] = useState(value ?? '');\n\n  const onChangeRef = useRef(onChange);\n  onChangeRef.current = onChange;\n\n  const { resolvedLabel } = useFilterFieldBridge({\n    filterKey,\n    value,\n    label,\n    dependsOn,\n    clearOnDepsChange,\n    onDepsClear: () => onChangeRef.current?.(undefined),\n  });\n\n  const registerFn = useFilterRegister();\n\n  useEffect(() => {\n    setInputValue(value ?? '');\n  }, [value]);\n\n  useEffect(() => {\n    if (!registerFn) return;\n    if (resolveHidden(hidden)) {\n      registerFn.unregister(filterKey);\n      return;\n    }\n    if (value) {\n      registerFn.register(filterKey, {\n        label: resolvedLabel,\n        valueLabel: value,\n        onRemove: () => onChange?.(undefined),\n      });\n    } else {\n      registerFn.unregister(filterKey);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [value, filterKey, resolvedLabel, hidden]);\n\n  if (resolveHidden(hidden)) return null;\n\n  const handleConfirm = () => {\n    onChange?.(inputValue || undefined);\n  };\n\n  const handleReset = () => {\n    setInputValue('');\n    onChange?.(undefined);\n  };\n\n  return (\n    <FilterPopover\n      label={resolvedLabel}\n      active={active || !!value}\n      onConfirm={handleConfirm}\n      onReset={handleReset}\n    >\n      <Input\n        placeholder={placeholder ?? `请输入${resolvedLabel}`}\n        allowClear\n        value={inputValue}\n        onChange={(e) => setInputValue(e.target.value)}\n        onPressEnter={handleConfirm}\n      />\n    </FilterPopover>\n  );\n};\n\nexport default FilterInput;\nexport type { FilterInputProps };\n"],"names":["FilterInput","filterKey","label","value","onChange","placeholder","active","hidden","dependsOn","clearOnDepsChange","inputValue","setInputValue","useState","onChangeRef","useRef","resolvedLabel","useFilterFieldBridge","_a","registerFn","useFilterRegister","useEffect","resolveHidden","handleConfirm","jsx","FilterPopover","Input","e"],"mappings":";;;;;;AAaA,MAAMA,IAA0C,CAAC;AAAA,EAC/C,WAAAC;AAAA,EACA,OAAAC;AAAA,EACA,OAAAC;AAAA,EACA,UAAAC;AAAA,EACA,aAAAC;AAAA,EACA,QAAAC;AAAA,EACA,QAAAC;AAAA,EACA,WAAAC;AAAA,EACA,mBAAAC,IAAoB;AACtB,MAAM;AACJ,QAAM,CAACC,GAAYC,CAAa,IAAIC,EAAST,KAAS,EAAE,GAElDU,IAAcC,EAAOV,CAAQ;AACnC,EAAAS,EAAY,UAAUT;AAEtB,QAAM,EAAE,eAAAW,EAAA,IAAkBC,EAAqB;AAAA,IAC7C,WAAAf;AAAA,IACA,OAAAE;AAAA,IACA,OAAAD;AAAA,IACA,WAAAM;AAAA,IACA,mBAAAC;AAAA,IACA,aAAa,MAAA;;AAAM,cAAAQ,IAAAJ,EAAY,YAAZ,gBAAAI,EAAA,KAAAJ,GAAsB;AAAA;AAAA,EAAS,CACnD,GAEKK,IAAaC,EAAA;AAwBnB,MAtBAC,EAAU,MAAM;AACd,IAAAT,EAAcR,KAAS,EAAE;AAAA,EAC3B,GAAG,CAACA,CAAK,CAAC,GAEViB,EAAU,MAAM;AACd,QAAKF,GACL;AAAA,UAAIG,EAAcd,CAAM,GAAG;AACzB,QAAAW,EAAW,WAAWjB,CAAS;AAC/B;AAAA,MACF;AACA,MAAIE,IACFe,EAAW,SAASjB,GAAW;AAAA,QAC7B,OAAOc;AAAA,QACP,YAAYZ;AAAA,QACZ,UAAU,MAAMC,KAAA,gBAAAA,EAAW;AAAA,MAAS,CACrC,IAEDc,EAAW,WAAWjB,CAAS;AAAA;AAAA,EAGnC,GAAG,CAACE,GAAOF,GAAWc,GAAeR,CAAM,CAAC,GAExCc,EAAcd,CAAM,EAAG,QAAO;AAElC,QAAMe,IAAgB,MAAM;AAC1B,IAAAlB,KAAA,QAAAA,EAAWM,KAAc;AAAA,EAC3B;AAOA,SACE,gBAAAa;AAAA,IAACC;AAAA,IAAA;AAAA,MACC,OAAOT;AAAA,MACP,QAAQT,KAAU,CAAC,CAACH;AAAA,MACpB,WAAWmB;AAAA,MACX,SAVgB,MAAM;AACxB,QAAAX,EAAc,EAAE,GAChBP,KAAA,QAAAA,EAAW;AAAA,MACb;AAAA,MASI,UAAA,gBAAAmB;AAAA,QAACE;AAAA,QAAA;AAAA,UACC,aAAapB,KAAe,MAAMU,CAAa;AAAA,UAC/C,YAAU;AAAA,UACV,OAAOL;AAAA,UACP,UAAU,CAACgB,MAAMf,EAAce,EAAE,OAAO,KAAK;AAAA,UAC7C,cAAcJ;AAAA,QAAA;AAAA,MAAA;AAAA,IAChB;AAAA,EAAA;AAGN;"}

package/dist/components/Filter/FilterNumberRange/index.d.ts

@@ -6,6 +6,14 @@ interface FilterNumberRangeProps extends BaseFilterProps {
     unit?: string;
     minPlaceholder?: string;
     maxPlaceholder?: string;
+    /** 绝对值下限（左右输入框共用） */
+    min?: number;
+    /** 绝对值上限（左右输入框共用） */
+    max?: number;
+    /** 小数位数 */
+    precision?: number;
+    /** 步进；未传且有 precision 时按 10^-precision 推导 */
+    step?: number;
 }
 declare const FilterNumberRange: React.FC<FilterNumberRangeProps>;
 export default FilterNumberRange;

package/dist/components/Filter/FilterNumberRange/index.js

@@ -1,81 +1,155 @@
-import { jsx as m, jsxs as w } from "react/jsx-runtime";
-import { Input as x } from "antd";
-import { useState as R, useEffect as F, useMemo as E } from "react";
-import H from "../FilterPopover/index.js";
-import { useFilterRegister as I } from "../useFilterState.js";
-import { resolveHidden as V } from "../types.js";
-import u from "./style.module.scss.js";
-import N from "classnames";
-const G = ({
-  filterKey: o,
-  label: n,
+import { jsx as d, jsxs as $ } from "react/jsx-runtime";
+import { InputNumber as j, message as G } from "antd";
+import { useState as S, useRef as J, useEffect as w, useMemo as O } from "react";
+import Q from "../FilterPopover/index.js";
+import { useFilterFieldBridge as U, useFilterRegister as W } from "../useFilterState.js";
+import { resolveHidden as z } from "../types.js";
+import f from "./style.module.scss.js";
+import c from "classnames";
+function L(s, i) {
+  return i != null && i >= 0 ? s.toFixed(i) : String(s);
+}
+function X(s, i) {
+  if (s != null) return s;
+  if (i != null && i >= 0) return 10 ** -i;
+}
+const rr = ({
+  filterKey: s,
+  label: i,
   value: r,
   onChange: t,
-  unit: d,
-  minPlaceholder: M = "最低...",
-  maxPlaceholder: S = "最高...",
-  active: $,
-  hidden: c
+  unit: u,
+  minPlaceholder: T = "最低...",
+  maxPlaceholder: B = "最高...",
+  min: V,
+  max: g,
+  precision: o,
+  step: D,
+  active: H,
+  hidden: N,
+  dependsOn: I,
+  clearOnDepsChange: P = !0
 }) => {
-  const [i, p] = R(r == null ? void 0 : r[0]), [s, l] = R(r == null ? void 0 : r[1]), f = I();
-  F(() => {
-    p(r == null ? void 0 : r[0]), l(r == null ? void 0 : r[1]);
+  const [l, x] = S(r == null ? void 0 : r[0]), [m, a] = S(r == null ? void 0 : r[1]), [E, n] = S(""), M = X(D, o), b = J(t);
+  b.current = t;
+  const { resolvedLabel: F } = U({
+    filterKey: s,
+    value: r,
+    label: i,
+    dependsOn: I,
+    clearOnDepsChange: P,
+    onDepsClear: () => {
+      var e;
+      return (e = b.current) == null ? void 0 : e.call(b, null);
+    }
+  }), p = W();
+  w(() => {
+    x(r == null ? void 0 : r[0]), a(r == null ? void 0 : r[1]), n("");
   }, [r]);
-  const b = E(() => {
-    if (i === void 0 && s === void 0) return "";
-    const e = i !== void 0 ? String(i) : "—", g = s !== void 0 ? String(s) : "—";
-    return `${e} ~ ${g}${d ?? ""}`;
-  }, [i, s, d]);
-  if (F(() => {
-    if (f) {
-      if (V(c)) {
-        f.unregister(o);
+  const R = O(() => {
+    if (l === void 0 && m === void 0) return "";
+    const e = l !== void 0 ? L(l, o) : "—", A = m !== void 0 ? L(m, o) : "—";
+    return `${e} ~ ${A}${u ?? ""}`;
+  }, [l, m, u, o]);
+  if (w(() => {
+    if (p) {
+      if (z(N)) {
+        p.unregister(s);
         return;
       }
-      b ? f.register(o, { label: n, valueLabel: b, onRemove: () => t == null ? void 0 : t(null) }) : f.unregister(o);
+      R ? p.register(s, {
+        label: F,
+        valueLabel: R,
+        onRemove: () => t == null ? void 0 : t(null)
+      }) : p.unregister(s);
+    }
+  }, [R, s, F, N]), z(N)) return null;
+  const k = () => {
+    if (l !== void 0 && m !== void 0 && l > m) {
+      const e = "最小值不能大于最大值";
+      return n(e), G.warning(e), !1;
     }
-  }, [b, o, n, c]), V(c)) return null;
-  const j = () => {
-    i !== void 0 || s !== void 0 ? t == null || t([i, s]) : t == null || t(null);
-  }, z = () => {
-    p(void 0), l(void 0), t == null || t(null);
+    n(""), l !== void 0 || m !== void 0 ? t == null || t([l, m]) : t == null || t(null);
+  }, q = () => {
+    x(void 0), a(void 0), n(""), t == null || t(null);
   };
-  return /* @__PURE__ */ m(
-    H,
+  return /* @__PURE__ */ d(
+    Q,
     {
-      label: n,
-      active: $ || !!(r != null && r[0]) || !!(r != null && r[1]),
-      onConfirm: j,
-      onReset: z,
+      label: F,
+      active: H || !!(r != null && r[0]) || !!(r != null && r[1]),
+      onConfirm: k,
+      onReset: q,
       width: 380,
-      children: /* @__PURE__ */ w("div", { className: N("filter-number-range-inputs", u["filter-number-range-inputs"]), children: [
-        /* @__PURE__ */ m(
-          x,
+      children: /* @__PURE__ */ $("div", { className: c("filter-number-range-body", f["filter-number-range-body"]), children: [
+        /* @__PURE__ */ $(
+          "div",
           {
-            size: "middle",
-            placeholder: M,
-            type: "number",
-            value: i,
-            onChange: (e) => p(e.target.value ? Number(e.target.value) : void 0)
+            className: c("filter-number-range-inputs", f["filter-number-range-inputs"]),
+            children: [
+              /* @__PURE__ */ d(
+                j,
+                {
+                  size: "middle",
+                  placeholder: T,
+                  value: l,
+                  min: V,
+                  max: g,
+                  precision: o,
+                  step: M,
+                  onChange: (e) => {
+                    x(e === null ? void 0 : e), n("");
+                  }
+                }
+              ),
+              /* @__PURE__ */ d(
+                "span",
+                {
+                  className: c(
+                    "filter-number-range-separator",
+                    f["filter-number-range-separator"]
+                  ),
+                  children: "-"
+                }
+              ),
+              /* @__PURE__ */ d(
+                j,
+                {
+                  size: "middle",
+                  placeholder: B,
+                  value: m,
+                  min: V,
+                  max: g,
+                  precision: o,
+                  step: M,
+                  onChange: (e) => {
+                    a(e === null ? void 0 : e), n("");
+                  }
+                }
+              ),
+              u ? /* @__PURE__ */ d(
+                "span",
+                {
+                  className: c("filter-number-range-unit", f["filter-number-range-unit"]),
+                  children: u
+                }
+              ) : null
+            ]
           }
         ),
-        /* @__PURE__ */ m("span", { className: N("filter-number-range-separator", u["filter-number-range-separator"]), children: "-" }),
-        /* @__PURE__ */ m(
-          x,
+        E ? /* @__PURE__ */ d(
+          "div",
           {
-            size: "middle",
-            placeholder: S,
-            type: "number",
-            value: s,
-            onChange: (e) => l(e.target.value ? Number(e.target.value) : void 0)
+            className: c("filter-number-range-error", f["filter-number-range-error"]),
+            role: "alert",
+            children: E
           }
-        ),
-        d && /* @__PURE__ */ m("span", { className: N("filter-number-range-unit", u["filter-number-range-unit"]), children: d })
+        ) : null
       ] })
     }
   );
 };
 export {
-  G as default
+  rr as default
 };
 //# sourceMappingURL=index.js.map

package/dist/components/Filter/FilterNumberRange/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/components/Filter/FilterNumberRange/index.tsx"],"sourcesContent":["import { Input } from 'antd';\nimport React, { useEffect, useMemo, useState } from 'react';\nimport FilterPopover from '../FilterPopover';\nimport { useFilterRegister } from '../useFilterState';\nimport type { BaseFilterProps } from '../types';\nimport { resolveHidden } from '../types';\nimport styles from './style.module.scss';\nimport classNames from 'classnames';\n\ninterface FilterNumberRangeProps extends BaseFilterProps {\n  value?: [number | undefined, number | undefined] | null;\n  onChange?: (value: [number | undefined, number | undefined] | null) => void;\n  unit?: string;\n  minPlaceholder?: string;\n  maxPlaceholder?: string;\n}\n\nconst FilterNumberRange: React.FC<FilterNumberRangeProps> = ({\n  filterKey,\n  label,\n  value,\n  onChange,\n  unit,\n  minPlaceholder = '最低...',\n  maxPlaceholder = '最高...',\n  active,\n  hidden,\n}) => {\n  const [minVal, setMinVal] = useState<number | undefined>(value?.[0]);\n  const [maxVal, setMaxVal] = useState<number | undefined>(value?.[1]);\n\n  // ── 自动注册到 CommonFilter ──\n  const registerFn = useFilterRegister();\n\n  // 同步外部 value 到内部 minVal/maxVal\n  useEffect(() => {\n    setMinVal(value?.[0]);\n    setMaxVal(value?.[1]);\n  }, [value]);\n\n  const valueLabel = useMemo(() => {\n    if (minVal === undefined && maxVal === undefined) return '';\n    const min = minVal !== undefined ? String(minVal) : '—';\n    const max = maxVal !== undefined ? String(maxVal) : '—';\n    return `${min} ~ ${max}${unit ?? ''}`;\n  }, [minVal, maxVal, unit]);\n\n  useEffect(() => {\n    if (!registerFn) return;\n    if (resolveHidden(hidden)) {\n      registerFn.unregister(filterKey);\n      return;\n    }\n    if (valueLabel) {\n      registerFn.register(filterKey, { label, valueLabel, onRemove: () => onChange?.(null) });\n    } else {\n      registerFn.unregister(filterKey);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [valueLabel, filterKey, label, hidden]);\n\n  // hidden 处理 - 必须在所有 hooks 之后\n  if (resolveHidden(hidden)) return null;\n\n  const handleConfirm = () => {\n    if (minVal !== undefined || maxVal !== undefined) {\n      onChange?.([minVal, maxVal]);\n    } else {\n      onChange?.(null);\n    }\n  };\n\n  const handleReset = () => {\n    setMinVal(undefined);\n    setMaxVal(undefined);\n    onChange?.(null);\n  };\n\n  return (\n    <FilterPopover\n      label={label}\n      active={active || !!value?.[0] || !!value?.[1]}\n      onConfirm={handleConfirm}\n      onReset={handleReset}\n      width={380}\n    >\n      <div className={classNames('filter-number-range-inputs', styles['filter-number-range-inputs'])}>\n        <Input\n          size=\"middle\"\n          placeholder={minPlaceholder}\n          type=\"number\"\n          value={minVal}\n          onChange={(e) => setMinVal(e.target.value ? Number(e.target.value) : undefined)}\n        />\n        <span className={classNames('filter-number-range-separator', styles['filter-number-range-separator'])}>-</span>\n        <Input\n          size=\"middle\"\n          placeholder={maxPlaceholder}\n          type=\"number\"\n          value={maxVal}\n          onChange={(e) => setMaxVal(e.target.value ? Number(e.target.value) : undefined)}\n        />\n        {unit && <span className={classNames('filter-number-range-unit', styles['filter-number-range-unit'])}>{unit}</span>}\n      </div>\n    </FilterPopover>\n  );\n};\n\nexport default FilterNumberRange;\nexport type { FilterNumberRangeProps };\n"],"names":["FilterNumberRange","filterKey","label","value","onChange","unit","minPlaceholder","maxPlaceholder","active","hidden","minVal","setMinVal","useState","maxVal","setMaxVal","registerFn","useFilterRegister","useEffect","valueLabel","useMemo","min","max","resolveHidden","handleConfirm","handleReset","jsx","FilterPopover","jsxs","classNames","styles","Input"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../../src/components/Filter/FilterNumberRange/index.tsx"],"sourcesContent":["import { InputNumber, message } from 'antd';\nimport React, { useEffect, useMemo, useRef, useState } from 'react';\nimport FilterPopover from '../FilterPopover';\nimport { useFilterFieldBridge, useFilterRegister } from '../useFilterState';\nimport type { BaseFilterProps } from '../types';\nimport { resolveHidden } from '../types';\nimport styles from './style.module.scss';\nimport classNames from 'classnames';\n\ninterface FilterNumberRangeProps extends BaseFilterProps {\n  value?: [number | undefined, number | undefined] | null;\n  onChange?: (value: [number | undefined, number | undefined] | null) => void;\n  unit?: string;\n  minPlaceholder?: string;\n  maxPlaceholder?: string;\n  /** 绝对值下限（左右输入框共用） */\n  min?: number;\n  /** 绝对值上限（左右输入框共用） */\n  max?: number;\n  /** 小数位数 */\n  precision?: number;\n  /** 步进；未传且有 precision 时按 10^-precision 推导 */\n  step?: number;\n}\n\nfunction formatNumber(n: number, precision?: number): string {\n  if (precision != null && precision >= 0) return n.toFixed(precision);\n  return String(n);\n}\n\nfunction resolveStep(step: number | undefined, precision: number | undefined): number | undefined {\n  if (step != null) return step;\n  if (precision != null && precision >= 0) return 10 ** -precision;\n  return undefined;\n}\n\nconst FilterNumberRange: React.FC<FilterNumberRangeProps> = ({\n  filterKey,\n  label,\n  value,\n  onChange,\n  unit,\n  minPlaceholder = '最低...',\n  maxPlaceholder = '最高...',\n  min,\n  max,\n  precision,\n  step,\n  active,\n  hidden,\n  dependsOn,\n  clearOnDepsChange = true,\n}) => {\n  const [minVal, setMinVal] = useState<number | undefined>(value?.[0]);\n  const [maxVal, setMaxVal] = useState<number | undefined>(value?.[1]);\n  const [rangeError, setRangeError] = useState('');\n\n  const resolvedStep = resolveStep(step, precision);\n\n  const onChangeRef = useRef(onChange);\n  onChangeRef.current = onChange;\n\n  const { resolvedLabel } = useFilterFieldBridge({\n    filterKey,\n    value,\n    label,\n    dependsOn,\n    clearOnDepsChange,\n    onDepsClear: () => onChangeRef.current?.(null),\n  });\n\n  // ── 自动注册到 CommonFilter ──\n  const registerFn = useFilterRegister();\n\n  // 同步外部 value 到内部 minVal/maxVal\n  useEffect(() => {\n    setMinVal(value?.[0]);\n    setMaxVal(value?.[1]);\n    setRangeError('');\n  }, [value]);\n\n  const valueLabel = useMemo(() => {\n    if (minVal === undefined && maxVal === undefined) return '';\n    const minText = minVal !== undefined ? formatNumber(minVal, precision) : '—';\n    const maxText = maxVal !== undefined ? formatNumber(maxVal, precision) : '—';\n    return `${minText} ~ ${maxText}${unit ?? ''}`;\n  }, [minVal, maxVal, unit, precision]);\n\n  useEffect(() => {\n    if (!registerFn) return;\n    if (resolveHidden(hidden)) {\n      registerFn.unregister(filterKey);\n      return;\n    }\n    if (valueLabel) {\n      registerFn.register(filterKey, {\n        label: resolvedLabel,\n        valueLabel,\n        onRemove: () => onChange?.(null),\n      });\n    } else {\n      registerFn.unregister(filterKey);\n    }\n    // eslint-disable-next-line react-hooks/exhaustive-deps\n  }, [valueLabel, filterKey, resolvedLabel, hidden]);\n\n  // hidden 处理 - 必须在所有 hooks 之后\n  if (resolveHidden(hidden)) return null;\n\n  const handleConfirm = (): boolean | void => {\n    if (minVal !== undefined && maxVal !== undefined && minVal > maxVal) {\n      const msg = '最小值不能大于最大值';\n      setRangeError(msg);\n      message.warning(msg);\n      return false;\n    }\n    setRangeError('');\n    if (minVal !== undefined || maxVal !== undefined) {\n      onChange?.([minVal, maxVal]);\n    } else {\n      onChange?.(null);\n    }\n  };\n\n  const handleReset = () => {\n    setMinVal(undefined);\n    setMaxVal(undefined);\n    setRangeError('');\n    onChange?.(null);\n  };\n\n  return (\n    <FilterPopover\n      label={resolvedLabel}\n      active={active || !!value?.[0] || !!value?.[1]}\n      onConfirm={handleConfirm}\n      onReset={handleReset}\n      width={380}\n    >\n      <div className={classNames('filter-number-range-body', styles['filter-number-range-body'])}>\n        <div\n          className={classNames('filter-number-range-inputs', styles['filter-number-range-inputs'])}\n        >\n          <InputNumber\n            size=\"middle\"\n            placeholder={minPlaceholder}\n            value={minVal}\n            min={min}\n            max={max}\n            precision={precision}\n            step={resolvedStep}\n            onChange={(v) => {\n              setMinVal(v === null ? undefined : v);\n              setRangeError('');\n            }}\n          />\n          <span\n            className={classNames(\n              'filter-number-range-separator',\n              styles['filter-number-range-separator'],\n            )}\n          >\n            -\n          </span>\n          <InputNumber\n            size=\"middle\"\n            placeholder={maxPlaceholder}\n            value={maxVal}\n            min={min}\n            max={max}\n            precision={precision}\n            step={resolvedStep}\n            onChange={(v) => {\n              setMaxVal(v === null ? undefined : v);\n              setRangeError('');\n            }}\n          />\n          {unit ? (\n            <span\n              className={classNames('filter-number-range-unit', styles['filter-number-range-unit'])}\n            >\n              {unit}\n            </span>\n          ) : null}\n        </div>\n        {rangeError ? (\n          <div\n            className={classNames('filter-number-range-error', styles['filter-number-range-error'])}\n            role=\"alert\"\n          >\n            {rangeError}\n          </div>\n        ) : null}\n      </div>\n    </FilterPopover>\n  );\n};\n\nexport default FilterNumberRange;\nexport type { FilterNumberRangeProps };\n"],"names":["formatNumber","n","precision","resolveStep","step","FilterNumberRange","filterKey","label","value","onChange","unit","minPlaceholder","maxPlaceholder","min","max","active","hidden","dependsOn","clearOnDepsChange","minVal","setMinVal","useState","maxVal","setMaxVal","rangeError","setRangeError","resolvedStep","onChangeRef","useRef","resolvedLabel","useFilterFieldBridge","_a","registerFn","useFilterRegister","useEffect","valueLabel","useMemo","minText","maxText","resolveHidden","handleConfirm","msg","message","handleReset","jsx","FilterPopover","jsxs","classNames","styles","InputNumber","v"],"mappings":"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"}

package/dist/components/Filter/FilterNumberRange/style.module.scss.js

@@ -1,9 +1,11 @@
-const e = {
-  "filter-number-range-inputs": "_filter-number-range-inputs_y3pfu_1",
-  "filter-number-range-separator": "_filter-number-range-separator_y3pfu_7",
-  "filter-number-range-unit": "_filter-number-range-unit_y3pfu_11"
+const r = {
+  "filter-number-range-body": "_filter-number-range-body_hv0kp_1",
+  "filter-number-range-inputs": "_filter-number-range-inputs_hv0kp_7",
+  "filter-number-range-separator": "_filter-number-range-separator_hv0kp_13",
+  "filter-number-range-unit": "_filter-number-range-unit_hv0kp_17",
+  "filter-number-range-error": "_filter-number-range-error_hv0kp_22"
 };
 export {
-  e as default
+  r as default
 };
 //# sourceMappingURL=style.module.scss.js.map

package/dist/components/Filter/FilterNumberRange/style.module.scss.js.map

@@ -1 +1 @@
-{"version":3,"file":"style.module.scss.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;"}
+{"version":3,"file":"style.module.scss.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;"}

package/dist/components/Filter/FilterPopover/index.d.ts

@@ -14,8 +14,8 @@ interface FilterPopoverProps {
     open?: boolean;
     /** 打开状态变更回调 */
     onOpenChange?: (open: boolean) => void;
-    /** 确认回调（不传则无确定/取消按钮） */
-    onConfirm?: () => void;
+    /** 确认回调（不传则无确定/取消按钮）；返回 `false` 时不关闭弹层 */
+    onConfirm?: () => void | boolean;
     /** 取消回调 */
     onReset?: () => void;
 }

package/dist/components/Filter/FilterPopover/index.js

@@ -4,8 +4,8 @@ import { useState as h } from "react";
 import v from "../FilterPanel/index.js";
 import x from "../FilterTrigger/index.js";
 const I = ({
-  label: p,
-  active: a,
+  label: a,
+  active: p,
   width: i,
   confirmText: d = "确定",
   children: c,
@@ -14,13 +14,13 @@ const I = ({
   onConfirm: t,
   onReset: e
 }) => {
-  const [f, u] = h(!1), s = m ?? f, o = (n) => {
-    u(n), l == null || l(n);
+  const [f, u] = h(!1), n = m ?? f, o = (s) => {
+    u(s), l == null || l(s);
   };
   return /* @__PURE__ */ r(
     y,
     {
-      open: s,
+      open: n,
       onOpenChange: o,
       trigger: "click",
       placement: "bottomLeft",
@@ -32,7 +32,7 @@ const I = ({
         v,
         {
           onConfirm: t ? () => {
-            t == null || t(), o(!1);
+            (t == null ? void 0 : t()) !== !1 && o(!1);
           } : void 0,
           onReset: e ? () => {
             e == null || e(), o(!1);
@@ -42,7 +42,7 @@ const I = ({
           children: c
         }
       ),
-      children: /* @__PURE__ */ r("span", { style: { display: "inline-flex" }, children: /* @__PURE__ */ r(x, { label: p, active: a, open: s }) })
+      children: /* @__PURE__ */ r("span", { style: { display: "inline-flex" }, children: /* @__PURE__ */ r(x, { label: a, active: p, open: n }) })
     }
   );
 };

package/dist/components/Filter/FilterPopover/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../../src/components/Filter/FilterPopover/index.tsx"],"sourcesContent":["import { Popover } from 'antd';\nimport React, { useState } from 'react';\nimport FilterPanel from '../FilterPanel';\nimport FilterTrigger from '../FilterTrigger';\n\ninterface FilterPopoverProps {\n  /** 筛选项标签 */\n  label: string;\n  /** 是否有值（控制选中态样式） */\n  active?: boolean;\n  /** 面板宽度 */\n  width?: number;\n  /** 确定按钮文字 */\n  confirmText?: string;\n  /** 面板内容 */\n  children: React.ReactNode;\n  /** 受控打开状态（传入则由外部控制） */\n  open?: boolean;\n  /** 打开状态变更回调 */\n  onOpenChange?: (open: boolean) => void;\n  /** 确认回调（不传则无确定/取消按钮） */\n  onConfirm?: () => void;\n  /** 取消回调 */\n  onReset?: () => void;\n}\n\nconst FilterPopover: React.FC<FilterPopoverProps> = ({\n  label,\n  active,\n  width,\n  confirmText = '确定',\n  children,\n  open: controlledOpen,\n  onOpenChange,\n  onConfirm,\n  onReset,\n}) => {\n  const [internalOpen, setInternalOpen] = useState(false);\n  const open = controlledOpen ?? internalOpen;\n\n  const setOpen = (value: boolean) => {\n    setInternalOpen(value);\n    onOpenChange?.(value);\n  };\n\n  const handleConfirm = () => {\n    onConfirm?.();\n    setOpen(false);\n  };\n\n  const handleReset = () => {\n    onReset?.();\n    setOpen(false);\n  };\n\n  return (\n    <Popover\n      open={open}\n      onOpenChange={setOpen}\n      trigger=\"click\"\n      placement=\"bottomLeft\"\n      destroyOnHidden\n      classNames={{ root: 'filter-popover-panel' }}\n      styles={{ content: { maxWidth: width || 300, padding: 0 } }}\n      getPopupContainer={() => document.body}\n      content={\n        <FilterPanel\n          onConfirm={onConfirm ? handleConfirm : undefined}\n          onReset={onReset ? handleReset : undefined}\n          confirmText={confirmText}\n          width={width || 300}\n        >\n          {children}\n        </FilterPanel>\n      }\n    >\n      <span style={{ display: 'inline-flex' }}>\n        <FilterTrigger label={label} active={active} open={open} />\n      </span>\n    </Popover>\n  );\n};\n\nexport default FilterPopover;\nexport type { FilterPopoverProps };\n"],"names":["FilterPopover","label","active","width","confirmText","children","controlledOpen","onOpenChange","onConfirm","onReset","internalOpen","setInternalOpen","useState","open","setOpen","value","jsx","Popover","FilterPanel","FilterTrigger"],"mappings":";;;;;AA0BA,MAAMA,IAA8C,CAAC;AAAA,EACnD,OAAAC;AAAA,EACA,QAAAC;AAAA,EACA,OAAAC;AAAA,EACA,aAAAC,IAAc;AAAA,EACd,UAAAC;AAAA,EACA,MAAMC;AAAA,EACN,cAAAC;AAAA,EACA,WAAAC;AAAA,EACA,SAAAC;AACF,MAAM;AACJ,QAAM,CAACC,GAAcC,CAAe,IAAIC,EAAS,EAAK,GAChDC,IAAOP,KAAkBI,GAEzBI,IAAU,CAACC,MAAmB;AAClC,IAAAJ,EAAgBI,CAAK,GACrBR,KAAA,QAAAA,EAAeQ;AAAA,EACjB;AAYA,SACE,gBAAAC;AAAA,IAACC;AAAA,IAAA;AAAA,MACC,MAAAJ;AAAA,MACA,cAAcC;AAAA,MACd,SAAQ;AAAA,MACR,WAAU;AAAA,MACV,iBAAe;AAAA,MACf,YAAY,EAAE,MAAM,uBAAA;AAAA,MACpB,QAAQ,EAAE,SAAS,EAAE,UAAUX,KAAS,KAAK,SAAS,IAAE;AAAA,MACxD,mBAAmB,MAAM,SAAS;AAAA,MAClC,SACE,gBAAAa;AAAA,QAACE;AAAA,QAAA;AAAA,UACC,WAAWV,IAtBG,MAAM;AAC1B,YAAAA,KAAA,QAAAA,KACAM,EAAQ,EAAK;AAAA,UACf,IAmB+C;AAAA,UACvC,SAASL,IAlBG,MAAM;AACxB,YAAAA,KAAA,QAAAA,KACAK,EAAQ,EAAK;AAAA,UACf,IAeyC;AAAA,UACjC,aAAAV;AAAA,UACA,OAAOD,KAAS;AAAA,UAEf,UAAAE;AAAA,QAAA;AAAA,MAAA;AAAA,MAIL,UAAA,gBAAAW,EAAC,QAAA,EAAK,OAAO,EAAE,SAAS,cAAA,GACtB,UAAA,gBAAAA,EAACG,GAAA,EAAc,OAAAlB,GAAc,QAAAC,GAAgB,MAAAW,EAAA,CAAY,EAAA,CAC3D;AAAA,IAAA;AAAA,EAAA;AAGN;"}
+{"version":3,"file":"index.js","sources":["../../../../src/components/Filter/FilterPopover/index.tsx"],"sourcesContent":["import { Popover } from 'antd';\nimport React, { useState } from 'react';\nimport FilterPanel from '../FilterPanel';\nimport FilterTrigger from '../FilterTrigger';\n\ninterface FilterPopoverProps {\n  /** 筛选项标签 */\n  label: string;\n  /** 是否有值（控制选中态样式） */\n  active?: boolean;\n  /** 面板宽度 */\n  width?: number;\n  /** 确定按钮文字 */\n  confirmText?: string;\n  /** 面板内容 */\n  children: React.ReactNode;\n  /** 受控打开状态（传入则由外部控制） */\n  open?: boolean;\n  /** 打开状态变更回调 */\n  onOpenChange?: (open: boolean) => void;\n  /** 确认回调（不传则无确定/取消按钮）；返回 `false` 时不关闭弹层 */\n  onConfirm?: () => void | boolean;\n  /** 取消回调 */\n  onReset?: () => void;\n}\n\nconst FilterPopover: React.FC<FilterPopoverProps> = ({\n  label,\n  active,\n  width,\n  confirmText = '确定',\n  children,\n  open: controlledOpen,\n  onOpenChange,\n  onConfirm,\n  onReset,\n}) => {\n  const [internalOpen, setInternalOpen] = useState(false);\n  const open = controlledOpen ?? internalOpen;\n\n  const setOpen = (value: boolean) => {\n    setInternalOpen(value);\n    onOpenChange?.(value);\n  };\n\n  const handleConfirm = () => {\n    const result = onConfirm?.();\n    if (result === false) return;\n    setOpen(false);\n  };\n\n  const handleReset = () => {\n    onReset?.();\n    setOpen(false);\n  };\n\n  return (\n    <Popover\n      open={open}\n      onOpenChange={setOpen}\n      trigger=\"click\"\n      placement=\"bottomLeft\"\n      destroyOnHidden\n      classNames={{ root: 'filter-popover-panel' }}\n      styles={{ content: { maxWidth: width || 300, padding: 0 } }}\n      getPopupContainer={() => document.body}\n      content={\n        <FilterPanel\n          onConfirm={onConfirm ? handleConfirm : undefined}\n          onReset={onReset ? handleReset : undefined}\n          confirmText={confirmText}\n          width={width || 300}\n        >\n          {children}\n        </FilterPanel>\n      }\n    >\n      <span style={{ display: 'inline-flex' }}>\n        <FilterTrigger label={label} active={active} open={open} />\n      </span>\n    </Popover>\n  );\n};\n\nexport default FilterPopover;\nexport type { FilterPopoverProps };\n"],"names":["FilterPopover","label","active","width","confirmText","children","controlledOpen","onOpenChange","onConfirm","onReset","internalOpen","setInternalOpen","useState","open","setOpen","value","jsx","Popover","FilterPanel","FilterTrigger"],"mappings":";;;;;AA0BA,MAAMA,IAA8C,CAAC;AAAA,EACnD,OAAAC;AAAA,EACA,QAAAC;AAAA,EACA,OAAAC;AAAA,EACA,aAAAC,IAAc;AAAA,EACd,UAAAC;AAAA,EACA,MAAMC;AAAA,EACN,cAAAC;AAAA,EACA,WAAAC;AAAA,EACA,SAAAC;AACF,MAAM;AACJ,QAAM,CAACC,GAAcC,CAAe,IAAIC,EAAS,EAAK,GAChDC,IAAOP,KAAkBI,GAEzBI,IAAU,CAACC,MAAmB;AAClC,IAAAJ,EAAgBI,CAAK,GACrBR,KAAA,QAAAA,EAAeQ;AAAA,EACjB;AAaA,SACE,gBAAAC;AAAA,IAACC;AAAA,IAAA;AAAA,MACC,MAAAJ;AAAA,MACA,cAAcC;AAAA,MACd,SAAQ;AAAA,MACR,WAAU;AAAA,MACV,iBAAe;AAAA,MACf,YAAY,EAAE,MAAM,uBAAA;AAAA,MACpB,QAAQ,EAAE,SAAS,EAAE,UAAUX,KAAS,KAAK,SAAS,IAAE;AAAA,MACxD,mBAAmB,MAAM,SAAS;AAAA,MAClC,SACE,gBAAAa;AAAA,QAACE;AAAA,QAAA;AAAA,UACC,WAAWV,IAvBG,MAAM;AAE1B,aADeA,KAAA,gBAAAA,SACA,MACfM,EAAQ,EAAK;AAAA,UACf,IAmB+C;AAAA,UACvC,SAASL,IAlBG,MAAM;AACxB,YAAAA,KAAA,QAAAA,KACAK,EAAQ,EAAK;AAAA,UACf,IAeyC;AAAA,UACjC,aAAAV;AAAA,UACA,OAAOD,KAAS;AAAA,UAEf,UAAAE;AAAA,QAAA;AAAA,MAAA;AAAA,MAIL,UAAA,gBAAAW,EAAC,QAAA,EAAK,OAAO,EAAE,SAAS,cAAA,GACtB,UAAA,gBAAAA,EAACG,GAAA,EAAc,OAAAlB,GAAc,QAAAC,GAAgB,MAAAW,EAAA,CAAY,EAAA,CAC3D;AAAA,IAAA;AAAA,EAAA;AAGN;"}

package/dist/components/Filter/FilterSelect/index.d.ts

@@ -1,9 +1,14 @@
 import { default as React } from 'react';
-import { BaseFilterProps, FilterOption } from '../types';
+import { BaseFilterProps, FilterLoadDataContext, FilterOption } from '../types';
 type FilterSelectValue = string | number | (string | number)[] | undefined;
 export type { FilterSelectValue };
 interface FilterSelectProps extends BaseFilterProps {
-    options: FilterOption[];
+    /** 静态选项；与 loadData 二选一（同时存在时以 options 为准） */
+    options?: FilterOption[];
+    /** 按依赖值动态拉取选项 */
+    loadData?: (ctx: FilterLoadDataContext) => Promise<FilterOption[]>;
+    /** loadData 是否启用；默认 true */
+    enabled?: boolean;
     value?: FilterSelectValue;
     onChange?: (value: FilterSelectValue) => void;
     /** 默认值：与默认值相同时视为未筛选（除非 showDefaultAsSelected） */
@@ -20,6 +25,13 @@ interface FilterSelectProps extends BaseFilterProps {
     minSelection?: number;
     /** 人员选项：展示部门与联系方式 */
     variant?: 'default' | 'person';
+    /**
+     * 面板内嵌从属条件（与 search 同层：search 下方、选项列表上方）。
+     * 禁止再嵌 Filter*（双重 Popover）。
+     */
+    panelExtra?: React.ReactNode;
+    /** 面板宽度；有 panelExtra 时默认 460 */
+    panelWidth?: number;
 }
 declare const FilterSelect: React.FC<FilterSelectProps>;
 export default FilterSelect;