bitz-react-admin-ui 2.10.6 → 2.10.7-beta.2

package/dist/components/BitzModal/index.mjs

@@ -1,8 +1,8 @@
 import { j as t } from "../../node_modules/react/jsx-runtime.mjs";
 import { useState as d } from "react";
 import { Modal as m } from "antd";
+import { CloseOutlined as p } from "@ant-design/icons";
 import "./index.less.mjs";
-import p from "../../node_modules/@ant-design/icons/es/icons/CloseOutlined.mjs";
 const j = ({ modalOpen: c = !1, modalEmit: o = () => {
 }, modalText: l, deleteId: n, deleteUrl: r }) => {
   const [i, s] = d(!1), a = (e) => {

package/dist/components/BitzOrganizationSelection/index.mjs

@@ -1,25 +1,24 @@
 import { j as e } from "../../node_modules/react/jsx-runtime.mjs";
-import { theme as y, Input as C, Tree as b, Space as N, Button as S, Tag as w } from "antd";
-import { useEffect as z } from "react";
-import { useImmer as T } from "../../node_modules/use-immer/dist/use-immer.module.mjs";
+import { CaretDownFilled as y, SettingFilled as C } from "@ant-design/icons";
+import { theme as b, Input as N, Tree as S, Space as w, Button as z, Tag as T } from "antd";
+import { useEffect as v } from "react";
+import { useImmer as E } from "../../node_modules/use-immer/dist/use-immer.module.mjs";
 import "./components/select.module.less.mjs";
 import "../../node_modules/react-device-detect/dist/lib.mjs";
 import "../BitzDrawer/index.less.mjs";
 import s from "./index.module.less.mjs";
-import v from "../../node_modules/@ant-design/icons/es/icons/CaretDownFilled.mjs";
-import E from "../../node_modules/@ant-design/icons/es/icons/SettingFilled.mjs";
-const { CheckableTag: I } = w, G = (p) => {
-  const { headerRender: o, tags: t, onTagChange: a, onSearch: c, treeTitle: h, defaultCheckedKeys: u, defaultExpandedKeys: d, treeData: f, onCheck: x } = p, { token: g } = y.useToken(), [l, i] = T({
+const { CheckableTag: I } = T, q = (p) => {
+  const { headerRender: o, tags: t, onTagChange: a, onSearch: c, treeTitle: h, defaultCheckedKeys: u, defaultExpandedKeys: d, treeData: f, onCheck: x } = p, { token: g } = b.useToken(), [l, i] = E({
     tags: []
   });
-  z(() => {
+  v(() => {
     t && i((r) => {
       r.tags = t;
     });
   }, [t == null ? void 0 : t.length]);
   function j() {
     return l.tags.length ? /* @__PURE__ */ e.jsxs("div", { className: s.header, children: [
-      /* @__PURE__ */ e.jsx(N, { size: [0, 8], wrap: !0, children: l.tags.map((r, m) => /* @__PURE__ */ e.jsx(
+      /* @__PURE__ */ e.jsx(w, { size: [0, 8], wrap: !0, children: l.tags.map((r, m) => /* @__PURE__ */ e.jsx(
         I,
         {
           checked: !!r.checked,
@@ -32,21 +31,21 @@ const { CheckableTag: I } = w, G = (p) => {
         },
         m
       )) }),
-      /* @__PURE__ */ e.jsx(S, { icon: /* @__PURE__ */ e.jsx(E, { style: { color: g.colorPrimary } }), type: "text", className: s["setting-btn"] })
+      /* @__PURE__ */ e.jsx(z, { icon: /* @__PURE__ */ e.jsx(C, { style: { color: g.colorPrimary } }), type: "text", className: s["setting-btn"] })
     ] }) : o == null ? void 0 : o();
   }
   return /* @__PURE__ */ e.jsxs("div", { className: s.container, children: [
     j(),
-    c && /* @__PURE__ */ e.jsx(C, { className: s.search, placeholder: "组织名称查询", onChange: c }),
+    c && /* @__PURE__ */ e.jsx(N, { className: s.search, placeholder: "组织名称查询", onChange: c }),
     h,
     /* @__PURE__ */ e.jsx(
-      b,
+      S,
       {
         checkable: !0,
         showLine: !0,
         blockNode: !0,
         selectable: !1,
-        switcherIcon: /* @__PURE__ */ e.jsx(v, { style: { verticalAlign: "top", fontSize: 24, color: "#86909C" } }),
+        switcherIcon: /* @__PURE__ */ e.jsx(y, { style: { verticalAlign: "top", fontSize: 24, color: "#86909C" } }),
         defaultCheckedKeys: u,
         defaultExpandedKeys: d,
         treeData: f,
@@ -56,5 +55,5 @@ const { CheckableTag: I } = w, G = (p) => {
   ] });
 };
 export {
-  G as default
+  q as default
 };

package/dist/components/BitzPageHeader/index.mjs

@@ -1,12 +1,11 @@
 import { j as s } from "../../node_modules/react/jsx-runtime.mjs";
 import { useState as B } from "react";
-import p from "../../node_modules/classnames/index.mjs";
+import N from "../../node_modules/classnames/index.mjs";
 import { createNamespace as C } from "../../utils/create.mjs";
 import { Avatar as R, Space as w, Breadcrumb as y } from "antd";
-import A from "../../node_modules/rc-resize-observer/es/index.mjs";
+import { ArrowRightOutlined as A, ArrowLeftOutlined as F } from "@ant-design/icons";
+import O from "../../node_modules/rc-resize-observer/es/index.mjs";
 import "./index.less.mjs";
-import F from "../../node_modules/@ant-design/icons/es/icons/ArrowRightOutlined.mjs";
-import O from "../../node_modules/@ant-design/icons/es/icons/ArrowLeftOutlined.mjs";
 const P = (e, t, i, n) => !i || !n ? null : /* @__PURE__ */ s.jsx("div", { className: `${e}-back ${t}`.trim(), children: /* @__PURE__ */ s.jsx(
   "div",
   {
@@ -24,10 +23,10 @@ const P = (e, t, i, n) => !i || !n ? null : /* @__PURE__ */ s.jsx("div", { class
     y,
     {
       ...e,
-      className: p(`${t}-breadcrumb`, e.className)
+      className: N(`${t}-breadcrumb`, e.className)
     }
   ) : null;
-}, H = (e, t = "ltr") => e.backIcon !== void 0 ? e.backIcon : t === "rtl" ? /* @__PURE__ */ s.jsx(F, {}) : /* @__PURE__ */ s.jsx(O, {}), S = (e, t, i = "ltr", n) => {
+}, H = (e, t = "ltr") => e.backIcon !== void 0 ? e.backIcon : t === "rtl" ? /* @__PURE__ */ s.jsx(A, {}) : /* @__PURE__ */ s.jsx(F, {}), S = (e, t, i = "ltr", n) => {
   const {
     title: o,
     avatar: l,
@@ -45,7 +44,7 @@ const P = (e, t, i, n) => !i || !n ? null : /* @__PURE__ */ s.jsx("div", { class
       l && /* @__PURE__ */ s.jsx(
         R,
         {
-          className: p(
+          className: N(
             `${c}-avatar`,
             n,
             l.className
@@ -73,7 +72,7 @@ const P = (e, t, i, n) => !i || !n ? null : /* @__PURE__ */ s.jsx("div", { class
     ] }),
     d && /* @__PURE__ */ s.jsx("span", { className: `${c}-extra ${n}`.trim(), children: /* @__PURE__ */ s.jsx(w, { children: d }) })
   ] });
-}, E = (e, t, i) => /* @__PURE__ */ s.jsx("div", { className: `${e}-content ${i}`.trim(), children: t }), L = (e, t, i) => t ? /* @__PURE__ */ s.jsx("div", { className: `${e}-footer ${i}`.trim(), children: t }) : null, X = (e) => {
+}, E = (e, t, i) => /* @__PURE__ */ s.jsx("div", { className: `${e}-content ${i}`.trim(), children: t }), L = (e, t, i) => t ? /* @__PURE__ */ s.jsx("div", { className: `${e}-footer ${i}`.trim(), children: t }) : null, V = (e) => {
   const [t, i] = C("bitz-page-header"), n = "ltr", o = "id_123123", [l, a] = B(!1), m = ({ width: z }) => a(z < 768), {
     style: d,
     footer: f,
@@ -82,7 +81,7 @@ const P = (e, t, i, n) => !i || !n ? null : /* @__PURE__ */ s.jsx("div", { class
     breadcrumbRender: u,
     className: $,
     contentWidth: x
-  } = e, N = (() => (r && !(r != null && r.items) && (r != null && r.routes) && (r.items = r.routes), r != null && r.items ? T(r, t) : null))(), h = r && "props" in r, D = (u == null ? void 0 : u({ ...e, prefixCls: t }, N)) ?? N, j = h ? r : D, k = p(t, o, $, {
+  } = e, p = (() => (r && !(r != null && r.items) && (r != null && r.routes) && (r.items = r.routes), r != null && r.items ? T(r, t) : null))(), h = r && "props" in r, D = (u == null ? void 0 : u({ ...e, prefixCls: t }, p)) ?? p, j = h ? r : D, k = N(t, o, $, {
     [`${t}-has-breadcrumb`]: !!j,
     [`${t}-has-footer`]: !!f,
     // [`${prefixCls}-rtl`]: direction === 'rtl',
@@ -90,7 +89,7 @@ const P = (e, t, i, n) => !i || !n ? null : /* @__PURE__ */ s.jsx("div", { class
     [`${t}-wide`]: x === "Fixed",
     [`${t}-ghost`]: !0
   }), g = S(t, e, n, o), v = c && E(t, c, o), b = L(t, f, o);
-  return !j && !g && !b && !v ? null : /* @__PURE__ */ s.jsx(A, { onResize: m, children: /* @__PURE__ */ s.jsxs("div", { className: k, style: d, children: [
+  return !j && !g && !b && !v ? null : /* @__PURE__ */ s.jsx(O, { onResize: m, children: /* @__PURE__ */ s.jsxs("div", { className: k, style: d, children: [
     j,
     g,
     v,
@@ -98,5 +97,5 @@ const P = (e, t, i, n) => !i || !n ? null : /* @__PURE__ */ s.jsx("div", { class
   ] }) });
 };
 export {
-  X as default
+  V as default
 };

package/dist/components/BitzQueryFilter/index.mjs

@@ -3,9 +3,9 @@ import { useMemo as d } from "react";
 import A from "../../node_modules/rc-resize-observer/es/index.mjs";
 import { Form as x, Row as M, Col as j } from "antd";
 import O from "./QueryFilterContent.mjs";
-import P from "../../hooks/useMergedState.mjs";
-import B from "./QueryFilterMobile.mjs";
-import E from "../../node_modules/lodash-es/isArray.mjs";
+import { isArray as P } from "lodash-es";
+import B from "../../hooks/useMergedState.mjs";
+import E from "./QueryFilterMobile.mjs";
 const Q = {
   xs: 513,
   sm: 513,
@@ -62,7 +62,7 @@ const K = (g = document == null ? void 0 : document.body) == null ? void 0 : g.c
     preserve: c = !0,
     onReset: f,
     onFinish: b
-  } = n, [a] = x.useForm(), [p, N] = P(() => typeof (o == null ? void 0 : o.width) == "number" ? o == null ? void 0 : o.width : K), i = d(() => G(v, p + 16, C), [v, p, C]), S = d(() => u !== void 0 ? u - 1 : Math.max(1, 24 / i.span - 1), [u, i.span]), W = d(() => {
+  } = n, [a] = x.useForm(), [p, N] = B(() => typeof (o == null ? void 0 : o.width) == "number" ? o == null ? void 0 : o.width : K), i = d(() => G(v, p + 16, C), [v, p, C]), S = d(() => u !== void 0 ? u - 1 : Math.max(1, 24 / i.span - 1), [u, i.span]), W = d(() => {
     if (l && i.layout !== "vertical" && l !== "auto")
       return {
         labelCol: {
@@ -77,7 +77,7 @@ const K = (g = document == null ? void 0 : document.body) == null ? void 0 : g.c
           flexWrap: "nowrap"
         }
       };
-  }, [i.layout, l]), w = d(() => E(t) ? t : [t], [t]);
+  }, [i.layout, l]), w = d(() => P(t) ? t : [t], [t]);
   return /* @__PURE__ */ e.jsx(
     A,
     {
@@ -105,7 +105,7 @@ const K = (g = document == null ? void 0 : document.body) == null ? void 0 : g.c
             onReset: f
           }
         ) }) }),
-        /* @__PURE__ */ e.jsx(j, { md: 0, sm: 24, xs: 24, children: /* @__PURE__ */ e.jsx(x, { onReset: f, preserve: c, form: a, layout: "vertical", children: /* @__PURE__ */ e.jsx(B, { onFinish: b, form: a, items: w, onReset: f }) }) })
+        /* @__PURE__ */ e.jsx(j, { md: 0, sm: 24, xs: 24, children: /* @__PURE__ */ e.jsx(x, { onReset: f, preserve: c, form: a, layout: "vertical", children: /* @__PURE__ */ e.jsx(E, { onFinish: b, form: a, items: w, onReset: f }) }) })
       ] })
     },
     "resize-observer"

package/dist/components/BitzSelect/component/BitzSelectMobile.mjs

@@ -2,11 +2,11 @@ import { j as a } from "../../../node_modules/react/jsx-runtime.mjs";
 import { useState as w, useRef as P, useEffect as D } from "react";
 import { BitzPickDrawer as U } from "../../BitzDrawer/index.mjs";
 import { Tag as z, Input as W, Space as q } from "antd";
+import { DownOutlined as T } from "@ant-design/icons";
 import $ from "../../../node_modules/@better-scroll/core/dist/core.esm.mjs";
 import A from "../../../node_modules/@better-scroll/wheel/dist/wheel.esm.mjs";
 import n from "./index.module.less.mjs";
-import { useImmer as T } from "../../../node_modules/use-immer/dist/use-immer.module.mjs";
-import y from "../../../node_modules/@ant-design/icons/es/icons/DownOutlined.mjs";
+import { useImmer as y } from "../../../node_modules/use-immer/dist/use-immer.module.mjs";
 $.use(A);
 const { Search: G } = W, te = ({ ...e }) => {
   var C, g, k;
@@ -23,10 +23,10 @@ const { Search: G } = W, te = ({ ...e }) => {
   const i = b, B = (l, t) => ((t == null ? void 0 : t.label) ?? "").toLowerCase().includes(l.toLowerCase()), m = e.value ?? e.defaultValue, S = e.filterOption || B, [N, E] = w(() => {
     const l = i == null ? void 0 : i.findIndex((t) => t.value === m);
     return l === -1 ? 0 : l;
-  }), [d, h] = T(() => {
+  }), [d, h] = y(() => {
     var l;
     return u ? m : ((l = i == null ? void 0 : i.find((t) => t.value === m)) == null ? void 0 : l.value) || "";
-  }), I = P(null), [j, x] = w(!1), [L, O] = w(""), [f, v] = T([]), V = () => {
+  }), I = P(null), [j, x] = w(!1), [L, O] = w(""), [f, v] = y([]), V = () => {
     x(!1);
   }, M = () => {
     const l = e.onChange;
@@ -89,14 +89,14 @@ const { Search: G } = W, te = ({ ...e }) => {
           t
         );
       }) }),
-      /* @__PURE__ */ a.jsx(y, { style: { color: "#d9d9d9" } })
+      /* @__PURE__ */ a.jsx(T, { style: { color: "#d9d9d9" } })
     ] }) : /* @__PURE__ */ a.jsx(
       W,
       {
         placeholder: e.placeholder,
         onClick: () => x(!0),
         value: d,
-        suffix: /* @__PURE__ */ a.jsx(y, { style: { color: "#d9d9d9" } })
+        suffix: /* @__PURE__ */ a.jsx(T, { style: { color: "#d9d9d9" } })
       }
     );
   }

package/dist/components/BitzTable/ActionBar/ActionBar.mjs

@@ -1,21 +1,20 @@
 import { j as s } from "../../../node_modules/react/jsx-runtime.mjs";
-import { useMemo as f } from "react";
+import { useMemo as N } from "react";
+import { PlusCircleFilled as c, CaretDownOutlined as f } from "@ant-design/icons";
 import { Space as l } from "antd";
 import i from "../../BitzButton/index.mjs";
 import k from "./style.mjs";
-import N from "../Dropdown/index.mjs";
+import g from "../Dropdown/index.mjs";
+import { omit as a } from "lodash-es";
 import h from "../../../node_modules/classnames/index.mjs";
-import c from "../../../node_modules/@ant-design/icons/es/icons/PlusCircleFilled.mjs";
-import o from "../../../node_modules/lodash-es/omit.mjs";
-import g from "../../../node_modules/@ant-design/icons/es/icons/CaretDownOutlined.mjs";
-const O = ({
+const G = ({
   size: C,
   add: n,
   excel: r,
   actions: m,
   children: E
 }) => {
-  const { blockCls: x, addBtnClassName: y, btnClassName: p } = k(C), w = f(() => [
+  const { blockCls: x, addBtnClassName: y, btnClassName: p } = k(C), w = N(() => [
     {
       key: "download",
       label: "Excel模板下载"
@@ -31,13 +30,13 @@ const O = ({
       // ),
     },
     ...(r == null ? void 0 : r.otherMenu) ?? []
-  ], [r]), d = f(() => m == null ? void 0 : m.map((t, e) => t.type === "primary" ? /* @__PURE__ */ s.jsx(
+  ], [r]), d = N(() => m == null ? void 0 : m.map((t, e) => t.type === "primary" ? /* @__PURE__ */ s.jsx(
     i,
     {
       type: "primary",
       icon: /* @__PURE__ */ s.jsx(c, {}),
       className: h(y, t.className),
-      ...o(t, "text", "type", "className", "children"),
+      ...a(t, "text", "type", "className", "children"),
       children: t == null ? void 0 : t.text
     },
     e
@@ -46,18 +45,18 @@ const O = ({
     {
       type: "text",
       className: h(p, t.className),
-      ...o(t, "text", "type", "className", "children"),
+      ...a(t, "text", "type", "className", "children"),
       children: t == null ? void 0 : t.text
     },
     e
   ) : /* @__PURE__ */ s.jsx(
-    N,
+    g,
     {
-      getPopupContainer: (a) => {
+      getPopupContainer: (o) => {
         var j, u;
-        return (u = (j = a.parentElement) == null ? void 0 : j.parentElement) == null ? void 0 : u.parentElement;
+        return (u = (j = o.parentElement) == null ? void 0 : j.parentElement) == null ? void 0 : u.parentElement;
       },
-      ...o(t, "text", "className", "children"),
+      ...a(t, "text", "className", "children"),
       children: /* @__PURE__ */ s.jsx(
         i,
         {
@@ -65,7 +64,7 @@ const O = ({
           type: "text",
           children: /* @__PURE__ */ s.jsxs(l, { size: 6, children: [
             !t.text || typeof t.text == "string" ? /* @__PURE__ */ s.jsx("span", { children: t.text }) : t.text,
-            /* @__PURE__ */ s.jsx(g, {})
+            /* @__PURE__ */ s.jsx(f, {})
           ] })
         }
       )
@@ -79,13 +78,13 @@ const O = ({
         type: "primary",
         icon: /* @__PURE__ */ s.jsx(c, {}),
         className: y,
-        ...o(n, "text", "show", "type", "className", "children"),
+        ...a(n, "text", "show", "type", "className", "children"),
         children: n == null ? void 0 : n.text
       }
     ),
     m ? d : E,
     (r == null ? void 0 : r.show) !== !1 && /* @__PURE__ */ s.jsx(
-      N,
+      g,
       {
         menu: { items: w, onClick: ({ key: t }) => {
           var e;
@@ -93,18 +92,18 @@ const O = ({
         } },
         trigger: (r == null ? void 0 : r.trigger) || ["click"],
         getPopupContainer: (t) => {
-          var e, a;
-          return (a = (e = t.parentElement) == null ? void 0 : e.parentElement) == null ? void 0 : a.parentElement;
+          var e, o;
+          return (o = (e = t.parentElement) == null ? void 0 : e.parentElement) == null ? void 0 : o.parentElement;
         },
-        ...o(r, "text", "show", "menu", "trigger", "children"),
+        ...a(r, "text", "show", "menu", "trigger", "children"),
         children: /* @__PURE__ */ s.jsx(i, { className: p, type: "text", children: /* @__PURE__ */ s.jsxs(l, { size: 6, children: [
           /* @__PURE__ */ s.jsx("span", { children: (r == null ? void 0 : r.text) ?? "Excel文档导入" }),
-          /* @__PURE__ */ s.jsx(g, {})
+          /* @__PURE__ */ s.jsx(f, {})
         ] }) })
       }
     )
   ] });
 };
 export {
-  O as default
+  G as default
 };

package/dist/components/BitzTable/ActionBar/Button.mjs

@@ -1,23 +1,23 @@
 import { j as e } from "../../../node_modules/react/jsx-runtime.mjs";
 import p from "../../BitzButton/index.mjs";
-import c from "../../../node_modules/classnames/index.mjs";
+import { PlusCircleFilled as c } from "@ant-design/icons";
+import x from "../../../node_modules/classnames/index.mjs";
 import { useMemo as s } from "react";
-import x from "./style.mjs";
-import B from "../../../node_modules/@ant-design/icons/es/icons/PlusCircleFilled.mjs";
+import B from "./style.mjs";
 const z = ({
   className: o,
   icon: n,
   type: r,
   ...i
 }) => {
-  const { addBtnClassName: m, btnClassName: a } = x(), u = s(() => {
+  const { addBtnClassName: m, btnClassName: a } = B(), u = s(() => {
     if (n)
       return n;
     if (r === "primary")
-      return /* @__PURE__ */ e.jsx(B, {});
+      return /* @__PURE__ */ e.jsx(c, {});
   }, [n, r]), l = s(() => {
     let t = a;
-    return r === "primary" && (t = m), c(t, o);
+    return r === "primary" && (t = m), x(t, o);
   }, [r, o]), f = s(() => {
     let t = "text";
     return r === "primary" && (t = "primary"), t;

package/dist/components/BitzTable/SelectionBar/Button.mjs

@@ -1,10 +1,10 @@
 import { j as s } from "../../../node_modules/react/jsx-runtime.mjs";
 import n from "../../BitzButton/index.mjs";
-import { Dropdown as p, Space as l } from "antd";
-import { useMemo as m } from "react";
+import { CaretDownOutlined as p } from "@ant-design/icons";
+import { Dropdown as l, Space as m } from "antd";
+import { useMemo as d } from "react";
 import c from "./style.mjs";
-import d from "../Dropdown/style.mjs";
-import x from "../../../node_modules/@ant-design/icons/es/icons/CaretDownOutlined.mjs";
+import x from "../Dropdown/style.mjs";
 const a = (t, o) => t == null ? void 0 : t.map((e) => {
   const r = { ...e };
   return r != null && r.children && (r.children = a(r == null ? void 0 : r.children, o), r.popupClassName = o), r;
@@ -14,16 +14,16 @@ const a = (t, o) => t == null ? void 0 : t.map((e) => {
   const { btnClassName: o } = c();
   return /* @__PURE__ */ s.jsx(n, { className: o, type: "text", ...t });
 }, S = ({ menu: t, children: o }) => {
-  const { btnClassName: e } = c(), { popupClassName: r } = d(), i = m(() => a(t == null ? void 0 : t.items, r), [t == null ? void 0 : t.items]);
+  const { btnClassName: e } = c(), { popupClassName: r } = x(), i = d(() => a(t == null ? void 0 : t.items, r), [t == null ? void 0 : t.items]);
   return /* @__PURE__ */ s.jsx(
-    p,
+    l,
     {
       menu: { ...t, items: i },
       overlayClassName: r,
       trigger: ["click"],
-      children: /* @__PURE__ */ s.jsx(n, { className: e, type: "text", children: /* @__PURE__ */ s.jsxs(l, { size: 2, children: [
+      children: /* @__PURE__ */ s.jsx(n, { className: e, type: "text", children: /* @__PURE__ */ s.jsxs(m, { size: 2, children: [
         /* @__PURE__ */ s.jsx("span", { children: o }),
-        /* @__PURE__ */ s.jsx(x, {})
+        /* @__PURE__ */ s.jsx(p, {})
       ] }) })
     }
   );

package/dist/components/BitzTable/Store/index.mjs

@@ -1,11 +1,11 @@
 import { j as je } from "../../../node_modules/react/jsx-runtime.mjs";
 import { Table as fe } from "antd";
 import v from "../../../hooks/useMergedState.mjs";
-import { createContext as ke, useRef as Re, useState as w, useContext as Le, useMemo as y, useEffect as S, useCallback as N } from "react";
+import { merge as y } from "lodash-es";
+import { createContext as ke, useRef as Re, useState as w, useContext as Le, useMemo as S, useEffect as g, useCallback as N } from "react";
 import { flattenColumns as Ue, genColumnKey as B } from "./utils/index.mjs";
 import { getUuid as Ae } from "../../../utils/uuid.mjs";
 import { BitzConfigContext as De } from "../../BitzConfigProvider/context.mjs";
-import g from "../../../node_modules/lodash-es/merge.mjs";
 const Ze = {
   fixed: "left",
   className: "sorterCol",
@@ -23,9 +23,9 @@ const Ze = {
 ], ue = 5;
 function Fe(e) {
   var j, k, R, L, U, A, D, Z, _, F, W, X, q, Q, Y, $, G, p, ee, te, ne, ie, ae, oe, ce, le, re;
-  const T = Re(Ae()), [de, ye] = w(!1), [Se, ge] = w(!1), [Ce, me] = w(0), r = Le(De).Table, E = e.defaultSize ?? (r == null ? void 0 : r.defaultSize) ?? "lg", we = e.defaultZebra ?? (r == null ? void 0 : r.zebra) ?? !0, he = e.defaultBordered ?? (r == null ? void 0 : r.bordered) ?? "row-column", xe = e.defaultPageSize ?? (r == null ? void 0 : r.pageSize) ?? 10, Te = e.defaultOrderBy ?? (r == null ? void 0 : r.orderBy) ?? "desc", V = y(() => {
+  const T = Re(Ae()), [de, ye] = w(!1), [Se, ge] = w(!1), [Ce, me] = w(0), r = Le(De).Table, E = e.defaultSize ?? (r == null ? void 0 : r.defaultSize) ?? "lg", we = e.defaultZebra ?? (r == null ? void 0 : r.zebra) ?? !0, he = e.defaultBordered ?? (r == null ? void 0 : r.bordered) ?? "row-column", xe = e.defaultPageSize ?? (r == null ? void 0 : r.pageSize) ?? 10, Te = e.defaultOrderBy ?? (r == null ? void 0 : r.orderBy) ?? "desc", V = S(() => {
     var t;
-    return g(
+    return y(
       {
         size: E,
         zebra: we,
@@ -56,7 +56,7 @@ function Fe(e) {
         try {
           const l = i == null ? void 0 : i.getItem(c);
           if (l)
-            return (n = e == null ? void 0 : e.stylesConfigState) != null && n.defaultValue ? g(
+            return (n = e == null ? void 0 : e.stylesConfigState) != null && n.defaultValue ? y(
               JSON.parse(l),
               (o = e == null ? void 0 : e.stylesConfigState) == null ? void 0 : o.defaultValue
             ) : JSON.parse(l);
@@ -71,7 +71,7 @@ function Fe(e) {
       onChange: ((R = e.stylesConfigState) == null ? void 0 : R.onChange) || e.onStylesConfigChange
     }
   );
-  S(() => {
+  g(() => {
     var n, o;
     if (!((n = e.stylesConfigState) != null && n.persistenceKey) || !((o = e.stylesConfigState) != null && o.persistenceType) || typeof window > "u")
       return;
@@ -92,25 +92,27 @@ function Fe(e) {
     (L = e.stylesConfigState) == null ? void 0 : L.persistenceKey,
     C,
     (U = e.stylesConfigState) == null ? void 0 : U.persistenceType
-  ]), S(() => {
+  ]), g(() => {
     var t, c, n;
     if ((t = e.stylesConfigState) != null && t.persistenceKey && ((c = e.stylesConfigState) == null ? void 0 : c.persistenceType) === "online") {
       const { onlineGet: o, persistenceKey: a } = e.stylesConfigState;
       try {
         (n = o == null ? void 0 : o(a)) == null || n.then((i) => {
           const { config: l, global: s } = i ?? {};
-          I(
-            { ...V, ...s, ...l }
-          );
+          I({
+            ...V,
+            ...s,
+            ...l
+          });
         });
       } catch (i) {
         console.warn(i);
       }
     }
   }, []);
-  const f = y(() => (e.columns ?? []).filter(
+  const f = S(() => (e.columns ?? []).filter(
     (t) => !_e.includes(t) && t.title
-  ), [e.columns]), h = y(() => {
+  ), [e.columns]), h = S(() => {
     var o;
     const t = {
       fields: [],
@@ -135,7 +137,7 @@ function Fe(e) {
         });
       }), t.fields = a;
     }
-    return (o = e == null ? void 0 : e.exportConfigState) != null && o.defaultValue ? g(t, e.exportConfigState.defaultValue) : t;
+    return (o = e == null ? void 0 : e.exportConfigState) != null && o.defaultValue ? y(t, e.exportConfigState.defaultValue) : t;
   }, [f]), [z, x] = v(
     () => {
       var n, o, a;
@@ -145,7 +147,7 @@ function Fe(e) {
         try {
           const l = i == null ? void 0 : i.getItem(c);
           if (l)
-            return (n = e == null ? void 0 : e.exportConfigState) != null && n.defaultValue ? g(
+            return (n = e == null ? void 0 : e.exportConfigState) != null && n.defaultValue ? y(
               JSON.parse(l),
               (o = e == null ? void 0 : e.exportConfigState) == null ? void 0 : o.defaultValue
             ) : JSON.parse(l);
@@ -160,7 +162,7 @@ function Fe(e) {
       onChange: ((D = e.exportConfigState) == null ? void 0 : D.onChange) || e.onExportConfigChange
     }
   );
-  S(() => {
+  g(() => {
     var n, o;
     const { persistenceType: t, persistenceKey: c } = e.exportConfigState || {};
     if (c && t && typeof window < "u" && t !== "online") {
@@ -168,7 +170,7 @@ function Fe(e) {
       try {
         const i = a == null ? void 0 : a.getItem(c);
         i ? (n = e == null ? void 0 : e.exportConfigState) != null && n.defaultValue ? x(
-          g(
+          y(
             JSON.parse(i),
             (o = e == null ? void 0 : e.exportConfigState) == null ? void 0 : o.defaultValue
           )
@@ -181,7 +183,7 @@ function Fe(e) {
     (Z = e.exportConfigState) == null ? void 0 : Z.persistenceKey,
     (_ = e.exportConfigState) == null ? void 0 : _.persistenceType,
     h
-  ]), S(() => {
+  ]), g(() => {
     var n, o;
     if (!((n = e.exportConfigState) != null && n.persistenceKey) || !((o = e.exportConfigState) != null && o.persistenceType) || typeof window > "u")
       return;
@@ -202,14 +204,14 @@ function Fe(e) {
     (F = e.exportConfigState) == null ? void 0 : F.persistenceKey,
     z,
     (W = e.exportConfigState) == null ? void 0 : W.persistenceType
-  ]), S(() => {
+  ]), g(() => {
     var t, c, n;
     if ((t = e.exportConfigState) != null && t.persistenceKey && ((c = e.exportConfigState) == null ? void 0 : c.persistenceType) === "online") {
       const { onlineGet: o, persistenceKey: a } = e.exportConfigState;
       try {
         (n = o == null ? void 0 : o(a)) == null || n.then((i) => {
           var s;
-          const l = g(i ?? {}, (s = e == null ? void 0 : e.exportConfigState) == null ? void 0 : s.value);
+          const l = y(i ?? {}, (s = e == null ? void 0 : e.exportConfigState) == null ? void 0 : s.value);
           x(
             Object.keys(l).length ? l : h
           );
@@ -219,7 +221,7 @@ function Fe(e) {
       }
     }
   }, []);
-  const u = y(() => {
+  const u = S(() => {
     var i;
     if ((i = e == null ? void 0 : e.columnsState) != null && i.defaultValue)
       return e.columnsState.defaultValue;
@@ -242,7 +244,7 @@ function Fe(e) {
         try {
           const s = l == null ? void 0 : l.getItem(c);
           if (s)
-            return (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? g(
+            return (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? y(
               JSON.parse(s),
               (o = e == null ? void 0 : e.columnsState) == null ? void 0 : o.defaultValue
             ) : JSON.parse(s);
@@ -257,7 +259,7 @@ function Fe(e) {
       onChange: ((q = e.columnsState) == null ? void 0 : q.onChange) || e.onColumnsStateChange
     }
   );
-  S(() => {
+  g(() => {
     var n, o;
     const { persistenceType: t, persistenceKey: c } = e.columnsState || {};
     if (c && t && typeof window < "u" && t !== "online") {
@@ -265,7 +267,7 @@ function Fe(e) {
       try {
         const i = a == null ? void 0 : a.getItem(c);
         i ? (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? m(
-          g(
+          y(
             JSON.parse(i),
             (o = e == null ? void 0 : e.columnsState) == null ? void 0 : o.defaultValue
           )
@@ -310,7 +312,7 @@ function Fe(e) {
       console.warn(o);
     }
   }, [e.exportConfigState]);
-  S(() => {
+  g(() => {
     var n, o;
     if (!((n = e.columnsState) != null && n.persistenceKey) || !((o = e.columnsState) != null && o.persistenceType) || typeof window > "u")
       return;
@@ -331,21 +333,21 @@ function Fe(e) {
     ($ = e.columnsState) == null ? void 0 : $.persistenceKey,
     d,
     (G = e.columnsState) == null ? void 0 : G.persistenceType
-  ]), S(() => {
+  ]), g(() => {
     var t, c, n;
     if ((t = e.columnsState) != null && t.persistenceKey && ((c = e.columnsState) == null ? void 0 : c.persistenceType) === "online") {
       const { onlineGet: o, persistenceKey: a } = e.columnsState;
       try {
         (n = o == null ? void 0 : o(a)) == null || n.then((i) => {
           var s;
-          const l = g(i ?? {}, (s = e == null ? void 0 : e.columnsState) == null ? void 0 : s.value);
+          const l = y(i ?? {}, (s = e == null ? void 0 : e.columnsState) == null ? void 0 : s.value);
           m(l), Oe(!0);
         });
       } catch (i) {
         console.warn(i);
       }
     }
-  }, []), S(() => {
+  }, []), g(() => {
     var n, o;
     const t = f.findIndex((a) => a == null ? void 0 : a.isOperationCol), c = Object.keys(d ?? {}).length === 0;
     if (t >= 0) {
@@ -354,7 +356,7 @@ function Fe(e) {
     } else
       c && m(u);
   }, [u, d]);
-  const Ve = y(() => (e == null ? void 0 : e.rowHoverable) ?? (r == null ? void 0 : r.rowHoverable) ?? !0, [e == null ? void 0 : e.rowHoverable, r == null ? void 0 : r.rowHoverable]), ze = y(() => e.zebra ?? C.zebra, [e.zebra, C.zebra]), K = y(() => e.bordered ?? C.bordered, [e.bordered, C.bordered]), be = y(() => ["column", "row-column"].includes(K), [K]), ve = y(() => {
+  const Ve = S(() => (e == null ? void 0 : e.rowHoverable) ?? (r == null ? void 0 : r.rowHoverable) ?? !0, [e == null ? void 0 : e.rowHoverable, r == null ? void 0 : r.rowHoverable]), ze = S(() => e.zebra ?? C.zebra, [e.zebra, C.zebra]), K = S(() => e.bordered ?? C.bordered, [e.bordered, C.bordered]), be = S(() => ["column", "row-column"].includes(K), [K]), ve = S(() => {
     let t = !1;
     return ["hide", "column"].includes(K) && (t = !0), t;
   }, [K]), [Ne, b] = w(!1), [Be, O] = w(ue), Ee = () => {