bitz-react-admin-ui 2.1.3 → 2.1.5

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

@@ -1,234 +1,347 @@
-import { j as le } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import Q from "../../../hooks/useMergedState.mjs";
-import { createContext as ae, useRef as W, useContext as se, useEffect as m, useMemo as ue, useCallback as X } from "react";
-import { genColumnKey as oe } from "./utils/index.mjs";
-import { getUuid as fe } from "../../../utils/uuid.mjs";
-import { BitzConfigContext as re } from "../../BitzConfigProvider/context.mjs";
-import g from "../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/merge.mjs";
-function ye(e) {
-  var O, J, M, N, j, I, B, P, k, D, E, Z, R, G, U, q;
-  const C = W(fe()), h = W([]), r = se(re).Table, Y = r == null ? void 0 : r.defaultSize, b = e.defaultSize ?? Y ?? "lg", _ = r == null ? void 0 : r.zebra, $ = e.defaultZebra ?? _ ?? !0, p = r == null ? void 0 : r.bordered, ee = e.defaultBordered ?? p ?? "row-column", K = e.defaultStylesConfig || {
-    size: b,
-    zebra: $,
-    bordered: ee
-  }, [T, x] = Q(
+import { j as he } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import O from "../../../hooks/useMergedState.mjs";
+import { createContext as Ke, useRef as fe, useContext as Te, useEffect as y, useMemo as ue, useCallback as J } from "react";
+import { genColumnKey as se } from "./utils/index.mjs";
+import { getUuid as Ve } from "../../../utils/uuid.mjs";
+import { BitzConfigContext as be } from "../../BitzConfigProvider/context.mjs";
+import S from "../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/merge.mjs";
+function ve(e) {
+  var j, B, P, k, D, Z, G, R, U, q, A, F, H, L, Q, W, X, Y, _, $, p, ee, te, ne, ie;
+  const x = fe(Ve()), K = fe([]), r = Te(be).Table, re = r == null ? void 0 : r.defaultSize, N = e.defaultSize ?? re ?? "lg", ye = r == null ? void 0 : r.zebra, Se = e.defaultZebra ?? ye ?? !0, de = r == null ? void 0 : r.bordered, ge = e.defaultBordered ?? de ?? "row-column", T = e.defaultStylesConfig || {
+    size: N,
+    zebra: Se,
+    bordered: ge
+  }, [h, z] = O(
     () => {
-      var n, a, l, s;
-      const { persistenceType: t, persistenceKey: c, onlineGet: i } = e.stylesConfigState || {};
-      if (c && t && typeof window < "u" && t !== "online") {
-        const o = window[t];
+      var n, o, c, l;
+      const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.stylesConfigState || {};
+      if (i && t && typeof window < "u" && t !== "online") {
+        const f = window[t];
         try {
-          const u = o == null ? void 0 : o.getItem(c);
+          const u = f == null ? void 0 : f.getItem(i);
           if (u)
-            return (n = e == null ? void 0 : e.stylesConfigState) != null && n.defaultValue ? g(
+            return (n = e == null ? void 0 : e.stylesConfigState) != null && n.defaultValue ? S(
               JSON.parse(u),
-              (a = e == null ? void 0 : e.stylesConfigState) == null ? void 0 : a.defaultValue
+              (o = e == null ? void 0 : e.stylesConfigState) == null ? void 0 : o.defaultValue
             ) : JSON.parse(u);
         } catch (u) {
           console.warn(u);
         }
       }
-      return e.stylesConfig || ((l = e.stylesConfigState) == null ? void 0 : l.value) || ((s = e.stylesConfigState) == null ? void 0 : s.defaultValue) || K;
+      return e.stylesConfig || ((c = e.stylesConfigState) == null ? void 0 : c.value) || ((l = e.stylesConfigState) == null ? void 0 : l.defaultValue) || T;
     },
     {
-      value: ((O = e.stylesConfigState) == null ? void 0 : O.value) || e.stylesConfig,
-      onChange: ((J = e.stylesConfigState) == null ? void 0 : J.onChange) || e.onStylesConfigChange
+      value: ((j = e.stylesConfigState) == null ? void 0 : j.value) || e.stylesConfig,
+      onChange: ((B = e.stylesConfigState) == null ? void 0 : B.onChange) || e.onStylesConfigChange
     }
   );
-  m(() => {
-    var i, n;
-    if (!((i = e.stylesConfigState) != null && i.persistenceKey) || !((n = e.stylesConfigState) != null && n.persistenceType) || typeof window > "u")
+  y(() => {
+    var a, n;
+    if (!((a = e.stylesConfigState) != null && a.persistenceKey) || !((n = e.stylesConfigState) != null && n.persistenceType) || typeof window > "u")
       return;
     const {
       persistenceType: t,
-      persistenceKey: c
+      persistenceKey: i
       // onlineChange
     } = e.stylesConfigState;
     if (t !== "online") {
-      const a = window[t];
+      const o = window[t];
       try {
-        a == null || a.setItem(c, JSON.stringify(w));
-      } catch (l) {
-        console.warn(l), z();
+        o == null || o.setItem(i, JSON.stringify(h));
+      } catch (c) {
+        console.warn(c), E();
       }
     }
   }, [
-    (M = e.stylesConfigState) == null ? void 0 : M.persistenceKey,
-    T,
-    (N = e.stylesConfigState) == null ? void 0 : N.persistenceType
-  ]), m(() => {
-    var t, c, i;
-    if ((t = e.stylesConfigState) != null && t.persistenceKey && ((c = e.stylesConfigState) == null ? void 0 : c.persistenceType) === "online") {
-      const { onlineGet: n, persistenceKey: a } = e.stylesConfigState;
+    (P = e.stylesConfigState) == null ? void 0 : P.persistenceKey,
+    h,
+    (k = e.stylesConfigState) == null ? void 0 : k.persistenceType
+  ]), y(() => {
+    var t, i, a;
+    if ((t = e.stylesConfigState) != null && t.persistenceKey && ((i = e.stylesConfigState) == null ? void 0 : i.persistenceType) === "online") {
+      const { onlineGet: n, persistenceKey: o } = e.stylesConfigState;
       try {
-        (i = n == null ? void 0 : n(a)) == null || i.then((l) => {
-          var o, u;
-          const s = g(l, (o = e == null ? void 0 : e.stylesConfigState) == null ? void 0 : o.value);
-          x(
-            (u = Object.keys(s ?? {})) != null && u.length ? s ?? {} : K
+        (a = n == null ? void 0 : n(o)) == null || a.then((c) => {
+          var f, u;
+          const l = S(c, (f = e == null ? void 0 : e.stylesConfigState) == null ? void 0 : f.value);
+          z(
+            (u = Object.keys(l ?? {})) != null && u.length ? l ?? {} : T
           );
         });
+      } catch (c) {
+        console.warn(c);
+      }
+    }
+  }, []);
+  const g = ue(() => {
+    var i, a;
+    if ((i = e == null ? void 0 : e.exportConfigState) != null && i.defaultValue)
+      return e.exportConfigState.defaultValue;
+    const t = [];
+    return (a = e.columns) == null || a.forEach(
+      ({ key: n, dataIndex: o, title: c }, l) => {
+        const f = se(n ?? o, l);
+        f && t.push({
+          field: f,
+          title: c,
+          show: !0
+        });
+      }
+    ), t;
+  }, [e.columns]), [V, C] = O(
+    () => {
+      var n, o, c, l;
+      const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.exportConfigState || {};
+      if (i && t && typeof window < "u" && t !== "online") {
+        const f = window[t];
+        try {
+          const u = f == null ? void 0 : f.getItem(i);
+          if (u)
+            return (n = e == null ? void 0 : e.exportConfigState) != null && n.defaultValue ? S(
+              JSON.parse(u),
+              (o = e == null ? void 0 : e.exportConfigState) == null ? void 0 : o.defaultValue
+            ) : JSON.parse(u);
+        } catch (u) {
+          console.warn(u);
+        }
+      }
+      return e.exportConfig || ((c = e.exportConfigState) == null ? void 0 : c.value) || ((l = e.exportConfigState) == null ? void 0 : l.defaultValue) || g;
+    },
+    {
+      value: ((D = e.exportConfigState) == null ? void 0 : D.value) || e.exportConfig,
+      onChange: ((Z = e.exportConfigState) == null ? void 0 : Z.onChange) || e.onExportConfigChange
+    }
+  );
+  y(() => {
+    var n, o;
+    const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.exportConfigState || {};
+    if (i && t && typeof window < "u" && t !== "online") {
+      const c = window[t];
+      try {
+        const l = c == null ? void 0 : c.getItem(i);
+        l ? (n = e == null ? void 0 : e.exportConfigState) != null && n.defaultValue ? C(
+          S(
+            JSON.parse(l),
+            (o = e == null ? void 0 : e.exportConfigState) == null ? void 0 : o.defaultValue
+          )
+        ) : C(JSON.parse(l)) : C(g);
       } catch (l) {
         console.warn(l);
       }
     }
+  }, [
+    (G = e.exportConfigState) == null ? void 0 : G.persistenceKey,
+    (R = e.exportConfigState) == null ? void 0 : R.persistenceType,
+    g
+  ]), y(() => {
+    var a, n;
+    if (!((a = e.exportConfigState) != null && a.persistenceKey) || !((n = e.exportConfigState) != null && n.persistenceType) || typeof window > "u")
+      return;
+    const {
+      persistenceType: t,
+      persistenceKey: i
+      // onlineChange
+    } = e.exportConfigState;
+    if (t !== "online") {
+      const o = window[t];
+      try {
+        o == null || o.setItem(i, JSON.stringify(V));
+      } catch (c) {
+        console.warn(c), M();
+      }
+    }
+  }, [
+    (U = e.exportConfigState) == null ? void 0 : U.persistenceKey,
+    V,
+    (q = e.exportConfigState) == null ? void 0 : q.persistenceType
+  ]), y(() => {
+    var t, i, a;
+    if ((t = e.exportConfigState) != null && t.persistenceKey && ((i = e.exportConfigState) == null ? void 0 : i.persistenceType) === "online") {
+      const { onlineGet: n, persistenceKey: o } = e.exportConfigState;
+      try {
+        (a = n == null ? void 0 : n(o)) == null || a.then((c) => {
+          var f;
+          const l = S(c, (f = e == null ? void 0 : e.exportConfigState) == null ? void 0 : f.value);
+          C(l ?? g);
+        });
+      } catch (c) {
+        console.warn(c);
+      }
+    }
   }, []);
-  const d = ue(() => {
-    var l, s, o, u, A, F, H;
-    if ((l = e == null ? void 0 : e.columnsState) != null && l.defaultValue)
+  const m = ue(() => {
+    var c, l, f, u, ae, ce, oe;
+    if ((c = e == null ? void 0 : e.columnsState) != null && c.defaultValue)
       return e.columnsState.defaultValue;
-    const t = ((o = (s = e.columns) == null ? void 0 : s.filter((f) => f.fixed === "left")) == null ? void 0 : o.map((f, y) => ({ ...f, order: y }))) ?? [], c = ((A = (u = e.columns) == null ? void 0 : u.filter((f) => f.fixed === "right")) == null ? void 0 : A.map((f, y) => ({ ...f, order: y }))) ?? [], i = ((H = (F = e.columns) == null ? void 0 : F.filter((f) => !["left", "right"].includes(f.fixed))) == null ? void 0 : H.map((f, y) => ({ ...f, order: y }))) ?? [], n = [...t, ...i, ...c], a = {};
+    const t = ((f = (l = e.columns) == null ? void 0 : l.filter((s) => s.fixed === "left")) == null ? void 0 : f.map((s, d) => ({ ...s, order: d }))) ?? [], i = ((ae = (u = e.columns) == null ? void 0 : u.filter((s) => s.fixed === "right")) == null ? void 0 : ae.map((s, d) => ({ ...s, order: d }))) ?? [], a = ((oe = (ce = e.columns) == null ? void 0 : ce.filter((s) => !["left", "right"].includes(s.fixed))) == null ? void 0 : oe.map((s, d) => ({ ...s, order: d }))) ?? [], n = [...t, ...a, ...i], o = {};
     return n == null || n.forEach(
-      ({ key: f, dataIndex: y, order: te, fixed: ne, disabled: ce }, ie) => {
-        const L = oe(f ?? y, ie);
-        L && (a[L] = {
+      ({ key: s, dataIndex: d, order: Ce, fixed: me, disabled: we }, xe) => {
+        const le = se(s ?? d, xe);
+        le && (o[le] = {
           show: !0,
-          order: te,
-          fixed: ne,
-          disabled: ce
+          order: Ce,
+          fixed: me,
+          disabled: we
         });
       }
-    ), a;
-  }, [e.columns]), [w, S] = Q(
+    ), o;
+  }, [e.columns]), [b, w] = O(
     () => {
-      var n, a, l, s;
-      const { persistenceType: t, persistenceKey: c, onlineGet: i } = e.columnsState || {};
-      if (c && t && typeof window < "u" && t !== "online") {
-        const o = window[t];
+      var n, o, c, l;
+      const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.columnsState || {};
+      if (i && t && typeof window < "u" && t !== "online") {
+        const f = window[t];
         try {
-          const u = o == null ? void 0 : o.getItem(c);
+          const u = f == null ? void 0 : f.getItem(i);
           if (u)
-            return (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? g(
+            return (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? S(
               JSON.parse(u),
-              (a = e == null ? void 0 : e.columnsState) == null ? void 0 : a.defaultValue
+              (o = e == null ? void 0 : e.columnsState) == null ? void 0 : o.defaultValue
             ) : JSON.parse(u);
         } catch (u) {
           console.warn(u);
         }
       }
-      return e.columnsStateMap || ((l = e.columnsState) == null ? void 0 : l.value) || ((s = e.columnsState) == null ? void 0 : s.defaultValue) || d;
+      return e.columnsStateMap || ((c = e.columnsState) == null ? void 0 : c.value) || ((l = e.columnsState) == null ? void 0 : l.defaultValue) || m;
     },
     {
-      value: ((j = e.columnsState) == null ? void 0 : j.value) || e.columnsStateMap,
-      onChange: ((I = e.columnsState) == null ? void 0 : I.onChange) || e.onColumnsStateChange
+      value: ((A = e.columnsState) == null ? void 0 : A.value) || e.columnsStateMap,
+      onChange: ((F = e.columnsState) == null ? void 0 : F.onChange) || e.onColumnsStateChange
     }
   );
-  m(() => {
-    var n, a;
-    const { persistenceType: t, persistenceKey: c, onlineGet: i } = e.columnsState || {};
-    if (c && t && typeof window < "u" && t !== "online") {
-      const l = window[t];
+  y(() => {
+    var n, o;
+    const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.columnsState || {};
+    if (i && t && typeof window < "u" && t !== "online") {
+      const c = window[t];
       try {
-        const s = l == null ? void 0 : l.getItem(c);
-        s ? (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? S(
-          g(
-            JSON.parse(s),
-            (a = e == null ? void 0 : e.columnsState) == null ? void 0 : a.defaultValue
+        const l = c == null ? void 0 : c.getItem(i);
+        l ? (n = e == null ? void 0 : e.columnsState) != null && n.defaultValue ? w(
+          S(
+            JSON.parse(l),
+            (o = e == null ? void 0 : e.columnsState) == null ? void 0 : o.defaultValue
           )
-        ) : S(JSON.parse(s)) : S(d);
-      } catch (s) {
-        console.warn(s);
+        ) : w(JSON.parse(l)) : w(m);
+      } catch (l) {
+        console.warn(l);
       }
     }
   }, [
-    (B = e.columnsState) == null ? void 0 : B.persistenceKey,
-    (P = e.columnsState) == null ? void 0 : P.persistenceType,
-    d
+    (H = e.columnsState) == null ? void 0 : H.persistenceKey,
+    (L = e.columnsState) == null ? void 0 : L.persistenceType,
+    m
   ]);
-  const v = X(() => {
-    const { persistenceType: t, persistenceKey: c } = e.columnsState || {};
-    if (!c || !t || typeof window > "u")
+  const I = J(() => {
+    const { persistenceType: t, persistenceKey: i } = e.columnsState || {};
+    if (!i || !t || typeof window > "u")
+      return;
+    const a = window[t];
+    try {
+      a == null || a.removeItem(i);
+    } catch (n) {
+      console.warn(n);
+    }
+  }, [e.columnsState]), E = J(() => {
+    const { persistenceType: t, persistenceKey: i } = e.stylesConfigState || {};
+    if (!i || !t || typeof window > "u")
       return;
-    const i = window[t];
+    const a = window[t];
     try {
-      i == null || i.removeItem(c);
+      a == null || a.removeItem(i);
     } catch (n) {
       console.warn(n);
     }
-  }, [e.columnsState]), z = X(() => {
-    const { persistenceType: t, persistenceKey: c } = e.stylesConfigState || {};
-    if (!c || !t || typeof window > "u")
+  }, [e.stylesConfigState]), M = J(() => {
+    const { persistenceType: t, persistenceKey: i } = e.exportConfigState || {};
+    if (!i || !t || typeof window > "u")
       return;
-    const i = window[t];
+    const a = window[t];
     try {
-      i == null || i.removeItem(c);
+      a == null || a.removeItem(i);
     } catch (n) {
       console.warn(n);
     }
-  }, [e.stylesConfigState]);
-  m(() => {
-    var i, n;
-    if (!((i = e.columnsState) != null && i.persistenceKey) || !((n = e.columnsState) != null && n.persistenceType) || typeof window > "u")
+  }, [e.exportConfigState]);
+  y(() => {
+    var a, n;
+    if (!((a = e.columnsState) != null && a.persistenceKey) || !((n = e.columnsState) != null && n.persistenceType) || typeof window > "u")
       return;
     const {
       persistenceType: t,
-      persistenceKey: c
+      persistenceKey: i
       // onlineChange
     } = e.columnsState;
     if (t !== "online") {
-      const a = window[t];
+      const o = window[t];
       try {
-        a == null || a.setItem(c, JSON.stringify(w));
-      } catch (l) {
-        console.warn(l), v();
+        o == null || o.setItem(i, JSON.stringify(b));
+      } catch (c) {
+        console.warn(c), I();
       }
     }
   }, [
-    (k = e.columnsState) == null ? void 0 : k.persistenceKey,
-    w,
-    (D = e.columnsState) == null ? void 0 : D.persistenceType
-  ]), m(() => {
-    var t, c, i;
-    if ((t = e.columnsState) != null && t.persistenceKey && ((c = e.columnsState) == null ? void 0 : c.persistenceType) === "online") {
-      const { onlineGet: n, persistenceKey: a } = e.columnsState;
+    (Q = e.columnsState) == null ? void 0 : Q.persistenceKey,
+    b,
+    (W = e.columnsState) == null ? void 0 : W.persistenceType
+  ]), y(() => {
+    var t, i, a;
+    if ((t = e.columnsState) != null && t.persistenceKey && ((i = e.columnsState) == null ? void 0 : i.persistenceType) === "online") {
+      const { onlineGet: n, persistenceKey: o } = e.columnsState;
       try {
-        (i = n == null ? void 0 : n(a)) == null || i.then((l) => {
-          var o, u;
-          const s = g(l, (o = e == null ? void 0 : e.columnsState) == null ? void 0 : o.value);
-          S(
-            (u = Object.keys(s ?? {})) != null && u.length ? s ?? {} : d
+        (a = n == null ? void 0 : n(o)) == null || a.then((c) => {
+          var f, u;
+          const l = S(c, (f = e == null ? void 0 : e.columnsState) == null ? void 0 : f.value);
+          w(
+            (u = Object.keys(l ?? {})) != null && u.length ? l ?? {} : m
           );
         });
-      } catch (l) {
-        console.warn(l);
+      } catch (c) {
+        console.warn(c);
       }
     }
   }, []);
-  const V = {
-    uuid: C.current,
-    persistenceType: (E = e.columnsState) == null ? void 0 : E.persistenceType,
-    persistenceKey: (Z = e.columnsState) == null ? void 0 : Z.persistenceKey,
-    onlineChange: (R = e.columnsState) == null ? void 0 : R.onlineChange,
-    sortKeyColumns: h.current,
+  const v = {
+    uuid: x.current,
+    columns: e.columns,
+    persistenceType: (X = e.columnsState) == null ? void 0 : X.persistenceType,
+    persistenceKey: (Y = e.columnsState) == null ? void 0 : Y.persistenceKey,
+    onlineChange: (_ = e.columnsState) == null ? void 0 : _.onlineChange,
+    sortKeyColumns: K.current,
     setSortKeyColumns: (t) => {
-      h.current = t;
+      K.current = t;
     },
-    columnsMap: w,
-    setColumnsMap: S,
-    stylesConfig: T,
-    setTableStylesConfig: x,
-    defaultTableSize: b,
-    tableSize: T.size,
-    stylesStorageType: (G = e.stylesConfigState) == null ? void 0 : G.persistenceType,
-    stylesStorageKey: (U = e.stylesConfigState) == null ? void 0 : U.persistenceKey,
-    onlineStylesConfigChange: (q = e.stylesConfigState) == null ? void 0 : q.onlineChange,
-    columns: e.columns,
-    clearPersistenceStorage: v,
-    clearStylesConfigCache: z,
-    defaultTableStylesConfig: K,
-    defaultColumnKeyMap: d
+    columnsMap: b,
+    setColumnsMap: w,
+    defaultColumnKeyMap: m,
+    clearPersistenceStorage: I,
+    stylesConfig: h,
+    setTableStylesConfig: z,
+    defaultTableSize: N,
+    tableSize: h.size,
+    stylesStorageType: ($ = e.stylesConfigState) == null ? void 0 : $.persistenceType,
+    stylesStorageKey: (p = e.stylesConfigState) == null ? void 0 : p.persistenceKey,
+    onlineStylesConfigChange: (ee = e.stylesConfigState) == null ? void 0 : ee.onlineChange,
+    clearStylesConfigCache: E,
+    defaultTableStylesConfig: T,
+    exportConfig: V,
+    setTableExportConfig: C,
+    defaultTableExportConfig: g,
+    exportStorageType: (te = e.exportConfigState) == null ? void 0 : te.persistenceType,
+    exportStorageKey: (ne = e.exportConfigState) == null ? void 0 : ne.persistenceKey,
+    onlineExportConfigChange: (ie = e.exportConfigState) == null ? void 0 : ie.onlineChange,
+    clearExportConfigCache: M
   };
-  return Object.defineProperty(V, "sortKeyColumns", {
-    get: () => h.current
-  }), Object.defineProperty(V, "uuid", {
-    get: () => C.current
-  }), V;
+  return Object.defineProperty(v, "sortKeyColumns", {
+    get: () => K.current
+  }), Object.defineProperty(v, "uuid", {
+    get: () => x.current
+  }), v;
 }
-const de = ae({}), Te = (e) => {
-  const C = ye(e.initValue);
-  return /* @__PURE__ */ le.jsx(de.Provider, { value: C, children: e.children });
+const Oe = Ke({}), Be = (e) => {
+  const x = ve(e.initValue);
+  return /* @__PURE__ */ he.jsx(Oe.Provider, { value: x, children: e.children });
 };
 export {
-  de as BitzTableContext,
-  Te as default
+  Oe as BitzTableContext,
+  Be as default
 };

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

@@ -1,37 +1,38 @@
-const a = (r, f) => {
-  let i = 0, t = 0;
+const a = (r, d) => {
+  let f = 0, t = 0;
   return {
-    filterColumns: ((o, s) => o.map((e) => {
-      const n = h((e == null ? void 0 : e.key) || (e == null ? void 0 : e.dataIndex), e.index), d = s[n];
-      return d && d.show === !1 ? (e.width ? i += e.width : t += 1, !1) : { ...e, ...d };
-    }))(r, f).filter(Boolean),
-    width: i,
+    filterColumns: ((o, l) => o.map((n) => {
+      const e = h((n == null ? void 0 : n.key) || (n == null ? void 0 : n.dataIndex), n.index), s = l[e];
+      return s && s.show === !1 ? (n.width ? f += n.width : t += 1, !1) : { ...n, ...s };
+    }))(r, d).filter(Boolean),
+    width: f,
     autoWidthColLength: t
   };
-}, h = (r, f) => r ? Array.isArray(r) ? r.join("-") : r.toString() : `${f}`, y = (r) => (f, i) => {
-  var n, d, c, x;
-  const { fixed: t, index: u } = f, { fixed: l, index: o } = i;
-  if (t === "left" && l !== "left" || l === "right" && t !== "right")
+}, h = (r, d) => r ? Array.isArray(r) ? r.join("-") : r.toString() : `${d}`, y = (r) => (d, f) => {
+  var e, s, u, x;
+  const { fixed: t, index: c } = d, { fixed: i, index: o } = f;
+  if (t === "left" && i !== "left" || i === "right" && t !== "right")
     return -2;
-  if (l === "left" && t !== "left" || t === "right" && l !== "right")
+  if (i === "left" && t !== "left" || t === "right" && i !== "right")
     return 2;
-  const s = f.key || `${u}`, e = i.key || `${o}`;
-  return (n = r[s]) != null && n.order || (d = r[e]) != null && d.order ? (((c = r[s]) == null ? void 0 : c.order) || 0) - (((x = r[e]) == null ? void 0 : x.order) || 0) : (f.index || 0) - (i.index || 0);
+  const l = d.key || `${c}`, n = f.key || `${o}`;
+  return (e = r[l]) != null && e.order || (s = r[n]) != null && s.order ? (((u = r[l]) == null ? void 0 : u.order) || 0) - (((x = r[n]) == null ? void 0 : x.order) || 0) : (d.index || 0) - (f.index || 0);
 };
-function g(r, f, i) {
+function g(r, d, f) {
   const t = {};
-  let u = "";
-  const l = (o, s, e) => {
-    for (const n in o)
-      if (o.hasOwnProperty(n) && (typeof o[n] == "object" && o[n] !== null && (u = n, t[n] = { ...o[n] }, l(o[n], s, e)), n === s)) {
-        const d = t[u];
-        t[u] = {
-          ...d,
-          [s]: d.disabled || d.fixed ? !0 : e
-        }, u = "";
+  let c = "";
+  const i = (o, l, n) => {
+    for (const e in o)
+      if (o.hasOwnProperty(e) && (typeof o[e] == "object" && o[e] !== null && (c = e, t[e] = { ...o[e] }, i(o[e], l, n)), e === l)) {
+        const s = t[c];
+        t[c] = {
+          ...s,
+          [l]: n
+          // [prop]: current.disabled || current.fixed ? true : val,
+        }, c = "";
       }
   };
-  return l(r, f, i), t;
+  return i(r, d, f), t;
 }
 export {
   y as columnSort,