bitz-react-admin-ui 2.11.0-beta.1 → 2.11.0-beta.2

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

@@ -1,8 +1,8 @@
 import { j as n } from "../../../node_modules/react/jsx-runtime.mjs";
 import M from "../../../node_modules/ahooks/es/useSize/index.mjs";
-import { Space as I, Skeleton as D, theme as F } from "antd";
-import { forwardRef as G, useContext as H, useMemo as w, useState as O, Fragment as W, useRef as P } from "react";
-import C from "../../BitzButton/index.mjs";
+import { Space as T, Skeleton as D, theme as F } from "antd";
+import { forwardRef as G, useContext as H, useMemo as w, useState as O, Fragment as W, useRef as I } from "react";
+import j from "../../BitzButton/index.mjs";
 import _, { actionColBtnGap as $ } from "./style.mjs";
 import "../index.mjs";
 import R from "../Dropdown/index.mjs";
@@ -11,7 +11,7 @@ import { BitzTableContext as J } from "../Store/index.mjs";
 const b = ({
   skeletonCls: x,
   ...r
-}) => /* @__PURE__ */ n.jsxs(C, { type: "text", ...r, children: [
+}) => /* @__PURE__ */ n.jsxs(j, { type: "text", ...r, children: [
   /* @__PURE__ */ n.jsx("span", { children: r.children }),
   /* @__PURE__ */ n.jsx(D, { active: !0, title: !1, className: x, paragraph: {
     rows: 1,
@@ -24,57 +24,57 @@ const b = ({
   actionGroup: d,
   customActions: o,
   width: B
-}, f) => {
+}, u) => {
   const {
     loading: g,
     fullscreen: z
   } = H(J), a = w(() => x ?? g, [x, g]), {
-    primaryBtnClassName: s,
+    primaryBtnClassName: l,
     dangerBtnClassName: h,
     secondaryBtnClassName: k,
-    maskClassName: T,
+    maskClassName: P,
     skeletonBtnClassName: m,
-    skeletonClassName: j
-  } = _(), [N] = O([/* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: j, children: "占位" }, 1), /* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: j, children: "占位" }, 2)]), y = w(() => {
+    skeletonClassName: C
+  } = _(), [N] = O([/* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: C, children: "占位" }, 1), /* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: C, children: "占位" }, 2)]), y = w(() => {
     if (a && p)
       return N;
-    const i = r - 1 > 0 ? r - 1 : 2, u = d.length > r ? i : d.length, e = d.slice(0, u), l = [];
+    const i = r - 1 > 0 ? r - 1 : 2, f = d.length > r ? i : d.length, e = d.slice(0, f), s = [];
     if (e != null && e.length && e.forEach((t, c) => {
-      l.push(a ? /* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: j, children: t == null ? void 0 : t.label }, c) : t.children ? /* @__PURE__ */ n.jsx(R, { menu: {
+      s.push(a ? /* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: C, children: t == null ? void 0 : t.label }, c) : t.children ? /* @__PURE__ */ n.jsx(R, { menu: {
         items: t.children
-      }, children: /* @__PURE__ */ n.jsx(C, { type: "text", className: t.danger ? h : s, children: t == null ? void 0 : t.label }) }, c) : /* @__PURE__ */ n.jsx(C, { type: "text", className: t.danger ? h : s, onClick: t == null ? void 0 : t.onClick, children: t == null ? void 0 : t.label }, c));
-    }), u === i && d.length > r) {
+      }, children: /* @__PURE__ */ n.jsx(j, { type: "text", className: t.danger ? h : l, children: t == null ? void 0 : t.label }) }, c) : /* @__PURE__ */ n.jsx(j, { type: "text", className: t.danger ? h : l, onClick: t == null ? void 0 : t.onClick, children: t == null ? void 0 : t.label }, c));
+    }), f === i && d.length > r) {
       const t = d.slice(i, d.length);
-      l.push(a ? /* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: j, children: "更多" }, -1) : /* @__PURE__ */ n.jsx(R, { menu: {
+      s.push(a ? /* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: C, children: "更多" }, -1) : /* @__PURE__ */ n.jsx(R, { menu: {
         items: t
-      }, children: /* @__PURE__ */ n.jsx(C, { type: "text", className: k, children: "更多" }) }, -1));
+      }, getPopupContainer: () => document.fullscreenElement ?? document.body, children: /* @__PURE__ */ n.jsx(j, { type: "text", className: k, children: "更多" }) }, -1));
     }
-    return l;
+    return s;
   }, [a, r, p, d]), S = w(() => {
     if (!(o != null && o.length))
       return;
     if (a && p)
       return N;
-    const i = o.map((e, l) => /* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: j, children: e == null ? void 0 : e.label }, l)), u = o.map((e, l) => {
-      let t = /* @__PURE__ */ n.jsx(C, { type: "text", className: e.danger ? h : s, onClick: e.onClick, children: e == null ? void 0 : e.label }, l);
-      e.type === "secondary" && (t = /* @__PURE__ */ n.jsx(C, { type: "text", className: k, onClick: e.onClick, children: e == null ? void 0 : e.label }, l));
-      const c = e.render ?? ((L, E) => /* @__PURE__ */ n.jsx(W, { children: L }, E));
-      return c == null ? void 0 : c(t, l);
+    const i = o.map((e, s) => /* @__PURE__ */ n.jsx(b, { className: m, skeletonCls: C, children: e == null ? void 0 : e.label }, s)), f = o.map((e, s) => {
+      let t = /* @__PURE__ */ n.jsx(j, { type: "text", className: e.danger ? h : l, onClick: e.onClick, children: e == null ? void 0 : e.label }, s);
+      e.type === "secondary" && (t = /* @__PURE__ */ n.jsx(j, { type: "text", className: k, onClick: e.onClick, children: e == null ? void 0 : e.label }, s));
+      const c = e.render ?? ((E, L) => /* @__PURE__ */ n.jsx(W, { children: E }, L));
+      return c == null ? void 0 : c(t, s);
     });
-    return a ? i : u;
+    return a ? i : f;
   }, [a, p, o]);
   return B ? /* @__PURE__ */ n.jsxs("div", { onClick: (i) => i.stopPropagation(), style: {
     overflow: "hidden"
   }, children: [
-    /* @__PURE__ */ n.jsx(I, { size: 8, ref: f, className: "actionGroup", style: {
+    /* @__PURE__ */ n.jsx(T, { size: 8, ref: u, className: "actionGroup", style: {
       flexWrap: "wrap"
     }, children: S ?? y }),
-    /* @__PURE__ */ n.jsx("div", { className: T })
+    /* @__PURE__ */ n.jsx("div", { className: P })
   ] }) : /* @__PURE__ */ n.jsxs("div", { onClick: (i) => i.stopPropagation(), style: {
     overflow: "hidden"
   }, children: [
-    /* @__PURE__ */ n.jsx(I, { size: $, ref: f, className: "actionGroup", children: S ?? y }),
-    /* @__PURE__ */ n.jsx("div", { className: T })
+    /* @__PURE__ */ n.jsx(T, { size: $, ref: u, className: "actionGroup", children: S ?? y }),
+    /* @__PURE__ */ n.jsx("div", { className: P })
   ] });
 });
 function ne(x) {
@@ -85,9 +85,9 @@ function ne(x) {
     maxCount: d = 3,
     customActions: o,
     defaultWidth: B,
-    width: f,
+    width: u,
     ...g
-  } = x, z = ((m = F.useToken().token.Table) == null ? void 0 : m.cellPaddingInline) ?? q, a = P(null), s = M(a), h = P(0), k = w(() => f || (s != null && s.width && !h.current && (h.current = s == null ? void 0 : s.width), !(s != null && s.width) && h.current ? h.current + z * 2 + 1 : s != null && s.width ? s.width + z * 2 + 1 : B ?? 141), [f, s, z, B]);
+  } = x, z = ((m = F.useToken().token.Table) == null ? void 0 : m.cellPaddingInline) ?? q, a = I(null), l = M(a), h = I(0), k = w(() => u || (l != null && l.width && !h.current && (h.current = l == null ? void 0 : l.width), !(l != null && l.width) && h.current ? h.current + z * 2 + 1 : l != null && l.width ? l.width + z * 2 + 1 : B ?? 141), [u, l, z, B]);
   return w(() => ({
     width: Math.floor(k),
     mobileHide: !0,
@@ -98,14 +98,14 @@ function ne(x) {
     dataIndex: "operationCol",
     className: "operationCol",
     disabled: !0,
-    render: (j, N, y) => {
-      var u, e;
-      const S = ((u = o == null ? void 0 : o(N, y)) == null ? void 0 : u.filter((l) => l.type != "detail")) ?? [], i = ((e = r == null ? void 0 : r(N, y)) == null ? void 0 : e.filter((l) => {
+    render: (C, N, y) => {
+      var f, e;
+      const S = ((f = o == null ? void 0 : o(N, y)) == null ? void 0 : f.filter((s) => s.type != "detail")) ?? [], i = ((e = r == null ? void 0 : r(N, y)) == null ? void 0 : e.filter((s) => {
         var c;
-        const t = typeof l.hidden == "function" ? (c = l.hidden) == null ? void 0 : c.call(l) : l.hidden;
-        return l.type != "detail" && !t;
+        const t = typeof s.hidden == "function" ? (c = s.hidden) == null ? void 0 : c.call(s) : s.hidden;
+        return s.type != "detail" && !t;
       })) ?? [];
-      return /* @__PURE__ */ n.jsx(K, { actionGroup: i, customActions: S, loading: p, maxCount: d, useMaxWidth: g.useMaxWidth, ref: a, width: f });
+      return /* @__PURE__ */ n.jsx(K, { actionGroup: i, customActions: S, loading: p, maxCount: d, useMaxWidth: g.useMaxWidth, ref: a, width: u });
     },
     ...g
   }), [k, a.current, p, d, r, o]);

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

@@ -1,5 +1,5 @@
 import { j as je } from "../../../node_modules/react/jsx-runtime.mjs";
-import { Table as fe } from "antd";
+import { Table as ue } from "antd";
 import v from "../../../hooks/useMergedState.mjs";
 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";
@@ -16,42 +16,42 @@ const Ze = {
   onCell: () => ({
     "data-column-name": "dragSorterCell"
   })
-}, _e = [Ze, fe.SELECTION_COLUMN, fe.EXPAND_COLUMN], ue = 5;
+}, _e = [Ze, ue.SELECTION_COLUMN, ue.EXPAND_COLUMN], de = 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 = S(() => {
+  var j, k, R, L, U, A, D, Z, _, F, W, X, q, Q, Y, $, G, p, ee, te, ne, ie, oe, ae, ce, le, re;
+  const T = Re(Ae()), [ye, Se] = w(!1), [ge, Ce] = w(!1), [me, we] = w(0), r = Le(De).Table, E = e.defaultSize ?? (r == null ? void 0 : r.defaultSize) ?? "lg", xe = e.defaultZebra ?? (r == null ? void 0 : r.zebra) ?? !0, he = e.defaultBordered ?? (r == null ? void 0 : r.bordered) ?? "row-column", Te = e.defaultPageSize ?? (r == null ? void 0 : r.pageSize) ?? 10, Ke = e.defaultOrderBy ?? (r == null ? void 0 : r.orderBy) ?? "desc", V = S(() => {
     var t;
     return y({
       size: E,
-      zebra: we,
+      zebra: xe,
       bordered: he,
-      pageSize: xe,
-      orderBy: Te
+      pageSize: Te,
+      orderBy: Ke
     }, (t = e.stylesConfigState) == null ? void 0 : t.defaultValue);
   }, [e.defaultSize, r == null ? void 0 : r.defaultSize, e.defaultZebra, r == null ? void 0 : r.zebra, e.defaultBordered, r == null ? void 0 : r.bordered, e.defaultPageSize, r == null ? void 0 : r.pageSize, e.defaultOrderBy, r == null ? void 0 : r.orderBy, (j = e.stylesConfigState) == null ? void 0 : j.defaultValue]), [C, I] = v(() => {
-    var n, o, a;
+    var n, a, o;
     const {
       persistenceType: t,
       persistenceKey: c
     } = e.stylesConfigState || {};
-    if (c && t && typeof window < "u" && (console.log("persistenceType", t), t !== "online")) {
+    if (c && t && typeof window < "u" && t !== "online") {
       const i = window[t];
       try {
         const l = i == null ? void 0 : i.getItem(c);
         if (l)
-          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);
+          return (n = e == null ? void 0 : e.stylesConfigState) != null && n.defaultValue ? y(JSON.parse(l), (a = e == null ? void 0 : e.stylesConfigState) == null ? void 0 : a.defaultValue) : JSON.parse(l);
       } catch (l) {
         console.warn(l);
       }
     }
-    return e.stylesConfig || ((a = e.stylesConfigState) == null ? void 0 : a.value) || V;
+    return e.stylesConfig || ((o = e.stylesConfigState) == null ? void 0 : o.value) || V;
   }, {
     value: ((k = e.stylesConfigState) == null ? void 0 : k.value) || e.stylesConfig,
     onChange: ((R = e.stylesConfigState) == null ? void 0 : R.onChange) || e.onStylesConfigChange
   });
   g(() => {
-    var n, o;
-    if (!((n = e.stylesConfigState) != null && n.persistenceKey) || !((o = e.stylesConfigState) != null && o.persistenceType) || typeof window > "u")
+    var n, a;
+    if (!((n = e.stylesConfigState) != null && n.persistenceKey) || !((a = e.stylesConfigState) != null && a.persistenceType) || typeof window > "u")
       return;
     const {
       persistenceType: t,
@@ -59,9 +59,9 @@ function Fe(e) {
       // onlineChange
     } = e.stylesConfigState;
     if (t !== "online") {
-      const a = window[t];
+      const o = window[t];
       try {
-        a == null || a.setItem(c, JSON.stringify(C));
+        o == null || o.setItem(c, JSON.stringify(C));
       } catch (i) {
         console.warn(i), H();
       }
@@ -70,11 +70,11 @@ function Fe(e) {
     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
+        onlineGet: a,
+        persistenceKey: o
       } = e.stylesConfigState;
       try {
-        (n = o == null ? void 0 : o(a)) == null || n.then((i) => {
+        (n = a == null ? void 0 : a(o)) == null || n.then((i) => {
           const {
             config: l,
             global: s
@@ -90,34 +90,34 @@ function Fe(e) {
       }
     }
   }, []);
-  const f = S(() => (e.columns ?? []).filter((t) => !_e.includes(t) && t.title), [e.columns]), h = S(() => {
-    var o;
+  const f = S(() => (e.columns ?? []).filter((t) => !_e.includes(t) && t.title), [e.columns]), x = S(() => {
+    var a;
     const t = {
       fields: [],
       config: {
         key: "current",
         info: void 0
       }
-    }, c = f.find((a) => {
+    }, c = f.find((o) => {
       var i;
-      return (i = a == null ? void 0 : a.children) == null ? void 0 : i.length;
-    }), n = f.filter((a) => !a.isOperationCol);
+      return (i = o == null ? void 0 : o.children) == null ? void 0 : i.length;
+    }), n = f.filter((o) => !o.isOperationCol);
     if (c)
       t.fields = Ue(n);
     else {
-      const a = [];
+      const o = [];
       n.forEach((i, l) => {
         const s = B(i, l);
-        s && !i.exportHidden && a.push({
+        s && !i.exportHidden && !["operation", "operationCol", "action"].includes(s) && o.push({
           field: s,
           title: i.title,
           show: !0
         });
-      }), t.fields = a;
+      }), t.fields = o;
     }
-    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;
+    return (a = e == null ? void 0 : e.exportConfigState) != null && a.defaultValue ? y(t, e.exportConfigState.defaultValue) : t;
+  }, [f]), [z, h] = v(() => {
+    var n, a, o;
     const {
       persistenceType: t,
       persistenceKey: c
@@ -127,34 +127,34 @@ 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 ? y(JSON.parse(l), (o = e == null ? void 0 : e.exportConfigState) == null ? void 0 : o.defaultValue) : JSON.parse(l);
+          return (n = e == null ? void 0 : e.exportConfigState) != null && n.defaultValue ? y(JSON.parse(l), (a = e == null ? void 0 : e.exportConfigState) == null ? void 0 : a.defaultValue) : JSON.parse(l);
       } catch (l) {
         console.warn(l);
       }
     }
-    return e.exportConfig || ((a = e.exportConfigState) == null ? void 0 : a.value) || h;
+    return e.exportConfig || ((o = e.exportConfigState) == null ? void 0 : o.value) || x;
   }, {
     value: ((A = e.exportConfigState) == null ? void 0 : A.value) || e.exportConfig,
     onChange: ((D = e.exportConfigState) == null ? void 0 : D.onChange) || e.onExportConfigChange
   });
   g(() => {
-    var n, o;
+    var n, a;
     const {
       persistenceType: t,
       persistenceKey: c
     } = e.exportConfigState || {};
     if (c && t && typeof window < "u" && t !== "online") {
-      const a = window[t];
+      const o = window[t];
       try {
-        const i = a == null ? void 0 : a.getItem(c);
-        i ? (n = e == null ? void 0 : e.exportConfigState) != null && n.defaultValue ? x(y(JSON.parse(i), (o = e == null ? void 0 : e.exportConfigState) == null ? void 0 : o.defaultValue)) : x(JSON.parse(i)) : x(h);
+        const i = o == null ? void 0 : o.getItem(c);
+        i ? (n = e == null ? void 0 : e.exportConfigState) != null && n.defaultValue ? h(y(JSON.parse(i), (a = e == null ? void 0 : e.exportConfigState) == null ? void 0 : a.defaultValue)) : h(JSON.parse(i)) : h(x);
       } catch (i) {
         console.warn(i);
       }
     }
-  }, [(Z = e.exportConfigState) == null ? void 0 : Z.persistenceKey, (_ = e.exportConfigState) == null ? void 0 : _.persistenceType, h]), g(() => {
-    var n, o;
-    if (!((n = e.exportConfigState) != null && n.persistenceKey) || !((o = e.exportConfigState) != null && o.persistenceType) || typeof window > "u")
+  }, [(Z = e.exportConfigState) == null ? void 0 : Z.persistenceKey, (_ = e.exportConfigState) == null ? void 0 : _.persistenceType, x]), g(() => {
+    var n, a;
+    if (!((n = e.exportConfigState) != null && n.persistenceKey) || !((a = e.exportConfigState) != null && a.persistenceType) || typeof window > "u")
       return;
     const {
       persistenceType: t,
@@ -162,9 +162,9 @@ function Fe(e) {
       // onlineChange
     } = e.exportConfigState;
     if (t !== "online") {
-      const a = window[t];
+      const o = window[t];
       try {
-        a == null || a.setItem(c, JSON.stringify(z));
+        o == null || o.setItem(c, JSON.stringify(z));
       } catch (i) {
         console.warn(i), M();
       }
@@ -173,14 +173,14 @@ function Fe(e) {
     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
+        onlineGet: a,
+        persistenceKey: o
       } = e.exportConfigState;
       try {
-        (n = o == null ? void 0 : o(a)) == null || n.then((i) => {
+        (n = a == null ? void 0 : a(o)) == null || n.then((i) => {
           var s;
           const l = y(i ?? {}, (s = e == null ? void 0 : e.exportConfigState) == null ? void 0 : s.value);
-          x(Object.keys(l).length ? l : h);
+          h(Object.keys(l).length ? l : x);
         });
       } catch (i) {
         console.warn(i);
@@ -200,22 +200,22 @@ function Fe(e) {
     })), n = f.filter((l) => !["left", "right"].includes(l.fixed)).map((l, s) => ({
       ...l,
       order: s
-    })), o = [...t, ...n, ...c], a = {};
-    return o.forEach((l, s) => {
+    })), a = [...t, ...n, ...c], o = {};
+    return a.forEach((l, s) => {
       const {
-        order: He,
+        order: se,
         fixed: Me,
         disabled: Pe
-      } = l, se = B(l, s);
-      se && (a[se] = {
+      } = l, fe = B(l, s);
+      fe && (o[fe] = {
         show: !0,
-        order: He,
+        order: se,
         fixed: Me,
         disabled: Pe
       });
-    }), a;
-  }, [f]), [Ke, Oe] = w(!1), [d, m] = v(() => {
-    var n, o, a, i;
+    }), o;
+  }, [f]), [Oe, Ve] = w(!1), [d, m] = v(() => {
+    var n, a, o, i;
     const {
       persistenceType: t,
       persistenceKey: c
@@ -225,27 +225,27 @@ 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 ? y(JSON.parse(s), (o = e == null ? void 0 : e.columnsState) == null ? void 0 : o.defaultValue) : JSON.parse(s);
+          return (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? y(JSON.parse(s), (a = e == null ? void 0 : e.columnsState) == null ? void 0 : a.defaultValue) : JSON.parse(s);
       } catch (s) {
         console.warn(s);
       }
     }
-    return e.columnsStateMap || ((a = e.columnsState) == null ? void 0 : a.value) || ((i = e.columnsState) == null ? void 0 : i.defaultValue) || {};
+    return e.columnsStateMap || ((o = e.columnsState) == null ? void 0 : o.value) || ((i = e.columnsState) == null ? void 0 : i.defaultValue) || {};
   }, {
     value: ((X = e.columnsState) == null ? void 0 : X.value) || e.columnsStateMap,
     onChange: ((q = e.columnsState) == null ? void 0 : q.onChange) || e.onColumnsStateChange
   });
   g(() => {
-    var n, o;
+    var n, a;
     const {
       persistenceType: t,
       persistenceKey: c
     } = e.columnsState || {};
     if (c && t && typeof window < "u" && t !== "online") {
-      const a = window[t];
+      const o = window[t];
       try {
-        const i = a == null ? void 0 : a.getItem(c);
-        i ? (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? m(y(JSON.parse(i), (o = e == null ? void 0 : e.columnsState) == null ? void 0 : o.defaultValue)) : m(JSON.parse(i)) : m(u);
+        const i = o == null ? void 0 : o.getItem(c);
+        i ? (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? m(y(JSON.parse(i), (a = e == null ? void 0 : e.columnsState) == null ? void 0 : a.defaultValue)) : m(JSON.parse(i)) : m(u);
       } catch (i) {
         console.warn(i);
       }
@@ -261,8 +261,8 @@ function Fe(e) {
     const n = window[t];
     try {
       n == null || n.removeItem(c);
-    } catch (o) {
-      console.warn(o);
+    } catch (a) {
+      console.warn(a);
     }
   }, [e.columnsState]), H = N(() => {
     const {
@@ -274,8 +274,8 @@ function Fe(e) {
     const n = window[t];
     try {
       n == null || n.removeItem(c);
-    } catch (o) {
-      console.warn(o);
+    } catch (a) {
+      console.warn(a);
     }
   }, [e.stylesConfigState]), M = N(() => {
     const {
@@ -287,13 +287,13 @@ function Fe(e) {
     const n = window[t];
     try {
       n == null || n.removeItem(c);
-    } catch (o) {
-      console.warn(o);
+    } catch (a) {
+      console.warn(a);
     }
   }, [e.exportConfigState]);
   g(() => {
-    var n, o;
-    if (!((n = e.columnsState) != null && n.persistenceKey) || !((o = e.columnsState) != null && o.persistenceType) || typeof window > "u")
+    var n, a;
+    if (!((n = e.columnsState) != null && n.persistenceKey) || !((a = e.columnsState) != null && a.persistenceType) || typeof window > "u")
       return;
     const {
       persistenceType: t,
@@ -301,9 +301,9 @@ function Fe(e) {
       // onlineChange
     } = e.columnsState;
     if (t !== "online") {
-      const a = window[t];
+      const o = window[t];
       try {
-        a == null || a.setItem(c, JSON.stringify(d));
+        o == null || o.setItem(c, JSON.stringify(d));
       } catch (i) {
         console.warn(i), J();
       }
@@ -312,36 +312,36 @@ function Fe(e) {
     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
+        onlineGet: a,
+        persistenceKey: o
       } = e.columnsState;
       try {
-        (n = o == null ? void 0 : o(a)) == null || n.then((i) => {
+        (n = a == null ? void 0 : a(o)) == null || n.then((i) => {
           var s;
           const l = y(i ?? {}, (s = e == null ? void 0 : e.columnsState) == null ? void 0 : s.value);
-          m(l), Oe(!0);
+          m(l), Ve(!0);
         });
       } catch (i) {
         console.warn(i);
       }
     }
   }, []), g(() => {
-    var n, o;
-    const t = f.findIndex((a) => a == null ? void 0 : a.isOperationCol), c = Object.keys(d ?? {}).length === 0;
+    var n, a;
+    const t = f.findIndex((o) => o == null ? void 0 : o.isOperationCol), c = Object.keys(d ?? {}).length === 0;
     if (t >= 0) {
-      const a = f[t], i = B(a, t);
-      !(((n = d == null ? void 0 : d[i]) == null ? void 0 : n.fixed) === ((o = u == null ? void 0 : u[i]) == null ? void 0 : o.fixed)) && c && m(u);
+      const o = f[t], i = B(o, t);
+      !(((n = d == null ? void 0 : d[i]) == null ? void 0 : n.fixed) === ((a = u == null ? void 0 : u[i]) == null ? void 0 : a.fixed)) && c && m(u);
     } else
       c && m(u);
   }, [u, d]);
-  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(() => {
+  const ze = 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]), be = S(() => e.zebra ?? C.zebra, [e.zebra, C.zebra]), K = S(() => e.bordered ?? C.bordered, [e.bordered, C.bordered]), ve = S(() => ["column", "row-column"].includes(K), [K]), Ne = S(() => {
     let t = !1;
     return ["hide", "column"].includes(K) && (t = !0), t;
-  }, [K]), [Ne, b] = w(!1), [Be, O] = w(ue), Ee = () => {
-    b(!0), O(ue);
-  }, Ie = () => {
-    b(!1), O(0);
+  }, [K]), [Be, b] = w(!1), [Ee, O] = w(de), Ie = () => {
+    b(!0), O(de);
   }, Je = () => {
+    b(!1), O(0);
+  }, He = () => {
     var t, c, n;
     (n = (t = e.columnsState) == null ? void 0 : t.onlineChange) == null || n.call(t, (c = e.columnsState) == null ? void 0 : c.persistenceKey, d), b(!1), O(0);
   }, P = {
@@ -350,24 +350,24 @@ function Fe(e) {
     pagination: e.pagination,
     total: e.total,
     uuid: T.current,
-    fullscreen: de,
-    setFullscreen: ye,
-    selected: Se,
-    setSelected: ge,
-    toolbarWidth: Ce,
-    setToolbarWidth: me,
-    startAutoSaveCountdown: Ee,
-    isSaving: Ne,
-    countdown: Be,
-    cancelAutoSave: Ie,
-    immediateSave: Je,
+    fullscreen: ye,
+    setFullscreen: Se,
+    selected: ge,
+    setSelected: Ce,
+    toolbarWidth: me,
+    setToolbarWidth: we,
+    startAutoSaveCountdown: Ie,
+    isSaving: Be,
+    countdown: Ee,
+    cancelAutoSave: Je,
+    immediateSave: He,
     setCountdown: O,
     columns: e.columns,
     baseColumns: f,
     persistenceType: (p = e.columnsState) == null ? void 0 : p.persistenceType,
     persistenceKey: (ee = e.columnsState) == null ? void 0 : ee.persistenceKey,
     onlineChange: (te = e.columnsState) == null ? void 0 : te.onlineChange,
-    finish: Ke,
+    finish: Oe,
     columnsMap: d,
     setColumnsMap: m,
     defaultColumnKeyMap: u,
@@ -378,21 +378,21 @@ function Fe(e) {
     tableSize: C.size,
     stylesStorageType: (ne = e.stylesConfigState) == null ? void 0 : ne.persistenceType,
     stylesStorageKey: (ie = e.stylesConfigState) == null ? void 0 : ie.persistenceKey,
-    onlineStylesConfigChange: (ae = e.stylesConfigState) == null ? void 0 : ae.onlineChange,
+    onlineStylesConfigChange: (oe = e.stylesConfigState) == null ? void 0 : oe.onlineChange,
     clearStylesConfigCache: H,
     defaultTableStylesConfig: V,
     exportConfig: z,
-    setTableExportConfig: x,
-    defaultTableExportConfig: h,
-    exportStorageType: (oe = e.exportConfigState) == null ? void 0 : oe.persistenceType,
+    setTableExportConfig: h,
+    defaultTableExportConfig: x,
+    exportStorageType: (ae = e.exportConfigState) == null ? void 0 : ae.persistenceType,
     exportStorageKey: (ce = e.exportConfigState) == null ? void 0 : ce.persistenceKey,
     onlineExportConfigChange: (le = e.exportConfigState) == null ? void 0 : le.onlineChange,
     clearExportConfigCache: M,
     exportConfigHardCodedValue: (re = e.exportConfigState) == null ? void 0 : re.hardCodedValue,
-    zebra: ze,
-    rowHoverable: Ve,
-    showColumnBorder: be,
-    hideRowBorder: ve
+    zebra: be,
+    rowHoverable: ze,
+    showColumnBorder: ve,
+    hideRowBorder: Ne
   };
   return Object.defineProperty(P, "uuid", {
     get: () => T.current