bitz-react-admin-ui 2.1.9 → 2.2.0

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

@@ -1,17 +1,17 @@
-import { j as be } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import J from "../../../hooks/useMergedState.mjs";
-import { createContext as Ve, useRef as re, useContext as ve, useEffect as d, useMemo as C, useCallback as N } from "react";
-import { genColumnKey as se } from "./utils/index.mjs";
-import { getUuid as ze } from "../../../utils/uuid.mjs";
-import { BitzConfigContext as Oe } from "../../BitzConfigProvider/context.mjs";
+import { j as Oe } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import O from "../../../hooks/useMergedState.mjs";
+import { createContext as ze, useRef as Je, useState as ue, useContext as Ne, useEffect as y, useMemo as C, useCallback as z } from "react";
+import { genColumnKey as re } from "./utils/index.mjs";
+import { getUuid as Ie } from "../../../utils/uuid.mjs";
+import { BitzConfigContext as Ee } from "../../BitzConfigProvider/context.mjs";
 import S from "../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/merge.mjs";
-function Je(e) {
-  var H, P, k, R, G, Z, D, U, q, A, F, L, Q, W, X, Y, _, $, p, ee, te, ne, ie, ae, ce;
-  const K = re(ze()), b = re([]), r = ve(Oe).Table, ye = r == null ? void 0 : r.defaultSize, I = e.defaultSize ?? ye ?? "lg", de = e.defaultZebra ?? (r == null ? void 0 : r.zebra) ?? !0, Se = e.defaultBordered ?? (r == null ? void 0 : r.bordered) ?? "row-column", V = e.defaultStylesConfig || {
-    size: I,
-    zebra: de,
-    bordered: Se
-  }, [y, E] = J(
+function Be(e) {
+  var j, k, H, D, P, R, G, Z, F, U, q, A, L, Q, W, X, Y, _, $, p, ee, te, ne, ie, ae;
+  const T = Je(Ie()), [se, de] = ue(!1), [ye, Se] = ue(!1), r = Ne(Ee).Table, ge = r == null ? void 0 : r.defaultSize, J = e.defaultSize ?? ge ?? "lg", Ce = e.defaultZebra ?? (r == null ? void 0 : r.zebra) ?? !0, me = e.defaultBordered ?? (r == null ? void 0 : r.bordered) ?? "row-column", b = e.defaultStylesConfig || {
+    size: J,
+    zebra: Ce,
+    bordered: me
+  }, [d, N] = O(
     () => {
       var n, o, c, l;
       const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.stylesConfigState || {};
@@ -28,14 +28,14 @@ function Je(e) {
           console.warn(u);
         }
       }
-      return e.stylesConfig || ((c = e.stylesConfigState) == null ? void 0 : c.value) || ((l = e.stylesConfigState) == null ? void 0 : l.defaultValue) || V;
+      return e.stylesConfig || ((c = e.stylesConfigState) == null ? void 0 : c.value) || ((l = e.stylesConfigState) == null ? void 0 : l.defaultValue) || b;
     },
     {
-      value: ((H = e.stylesConfigState) == null ? void 0 : H.value) || e.stylesConfig,
-      onChange: ((P = e.stylesConfigState) == null ? void 0 : P.onChange) || e.onStylesConfigChange
+      value: ((j = e.stylesConfigState) == null ? void 0 : j.value) || e.stylesConfig,
+      onChange: ((k = e.stylesConfigState) == null ? void 0 : k.onChange) || e.onStylesConfigChange
     }
   );
-  d(() => {
+  y(() => {
     var a, n;
     if (!((a = e.stylesConfigState) != null && a.persistenceKey) || !((n = e.stylesConfigState) != null && n.persistenceType) || typeof window > "u")
       return;
@@ -47,25 +47,25 @@ function Je(e) {
     if (t !== "online") {
       const o = window[t];
       try {
-        o == null || o.setItem(i, JSON.stringify(y));
+        o == null || o.setItem(i, JSON.stringify(d));
       } catch (c) {
-        console.warn(c), M();
+        console.warn(c), E();
       }
     }
   }, [
-    (k = e.stylesConfigState) == null ? void 0 : k.persistenceKey,
-    y,
-    (R = e.stylesConfigState) == null ? void 0 : R.persistenceType
-  ]), d(() => {
+    (H = e.stylesConfigState) == null ? void 0 : H.persistenceKey,
+    d,
+    (D = e.stylesConfigState) == null ? void 0 : D.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 {
         (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);
-          E(
-            (u = Object.keys(l ?? {})) != null && u.length ? l ?? {} : V
+          var f;
+          const l = S(c ?? {}, (f = e == null ? void 0 : e.stylesConfigState) == null ? void 0 : f.value);
+          N(
+            Object.keys(l).length ? l : b
           );
         });
       } catch (c) {
@@ -77,18 +77,22 @@ function Je(e) {
     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, isOperationCol: l }, f) => {
-        const u = se(n ?? o, f);
-        u && !l && t.push({
-          field: u,
-          title: c,
-          show: !0
-        });
+    const t = {
+      fields: [],
+      config: {
+        key: "current",
+        info: void 0
       }
-    ), t;
-  }, [e.columns]), [v, w] = J(
+    };
+    return (a = e.columns) == null || a.forEach((n, o) => {
+      const { title: c, isOperationCol: l, isDragSortCol: f } = n, u = re(n, o);
+      u && !l && !f && t.fields.push({
+        field: u,
+        title: c,
+        show: !0
+      });
+    }), t;
+  }, [e.columns]), [V, w] = O(
     () => {
       var n, o, c, l;
       const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.exportConfigState || {};
@@ -108,11 +112,11 @@ function Je(e) {
       return e.exportConfig || ((c = e.exportConfigState) == null ? void 0 : c.value) || ((l = e.exportConfigState) == null ? void 0 : l.defaultValue) || m;
     },
     {
-      value: ((G = e.exportConfigState) == null ? void 0 : G.value) || e.exportConfig,
-      onChange: ((Z = e.exportConfigState) == null ? void 0 : Z.onChange) || e.onExportConfigChange
+      value: ((P = e.exportConfigState) == null ? void 0 : P.value) || e.exportConfig,
+      onChange: ((R = e.exportConfigState) == null ? void 0 : R.onChange) || e.onExportConfigChange
     }
   );
-  d(() => {
+  y(() => {
     var n, o;
     const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.exportConfigState || {};
     if (i && t && typeof window < "u" && t !== "online") {
@@ -130,10 +134,10 @@ function Je(e) {
       }
     }
   }, [
-    (D = e.exportConfigState) == null ? void 0 : D.persistenceKey,
-    (U = e.exportConfigState) == null ? void 0 : U.persistenceType,
+    (G = e.exportConfigState) == null ? void 0 : G.persistenceKey,
+    (Z = e.exportConfigState) == null ? void 0 : Z.persistenceType,
     m
-  ]), d(() => {
+  ]), y(() => {
     var a, n;
     if (!((a = e.exportConfigState) != null && a.persistenceKey) || !((n = e.exportConfigState) != null && n.persistenceType) || typeof window > "u")
       return;
@@ -145,24 +149,26 @@ function Je(e) {
     if (t !== "online") {
       const o = window[t];
       try {
-        o == null || o.setItem(i, JSON.stringify(v));
+        o == null || o.setItem(i, JSON.stringify(V));
       } catch (c) {
-        console.warn(c), j();
+        console.warn(c), B();
       }
     }
   }, [
-    (q = e.exportConfigState) == null ? void 0 : q.persistenceKey,
-    v,
-    (A = e.exportConfigState) == null ? void 0 : A.persistenceType
-  ]), d(() => {
+    (F = e.exportConfigState) == null ? void 0 : F.persistenceKey,
+    V,
+    (U = e.exportConfigState) == null ? void 0 : U.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);
-          w(l != null && l.length ? l : m);
+          const l = S(c ?? {}, (f = e == null ? void 0 : e.exportConfigState) == null ? void 0 : f.value);
+          w(
+            Object.keys(l).length ? l : m
+          );
         });
       } catch (c) {
         console.warn(c);
@@ -170,22 +176,20 @@ function Je(e) {
     }
   }, []);
   const x = C(() => {
-    var c, l, f, u, oe, le, ue;
+    var c, l, f, u, ce, oe, le;
     if ((c = e == null ? void 0 : e.columnsState) != null && c.defaultValue)
       return e.columnsState.defaultValue;
-    const t = ((f = (l = e.columns) == null ? void 0 : l.filter((s) => s.fixed === "left")) == null ? void 0 : f.map((s, g) => ({ ...s, order: g }))) ?? [], i = ((oe = (u = e.columns) == null ? void 0 : u.filter((s) => s.fixed === "right")) == null ? void 0 : oe.map((s, g) => ({ ...s, order: g }))) ?? [], a = ((ue = (le = e.columns) == null ? void 0 : le.filter((s) => !["left", "right"].includes(s.fixed))) == null ? void 0 : ue.map((s, g) => ({ ...s, order: g }))) ?? [], n = [...t, ...a, ...i], o = {};
-    return n == null || n.forEach(
-      ({ key: s, dataIndex: g, order: xe, fixed: he, disabled: Ke }, Te) => {
-        const fe = se(s ?? g, Te);
-        fe && (o[fe] = {
-          show: !0,
-          order: xe,
-          fixed: he,
-          disabled: Ke
-        });
-      }
-    ), o;
-  }, [e.columns]), [z, h] = J(
+    const t = ((f = (l = e.columns) == null ? void 0 : l.filter((s) => s.fixed === "left")) == null ? void 0 : f.map((s, g) => ({ ...s, order: g }))) ?? [], i = ((ce = (u = e.columns) == null ? void 0 : u.filter((s) => s.fixed === "right")) == null ? void 0 : ce.map((s, g) => ({ ...s, order: g }))) ?? [], a = ((le = (oe = e.columns) == null ? void 0 : oe.filter((s) => !["left", "right"].includes(s.fixed))) == null ? void 0 : le.map((s, g) => ({ ...s, order: g }))) ?? [], n = [...t, ...a, ...i], o = {};
+    return n == null || n.forEach((s, g) => {
+      const { order: Ke, fixed: be, disabled: Ve, isDragSortCol: ve } = s, fe = re(s, g);
+      fe && !ve && (o[fe] = {
+        show: !0,
+        order: Ke,
+        fixed: be,
+        disabled: Ve
+      });
+    }), o;
+  }, [e.columns]), [v, h] = O(
     () => {
       var n, o, c, l;
       const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.columnsState || {};
@@ -205,11 +209,11 @@ function Je(e) {
       return e.columnsStateMap || ((c = e.columnsState) == null ? void 0 : c.value) || ((l = e.columnsState) == null ? void 0 : l.defaultValue) || x;
     },
     {
-      value: ((F = e.columnsState) == null ? void 0 : F.value) || e.columnsStateMap,
-      onChange: ((L = e.columnsState) == null ? void 0 : L.onChange) || e.onColumnsStateChange
+      value: ((q = e.columnsState) == null ? void 0 : q.value) || e.columnsStateMap,
+      onChange: ((A = e.columnsState) == null ? void 0 : A.onChange) || e.onColumnsStateChange
     }
   );
-  d(() => {
+  y(() => {
     var n, o;
     const { persistenceType: t, persistenceKey: i, onlineGet: a } = e.columnsState || {};
     if (i && t && typeof window < "u" && t !== "online") {
@@ -227,11 +231,11 @@ function Je(e) {
       }
     }
   }, [
-    (Q = e.columnsState) == null ? void 0 : Q.persistenceKey,
-    (W = e.columnsState) == null ? void 0 : W.persistenceType,
+    (L = e.columnsState) == null ? void 0 : L.persistenceKey,
+    (Q = e.columnsState) == null ? void 0 : Q.persistenceType,
     x
   ]);
-  const B = N(() => {
+  const I = z(() => {
     const { persistenceType: t, persistenceKey: i } = e.columnsState || {};
     if (!i || !t || typeof window > "u")
       return;
@@ -241,7 +245,7 @@ function Je(e) {
     } catch (n) {
       console.warn(n);
     }
-  }, [e.columnsState]), M = N(() => {
+  }, [e.columnsState]), E = z(() => {
     const { persistenceType: t, persistenceKey: i } = e.stylesConfigState || {};
     if (!i || !t || typeof window > "u")
       return;
@@ -251,7 +255,7 @@ function Je(e) {
     } catch (n) {
       console.warn(n);
     }
-  }, [e.stylesConfigState]), j = N(() => {
+  }, [e.stylesConfigState]), B = z(() => {
     const { persistenceType: t, persistenceKey: i } = e.exportConfigState || {};
     if (!i || !t || typeof window > "u")
       return;
@@ -262,7 +266,7 @@ function Je(e) {
       console.warn(n);
     }
   }, [e.exportConfigState]);
-  d(() => {
+  y(() => {
     var a, n;
     if (!((a = e.columnsState) != null && a.persistenceKey) || !((n = e.columnsState) != null && n.persistenceType) || typeof window > "u")
       return;
@@ -274,25 +278,25 @@ function Je(e) {
     if (t !== "online") {
       const o = window[t];
       try {
-        o == null || o.setItem(i, JSON.stringify(z));
+        o == null || o.setItem(i, JSON.stringify(v));
       } catch (c) {
-        console.warn(c), B();
+        console.warn(c), I();
       }
     }
   }, [
-    (X = e.columnsState) == null ? void 0 : X.persistenceKey,
-    z,
-    (Y = e.columnsState) == null ? void 0 : Y.persistenceType
-  ]), d(() => {
+    (W = e.columnsState) == null ? void 0 : W.persistenceKey,
+    v,
+    (X = e.columnsState) == null ? void 0 : X.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 {
         (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);
+          var f;
+          const l = S(c ?? {}, (f = e == null ? void 0 : e.columnsState) == null ? void 0 : f.value);
           h(
-            (u = Object.keys(l ?? {})) != null && u.length ? l ?? {} : x
+            Object.keys(l).length ? l : x
           );
         });
       } catch (c) {
@@ -300,55 +304,54 @@ function Je(e) {
       }
     }
   }, []);
-  const ge = C(() => (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]), Ce = C(() => e.zebra ?? y.zebra, [e.zebra, y.zebra]), T = C(() => e.bordered ?? y.bordered, [e.bordered, y.bordered]), me = C(() => ["column", "row-column"].includes(T), [T]), we = C(() => {
+  const we = C(() => (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]), xe = C(() => e.zebra ?? d.zebra, [e.zebra, d.zebra]), K = C(() => e.bordered ?? d.bordered, [e.bordered, d.bordered]), he = C(() => ["column", "row-column"].includes(K), [K]), Te = C(() => {
     let t = !1;
-    return ["hide", "column"].includes(T) && (t = !0), t;
-  }, [T]), O = {
-    uuid: K.current,
+    return ["hide", "column"].includes(K) && (t = !0), t;
+  }, [K]), M = {
+    loading: e.loading ?? !1,
+    uuid: T.current,
+    fullscreen: se,
+    setFullscreen: de,
+    selected: ye,
+    setSelected: Se,
     columns: e.columns,
-    persistenceType: (_ = e.columnsState) == null ? void 0 : _.persistenceType,
-    persistenceKey: ($ = e.columnsState) == null ? void 0 : $.persistenceKey,
-    onlineChange: (p = e.columnsState) == null ? void 0 : p.onlineChange,
-    sortKeyColumns: b.current,
-    setSortKeyColumns: (t) => {
-      b.current = t;
-    },
-    columnsMap: z,
+    persistenceType: (Y = e.columnsState) == null ? void 0 : Y.persistenceType,
+    persistenceKey: (_ = e.columnsState) == null ? void 0 : _.persistenceKey,
+    onlineChange: ($ = e.columnsState) == null ? void 0 : $.onlineChange,
+    columnsMap: v,
     setColumnsMap: h,
     defaultColumnKeyMap: x,
-    clearPersistenceStorage: B,
-    stylesConfig: y,
-    setTableStylesConfig: E,
-    defaultTableSize: I,
-    tableSize: y.size,
-    stylesStorageType: (ee = e.stylesConfigState) == null ? void 0 : ee.persistenceType,
-    stylesStorageKey: (te = e.stylesConfigState) == null ? void 0 : te.persistenceKey,
-    onlineStylesConfigChange: (ne = e.stylesConfigState) == null ? void 0 : ne.onlineChange,
-    clearStylesConfigCache: M,
-    defaultTableStylesConfig: V,
-    exportConfig: v,
+    clearPersistenceStorage: I,
+    stylesConfig: d,
+    setTableStylesConfig: N,
+    defaultTableSize: J,
+    tableSize: d.size,
+    stylesStorageType: (p = e.stylesConfigState) == null ? void 0 : p.persistenceType,
+    stylesStorageKey: (ee = e.stylesConfigState) == null ? void 0 : ee.persistenceKey,
+    onlineStylesConfigChange: (te = e.stylesConfigState) == null ? void 0 : te.onlineChange,
+    clearStylesConfigCache: E,
+    defaultTableStylesConfig: b,
+    exportConfig: V,
     setTableExportConfig: w,
     defaultTableExportConfig: m,
-    exportStorageType: (ie = e.exportConfigState) == null ? void 0 : ie.persistenceType,
-    exportStorageKey: (ae = e.exportConfigState) == null ? void 0 : ae.persistenceKey,
-    onlineExportConfigChange: (ce = e.exportConfigState) == null ? void 0 : ce.onlineChange,
-    clearExportConfigCache: j,
-    zebra: Ce,
-    rowHoverable: ge,
-    showColumnBorder: me,
-    hideRowBorder: we
+    exportStorageType: (ne = e.exportConfigState) == null ? void 0 : ne.persistenceType,
+    exportStorageKey: (ie = e.exportConfigState) == null ? void 0 : ie.persistenceKey,
+    onlineExportConfigChange: (ae = e.exportConfigState) == null ? void 0 : ae.onlineChange,
+    clearExportConfigCache: B,
+    zebra: xe,
+    rowHoverable: we,
+    showColumnBorder: he,
+    hideRowBorder: Te
   };
-  return Object.defineProperty(O, "sortKeyColumns", {
-    get: () => b.current
-  }), Object.defineProperty(O, "uuid", {
-    get: () => K.current
-  }), O;
+  return Object.defineProperty(M, "uuid", {
+    get: () => T.current
+  }), M;
 }
-const Ne = Ve({}), ke = (e) => {
-  const K = Je(e.initValue);
-  return /* @__PURE__ */ be.jsx(Ne.Provider, { value: K, children: e.children });
+const Me = ze({}), Ze = (e) => {
+  const T = Be(e.initValue);
+  return /* @__PURE__ */ Oe.jsx(Me.Provider, { value: T, children: e.children });
 };
 export {
-  Ne as BitzTableContext,
-  ke as default
+  Me as BitzTableContext,
+  Ze as default
 };

package/dist/components/BitzTable/Store/utils/index.d.ts

@@ -1,4 +1,3 @@
-import { Key } from 'react';
 import { ColumnsConfigProps } from '../../';
 /** 删掉不应该显示的 */
 export declare const loopFilter: (columns: any[], columnsMap: any) => {
@@ -7,11 +6,11 @@ export declare const loopFilter: (columns: any[], columnsMap: any) => {
     autoWidthColLength: number;
 };
 /**
- * 根据 key 和 dataIndex 生成唯一 id
+ * 生成列唯一key
  *
- * @param key 用户设置的 key
- * @param index 序列号，理论上唯一
+ * @param column 列
+ * @param defaultKey 序列号，理论上唯一
  */
-export declare const genColumnKey: (key?: string | number | Key, index?: number | string) => string;
+export declare const genColumnKey: (column: any, defaultKey?: any) => any;
 export declare const columnSort: (columnsMap: Record<string, ColumnsConfigProps>) => (a: any, b: any) => number;
 export declare function updateNestedObject(obj: any, prop: any, val: any): {};

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

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