bitz-react-admin-ui 1.4.2 → 1.4.21

package/README.md

@@ -1,6 +1,6 @@
 # Bitz的Admin组件
 
 ## 引入方式
-import 'bitz-react-admin-ui/dist/style.css'
-import { BitzTable } from 'bitz-react-admin-ui'
+import 'bitz-react-admin/dist/style.css'
+import { BitzTable } from 'bitz-react-admin'
 

package/dist/components/BitzPagination/index.mjs

@@ -1,26 +1,27 @@
-import { j as n } from "../../node_modules/react/jsx-runtime.mjs";
-import { useState as m, useMemo as x, useEffect as P } from "react";
-import { Pagination as S } from "antd";
-import { isMobile as b } from "../../node_modules/react-device-detect/dist/lib.mjs";
+import { j as t } from "../../node_modules/react/jsx-runtime.mjs";
+import { useState as m, useMemo as x, useEffect as S } from "react";
+import { Pagination as P } from "antd";
+import { isMobile as T } from "../../node_modules/react-device-detect/dist/lib.mjs";
+import $ from "../BitzHighlight/index.mjs";
 import "./index.less.mjs";
 let r = !0;
-const y = ({ pageSizeOptions: u = [10, 20, 50, 100], total: h = 0, dataSource: o = [], resetPage: a = 0, paginationEmit: g = () => {
+const R = ({ pageSizeOptions: l = [10, 20, 50, 100], total: u = 0, dataSource: o = [], resetPage: g = 0, paginationEmit: a = () => {
 }, direction: f = "end", totalText: p = "共", totalItemText: c = "条" }) => {
-  const [l, s] = m(1), [z, C] = m(10), i = x(() => a, [a]);
-  P(() => {
-    i != 0 && s(i);
-  }, [i]);
-  const j = (e, t) => {
-    s(e), r && g(e, t);
-  }, w = (e, t) => {
-    r = !1, C(t), setTimeout(() => {
-      s(1), g(1, t), setTimeout(() => {
+  const [h, s] = m(1), [z, C] = m(10), n = x(() => g, [g]);
+  S(() => {
+    n != 0 && s(n);
+  }, [n]);
+  const j = (e, i) => {
+    s(e), r && a(e, i);
+  }, w = (e, i) => {
+    r = !1, C(i), setTimeout(() => {
+      s(1), a(1, i), setTimeout(() => {
         r = !0;
       }, 10);
     }, 10);
   };
-  return n.jsx(n.Fragment, { children: (o == null ? void 0 : o.length) != 0 && !b && n.jsx("div", { className: "bitzPaginationBlock", style: { justifyContent: f }, children: n.jsx(S, { size: "small", total: h, defaultCurrent: l, current: l, pageSize: z, showSizeChanger: !0, showQuickJumper: !0, pageSizeOptions: u, showTotal: (e) => `${p} ${e} ${c}`, onChange: j, onShowSizeChange: w }) }) });
+  return t.jsx(t.Fragment, { children: (o == null ? void 0 : o.length) != 0 && !T && t.jsx("div", { className: "bitzPaginationBlock", style: { justifyContent: f }, children: t.jsx(P, { size: "small", total: u, defaultCurrent: h, current: h, pageSize: z, showSizeChanger: !0, showQuickJumper: !0, pageSizeOptions: l, showTotal: (e) => t.jsx($, { highlightTag: "strong", keywords: `${e}`, sourceString: `${p} ${e} ${c}` }), onChange: j, onShowSizeChange: w }) }) });
 };
 export {
-  y as default
+  R as default
 };

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

@@ -1,21 +1,18 @@
-import { j as a } from "../../../node_modules/react/jsx-runtime.mjs";
-import { Skeleton as s, Table as n } from "antd";
-const j = ({ columns: r, dataLength: o }) => {
-  const i = Array.from({
-    length: o < 4 ? 4 : o
-  }).map((e, t) => ({ index: t })), p = r == null ? void 0 : r.map((e, t) => t === r.length - 1 ? {
-    ...e,
-    render: () => a.jsx(s, { active: !0, title: !1, paragraph: { rows: 1, width: "100%" } })
-  } : {
-    ...e,
+import { j as o } from "../../../node_modules/react/jsx-runtime.mjs";
+import { Skeleton as n, Table as p } from "antd";
+const m = ({ columns: e, dataLength: t }) => {
+  const s = Array.from({
+    length: t < 4 ? 4 : t
+  }).map((r, a) => ({ index: a })), i = e == null ? void 0 : e.map((r) => r != null && r.fixed ? r : {
+    ...r,
     sorter: !1,
-    render: (f, d, l) => a.jsx(s, { active: !0, title: !1, paragraph: {
+    render: (a, l, f) => o.jsx(n, { active: !0, title: !1, paragraph: {
       rows: 1,
-      width: (l + 1) % 2 === 0 ? "100%" : "60%"
+      width: (f + 1) % 2 === 0 ? "100%" : "60%"
     } })
   });
-  return a.jsx(n, { columns: p, rowKey: "index", dataSource: i });
+  return o.jsx(p, { columns: i, rowKey: "index", dataSource: s });
 };
 export {
-  j as default
+  m as default
 };

package/dist/components/BitzTable/index.mjs

@@ -1,34 +1,34 @@
 import { j as e } from "../../node_modules/react/jsx-runtime.mjs";
-import { useContext as X, useState as g, useMemo as h, useEffect as Y } from "react";
-import { isMobile as v } from "../../node_modules/react-device-detect/dist/lib.mjs";
+import { useContext as X, useState as p, useMemo as f, useEffect as Y } from "react";
+import { isMobile as w } from "../../node_modules/react-device-detect/dist/lib.mjs";
 import { Table as Z, Skeleton as I } from "antd";
 import S from "../BitzDrawer/index.mjs";
 import ee from "../BitzLoadMore/index.mjs";
 import se from "../BitzPagination/index.mjs";
 import le from "../BitzNoData/index.mjs";
 import ne from "./ToolBar/index.mjs";
-import { TableContext as oe } from "../BitzTableProvider/index.mjs";
+import oe, { TableContext as ie } from "../BitzTableProvider/index.mjs";
 import re from "./TableSkeleton/index.mjs";
-import { columnSort as ie, genColumnKey as w } from "../BitzTableProvider/utils/index.mjs";
+import { columnSort as te, genColumnKey as N } from "../BitzTableProvider/utils/index.mjs";
 import "./index.less.mjs";
-import te from "../../node_modules/lodash-es/at.mjs";
-const ze = ({
-  tableItemEmit: N = () => {
+import ae from "../../node_modules/lodash-es/at.mjs";
+const xe = ({
+  tableItemEmit: h = () => {
   },
   showPagination: B = !0,
   dataSource: l = [],
-  total: f = 0,
+  total: d = 0,
   columns: t,
   loading: x = !1,
   skeletonNum: z = 2,
-  skeletonRender: m,
-  skeletonRowNum: M = 4,
+  skeletonRender: j,
+  skeletonRowNum: L = 4,
   skeletonRowsWidth: T = ["35%", "100%", "100%", "60%"],
   tableOperationEmit: u = () => {
   },
-  mobileLoadEmit: y = () => {
+  mobileLoadEmit: M = () => {
   },
-  mobileRefreshEmit: L = () => {
+  mobileRefreshEmit: y = () => {
   },
   operations: C = [],
   paginationEmit: k = () => {
@@ -39,30 +39,30 @@ const ze = ({
   noDataImg: A,
   color: D,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  size: j,
-  pagination: ae = !1,
+  size: b,
+  pagination: ce = !1,
   showTableTool: O = !0,
-  tableAction: $,
-  tableToolbar: P,
+  tableAction: P,
+  tableToolbar: $,
   resetPage: _,
   ...a
 }) => {
-  const i = X(oe), [H, d] = g(!1), [W, q] = g({}), G = h(() => (l == null ? void 0 : l.length) == f && (l == null ? void 0 : l.length) > 0, [l, f]), J = (s) => {
-    d(!0), q(s), N(s);
-  }, b = () => {
-    d(!1);
-  }, Q = (s) => {
-    d(!1), u(s.type, W);
-  }, c = h(() => {
-    const s = (r) => r.map((o) => {
-      const V = w((o == null ? void 0 : o.key) || (o == null ? void 0 : o.dataIndex), o.index), p = i.columnsMap[V];
-      return p && p.show === !1 ? !1 : o.children ? {
+  const r = X(ie), [H, m] = p(!1), [V, W] = p({}), q = f(() => (l == null ? void 0 : l.length) == d && (l == null ? void 0 : l.length) > 0, [l, d]), G = (s) => {
+    m(!0), W(s), h(s);
+  }, g = () => {
+    m(!1);
+  }, J = (s) => {
+    m(!1), u(s.type, V);
+  }, c = f(() => {
+    const s = (i) => i.map((o) => {
+      const U = N((o == null ? void 0 : o.key) || (o == null ? void 0 : o.dataIndex), o.index), v = r.columnList[U];
+      return v && v.show === !1 ? !1 : o.children ? {
         ...o,
         children: s(o.children)
       } : o;
     }).filter(Boolean);
-    return s(t).sort(ie(i.columnsMap));
-  }, [i.columnsMap, t]), R = h(() => {
+    return s(t).sort(te(r.columnList));
+  }, [r.columnList, t]), Q = f(() => {
     if (a != null && a.rowSelection)
       return {
         ...a.rowSelection,
@@ -74,23 +74,26 @@ const ze = ({
     if (t && t.length > 0) {
       const s = t.map((n) => (
         // @ts-ignore
-        w((n == null ? void 0 : n.key) ?? (n == null ? void 0 : n.dataIndex), n == null ? void 0 : n.dataIndex)
+        N((n == null ? void 0 : n.key) ?? (n == null ? void 0 : n.dataIndex), n == null ? void 0 : n.dataIndex)
       ));
-      i.setSortKeyColumns(s);
+      r.setSortKeyColumns(s);
     }
   }, [t]);
-  const U = h(() => `${j ?? (i == null ? void 0 : i.tableSize) ?? "lg"}BitzTable`, [j, i.tableSize]);
-  return e.jsxs("div", { className: "bitzTableBlock", children: [!v && e.jsxs("div", { className: `bitzTableContainer ${U}`, children: [O && e.jsx(ne, { tableAction: $, tableToolbar: P }), x ? e.jsx(re, { columns: c, dataLength: l == null ? void 0 : l.length }) : e.jsx(Z, { columns: c, dataSource: l, pagination: {
+  const R = f(() => `${b ?? (r == null ? void 0 : r.tableSize) ?? "lg"}BitzTable`, [b, r.tableSize]);
+  return e.jsxs("div", { className: "bitzTableBlock", children: [!w && e.jsxs("div", { className: `bitzTableContainer ${R}`, children: [O && e.jsx(ne, { tableAction: P, tableToolbar: $ }), x ? e.jsx(re, { columns: c, dataLength: l == null ? void 0 : l.length }) : e.jsx(Z, { columns: c, dataSource: l, pagination: {
     showTotal: (s) => e.jsx(e.Fragment, { children: s })
-  }, loading: x, size: "large", rowSelection: R, scroll: { x: 1e3 }, ...a }), B && e.jsx(se, { total: f, dataSource: l, resetPage: _, paginationEmit: k })] }), v && e.jsxs(e.Fragment, { children: [(x || (l == null ? void 0 : l.length) > 0) && e.jsx(ee, { color: D, height: F, showNoMore: G, refreshEmit: L, loadEmit: y, extra: e.jsxs("div", { className: "mobileTable", children: [l == null ? void 0 : l.map((s, n) => e.jsxs("div", { children: [e.jsx("div", { className: "rowBox", children: c == null ? void 0 : c.map((r, o) => e.jsx("div", { children: !(r != null && r.mobileHide) && e.jsxs("div", { className: "row", onClick: () => {
-    J(s);
-  }, children: [e.jsxs("div", { className: "label", children: [r.title, "："] }), e.jsx("div", { className: "value", children: r.render(te(s, r == null ? void 0 : r.dataIndex), s, n) })] }) }, o)) }), e.jsx("div", { className: "rowBoxLine" })] }, n)), x && Array.from({ length: z }).map((s, n) => e.jsxs("div", { children: [e.jsx("div", { className: "rowBox", children: m ? m() : e.jsx(I, { title: !1, paragraph: {
-    rows: M,
+  }, loading: x, size: "large", rowSelection: Q, scroll: { x: 1e3 }, ...a }), B && e.jsx(se, { total: d, dataSource: l, resetPage: _, paginationEmit: k })] }), w && e.jsxs(e.Fragment, { children: [(x || (l == null ? void 0 : l.length) > 0) && e.jsx(ee, { color: D, height: F, showNoMore: q, refreshEmit: y, loadEmit: M, extra: e.jsxs("div", { className: "mobileTable", children: [l == null ? void 0 : l.map((s, n) => e.jsxs("div", { children: [e.jsx("div", { className: "rowBox", children: c == null ? void 0 : c.map((i, o) => e.jsx("div", { children: !(i != null && i.mobileHide) && e.jsxs("div", { className: "row", onClick: () => {
+    G(s);
+  }, children: [e.jsxs("div", { className: "label", children: [i.title, "："] }), e.jsx("div", { className: "value", children: i.render(ae(s, i == null ? void 0 : i.dataIndex), s, n) })] }) }, o)) }), e.jsx("div", { className: "rowBoxLine" })] }, n)), x && Array.from({ length: z }).map((s, n) => e.jsxs("div", { children: [e.jsx("div", { className: "rowBox", children: j ? j() : e.jsx(I, { title: !1, paragraph: {
+    rows: L,
     width: T
-  }, active: !0 }) }), e.jsx("div", { className: "rowBoxLine" })] }, n)), e.jsx(S, { className: "tableMobileDrawer", open: H, placement: "bottom", height: "auto", closable: !1, onClose: b, children: e.jsxs("div", { className: "drawerBox", children: [e.jsx("div", { className: "boxBody", children: C.map((s, n) => e.jsx("div", { className: "operaList", onClick: () => {
-    Q(s);
-  }, children: s.label }, n)) }), e.jsx("div", { className: "boxLine" }), e.jsx("div", { className: "boxFooter", onClick: b, children: E })] }) })] }) }), !x && e.jsx(le, { data: l, title: K, img: A })] })] });
-};
+  }, active: !0 }) }), e.jsx("div", { className: "rowBoxLine" })] }, n)), e.jsx(S, { className: "tableMobileDrawer", open: H, placement: "bottom", height: "auto", closable: !1, onClose: g, children: e.jsxs("div", { className: "drawerBox", children: [e.jsx("div", { className: "boxBody", children: C.map((s, n) => e.jsx("div", { className: "operaList", onClick: () => {
+    J(s);
+  }, children: s.label }, n)) }), e.jsx("div", { className: "boxLine" }), e.jsx("div", { className: "boxFooter", onClick: g, children: E })] }) })] }) }), !x && e.jsx(le, { data: l, title: K, img: A })] })] });
+}, Te = (h) => (
+  // @ts-ignore
+  e.jsx(oe, { initValue: h, children: e.jsx(xe, { ...h }) })
+);
 export {
-  ze as default
+  Te as default
 };

package/dist/components/BitzTableActionCol/index.mjs

@@ -1,27 +1,26 @@
-import { j as m } from "../../node_modules/react/jsx-runtime.mjs";
-import w from "../../node_modules/ahooks/es/useSize/index.mjs";
-import { Space as z, Dropdown as C } from "antd";
-import { useRef as N, useMemo as t } from "react";
-import x from "../BitzButton/index.mjs";
-import g from "./style.mjs";
-const S = ({ size: h, actionGroup: e, refInstance: i }) => {
-  {
-    const { wrapSSR: n, editBtnClassName: f, delBtnClassName: r, dropdownBtnClassName: l } = g(h), d = t(() => e != null && e.length ? e.slice(0, 1) : [], [e]), B = t(() => (e == null ? void 0 : e.length) > 1 ? e.slice(1, 2) : [], [e]), c = t(() => (e == null ? void 0 : e.length) > 2 ? [{ label: "更多" }] : [], [e]), j = t(() => (e == null ? void 0 : e.length) > 2 ? e.slice(2, e.length) : [], [e]);
-    return n(m.jsxs(z, { size: 24, ref: i, children: [d.map((s) => m.jsx(x, { type: "text", className: f, onClick: s == null ? void 0 : s.onClick, children: s == null ? void 0 : s.label }, 1)), B.map((s) => m.jsx(x, { type: "text", className: r, onClick: s == null ? void 0 : s.onClick, children: s == null ? void 0 : s.label }, 2)), c.map((s) => m.jsx(C, { menu: { items: j }, children: m.jsx(x, { type: "text", className: l, children: s == null ? void 0 : s.label }, 3) }, 5))] }));
-  }
+import { j as t } from "../../node_modules/react/jsx-runtime.mjs";
+import o from "../../node_modules/ahooks/es/useSize/index.mjs";
+import { Flex as N, Space as C, Skeleton as k, Dropdown as y } from "antd";
+import { useContext as w, useRef as R, useMemo as m } from "react";
+import j from "../BitzButton/index.mjs";
+import { TableContext as z } from "../BitzTableProvider/index.mjs";
+import B from "./style.mjs";
+const T = ({ actionGroup: e, refInstance: f }) => {
+  const { tableSize: l = "lg" } = w(z), { gap: h, wrapSSR: a } = B(l), { editBtnClassName: d, delBtnClassName: i, dropdownBtnClassName: g } = B(l), n = m(() => e != null && e.length ? e.slice(0, 1) : [], [e]), r = m(() => (e == null ? void 0 : e.length) > 1 ? e.slice(1, 2) : [], [e]), x = m(() => (e == null ? void 0 : e.length) > 2 ? [{ label: "更多" }] : [], [e]), c = m(() => (e == null ? void 0 : e.length) > 2 ? e.slice(2, e.length) : [], [e]);
+  return a(t.jsxs(C, { size: h, ref: f, children: [n.map((s) => t.jsx(j, { type: "text", className: d, onClick: s == null ? void 0 : s.onClick, children: s == null ? void 0 : s.label }, 1)), r.map((s) => t.jsx(j, { type: "text", className: i, onClick: s == null ? void 0 : s.onClick, children: s == null ? void 0 : s.label }, 2)), x.map((s) => t.jsx(y, { menu: { items: c }, children: t.jsx(j, { type: "text", className: g, children: s == null ? void 0 : s.label }, 3) }, 5))] }));
 };
-function k(h) {
-  return (e) => {
-    const { size: i, actionGroup: n, ...f } = e, r = N(null), l = w(r), d = t(() => l != null && l.width ? l.width + 48 + 1 : 200, [l]);
-    return t(() => ({
-      width: d,
-      render: () => m.jsx(h, { size: i, actionGroup: n, refInstance: r }),
-      ...f
-    }), [d]);
+function A(e) {
+  return (f) => {
+    const { actionGroup: l, loading: h, ...a } = f, { tableSize: d = "lg" } = w(z), { gap: i, sizeMap: g } = B(d), n = R(null), r = o(n), x = m(() => r != null && r.width ? r.width + i * 2 + 1 : 181, [r, i]), c = m(() => h ? t.jsx(N, { children: t.jsx(C, { size: i, ref: n, children: l == null ? void 0 : l.slice(0, l.length >= 3 ? 3 : l.length).map((v, S) => t.jsx(k, { active: !0, title: !1, paragraph: { rows: 1, width: g[d] * 2 } }, S)) }) }) : t.jsx(e, { actionGroup: l, refInstance: n }), [h, n, d, l]);
+    return m(() => ({
+      width: x,
+      render: () => c,
+      ...a
+    }), [x, c]);
   };
 }
-const E = k(S);
+const H = A(T);
 export {
-  S as BitzTableAction,
-  E as default
+  T as BitzTableAction,
+  H as default
 };

package/dist/components/BitzTableActionCol/style.mjs

@@ -1,7 +1,7 @@
-import { useContext as C, useMemo as v } from "react";
-import { theme as w } from "antd";
+import { theme as v } from "antd";
 import "../../node_modules/@ant-design/cssinjs/es/extractStyle.mjs";
 import "../../node_modules/@ant-design/cssinjs/es/hooks/useCacheToken.mjs";
+import "react";
 import "../../node_modules/@ant-design/cssinjs/es/StyleContext.mjs";
 import "../../node_modules/@ant-design/cssinjs/es/theme/createTheme.mjs";
 import "../../node_modules/rc-util/es/warning.mjs";
@@ -9,12 +9,17 @@ import "../../node_modules/@ant-design/cssinjs/es/theme/ThemeCache.mjs";
 import "../../node_modules/@ant-design/cssinjs/es/hooks/useCompatibleInsertionEffect.mjs";
 import "../../node_modules/@ant-design/cssinjs/es/hooks/useEffectCleanupRegister.mjs";
 import "../../node_modules/@ant-design/cssinjs/es/hooks/useHMR.mjs";
-import x from "../../node_modules/@ant-design/cssinjs/es/hooks/useStyleRegister.mjs";
+import b from "../../node_modules/@ant-design/cssinjs/es/hooks/useStyleRegister.mjs";
 import "../../node_modules/@ant-design/cssinjs/es/transformers/legacyLogicalProperties.mjs";
-import { TableContext as T } from "../BitzTableProvider/index.mjs";
-import a from "../../node_modules/classnames/index.mjs";
-const K = (p) => {
-  const { theme: g, hashId: e, token: n } = w.useToken(), { tableSize: d } = C(T), h = v(() => p ?? d ?? "lg", [p, d]), i = "ActionTextBtn", r = "actionTextBtn", m = "editBtn", s = "delBtn", c = "dropdownBtn", S = (t, o) => [
+import p from "../../node_modules/classnames/index.mjs";
+const j = (d) => {
+  const { theme: g, hashId: e, token: s } = v.useToken(), i = "ActionTextBtn", n = "actionTextBtn", m = "editBtn", l = "delBtn", c = "dropdownBtn", r = {
+    xl: 14,
+    lg: 12,
+    md: 12,
+    sm: 11,
+    xs: 11
+  }, h = 24, B = (t, o) => [
     {
       [`.${t}`]: {
         padding: 0,
@@ -27,12 +32,12 @@ const K = (p) => {
         }
       }
     },
-    { [`.xl${o}`]: { fontSize: 14 } },
-    { [`.lg${o}`]: { fontSize: 12 } },
-    { [`.md${o}`]: { fontSize: 12 } },
-    { [`.sm${o}`]: { fontSize: 11 } },
-    { [`.xs${o}`]: { fontSize: 11 } }
-  ], B = (t, o) => [
+    { [`.xl${o}`]: { fontSize: r.xl } },
+    { [`.lg${o}`]: { fontSize: r.lg } },
+    { [`.md${o}`]: { fontSize: r.md } },
+    { [`.sm${o}`]: { fontSize: r.sm } },
+    { [`.xs${o}`]: { fontSize: r.xs } }
+  ], $ = (t, o) => [
     {
       [`.${t}`]: {
         color: o.colorPrimary,
@@ -41,7 +46,7 @@ const K = (p) => {
         }
       }
     }
-  ], $ = (t, o) => [
+  ], S = (t, o) => [
     {
       [`.${t}`]: {
         color: o.colorError,
@@ -62,19 +67,19 @@ const K = (p) => {
         }
       }
     }
-  ], f = x({
+  ], y = b({
     theme: g,
-    token: n,
+    token: s,
     hashId: e,
-    path: [r, i, m, s, c]
+    path: [n, i, m, l, c]
   }, () => [
-    S(r, i),
-    B(m, n),
-    $(s, n),
-    u(c, n)
-  ]), l = `${h}${i}`, y = a(r, m, l, e), b = a(r, s, l, e), z = a(r, c, l, e);
-  return { wrapSSR: f, editBtnClassName: y, delBtnClassName: b, dropdownBtnClassName: z };
+    B(n, i),
+    $(m, s),
+    S(l, s),
+    u(c, s)
+  ]), a = `${d}${i}`, x = p(n, m, a, e), z = p(n, l, a, e), f = p(n, c, a, e);
+  return { sizeMap: r, gap: h, wrapSSR: y, editBtnClassName: x, delBtnClassName: z, dropdownBtnClassName: f };
 };
 export {
-  K as default
+  j as default
 };

package/dist/components/BitzTableProvider/index.mjs

@@ -1,27 +1,27 @@
-import { j as O } from "../../node_modules/react/jsx-runtime.mjs";
+import { j as N } from "../../node_modules/react/jsx-runtime.mjs";
 import T from "../../hooks/useMergedState.mjs";
-import { createContext as b, useRef as J, useMemo as N, useEffect as v, useCallback as j } from "react";
-import { genColumnKey as I } from "./utils/index.mjs";
+import { createContext as j, useRef as I, useMemo as E, useState as P, useEffect as v, useCallback as L } from "react";
+import { genColumnKey as R } from "./utils/index.mjs";
 import M from "../../node_modules/lodash-es/merge.mjs";
-function E(e = {}) {
+function k(e = {}) {
   var y, w, C, K, h, g;
-  const o = J([]), [x, z] = T(() => e.size || e.defaultSize || "lg", {
+  const o = I([]), { defaultSize: x = "lg" } = e, [z, O] = T(() => e.size ?? x, {
     value: e.size,
     onChange: e.onSizeChange
-  }), m = N(() => {
+  }), m = E(() => {
     var u, t;
     if ((u = e == null ? void 0 : e.columnsState) != null && u.defaultValue)
       return e.columnsState.defaultValue;
     const n = {};
     return (t = e.columns) == null || t.forEach(({ key: c, dataIndex: l, fixed: a, disable: i }, s) => {
-      const V = I(c ?? l, s);
+      const V = R(c ?? l, s);
       V && (n[V] = {
         show: !0,
         fixed: a,
         disable: i
       });
     }), n;
-  }, [e.columns]), [f, r] = T(() => {
+  }, [e.columns]), [b, J] = P({}), [f, r] = T(() => {
     var t, c, l, a;
     const { persistenceType: n, persistenceKey: u } = e.columnsState || {};
     if (u && n && typeof window < "u") {
@@ -56,7 +56,7 @@ function E(e = {}) {
     (K = e.columnsState) == null ? void 0 : K.persistenceType,
     m
   ]);
-  const S = j(() => {
+  const S = L(() => {
     const { persistenceType: n, persistenceKey: u } = e.columnsState || {};
     if (!u || !n || typeof window > "u")
       return;
@@ -87,10 +87,12 @@ function E(e = {}) {
     setSortKeyColumns: (n) => {
       o.current = n;
     },
+    columnList: b,
+    setColumnList: J,
     columnsMap: f,
     setColumnsMap: r,
-    setTableSize: z,
-    tableSize: x,
+    setTableSize: O,
+    tableSize: z,
     columns: e.columns,
     clearPersistenceStorage: S,
     defaultColumnKeyMap: m
@@ -99,11 +101,11 @@ function E(e = {}) {
     get: () => o.current
   }), d;
 }
-const P = b({}), D = (e) => {
-  const o = E(e.initValue);
-  return O.jsx(P.Provider, { value: o, children: e.children });
+const q = j({}), H = (e) => {
+  const o = k(e.initValue);
+  return N.jsx(q.Provider, { value: o, children: e.children });
 };
 export {
-  P as TableContext,
-  D as default
+  q as TableContext,
+  H as default
 };

package/dist/components/BitzTableToolBar/ColumnSetting/ColumnSettingModal.mjs

@@ -1,90 +1,94 @@
 import { j as s } from "../../../node_modules/react/jsx-runtime.mjs";
-import { create as V, useModal as W, antdModalV5 as q } from "@ebay/nice-modal-react";
-import { Modal as z, Checkbox as G } from "antd";
-import o from "./index.module.less.mjs";
-import { useState as H, useContext as J, useCallback as A, useMemo as p } from "react";
-import { TableContext as Q } from "../../BitzTableProvider/index.mjs";
-import { genColumnKey as w, columnSort as U } from "../../BitzTableProvider/utils/index.mjs";
-import I from "../../../node_modules/classnames/index.mjs";
-import { DndContext as X, DragOverlay as Y, defaultDropAnimationSideEffects as Z } from "../../../node_modules/@dnd-kit/core/dist/core.esm.mjs";
-import { SortableContext as _, verticalListSortingStrategy as $, arrayMove as L } from "../../../node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
-import P from "./DndItem.mjs";
-import { restrictToVerticalAxis as ee, restrictToWindowEdges as se } from "../../../node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
-import B from "../../../node_modules/lodash-es/omit.mjs";
-import le from "../../../node_modules/@ant-design/icons/es/icons/RedoOutlined.mjs";
-import te from "../../../node_modules/@ant-design/icons/es/icons/DragOutlined.mjs";
-const oe = {
-  sideEffects: Z({
+import { create as G, useModal as H, antdModalV5 as J } from "@ebay/nice-modal-react";
+import { Modal as P, Checkbox as Q } from "antd";
+import t from "./index.module.less.mjs";
+import { useState as U, useContext as X, useCallback as I, useMemo as j } from "react";
+import { TableContext as Y } from "../../BitzTableProvider/index.mjs";
+import { genColumnKey as B, columnSort as Z } from "../../BitzTableProvider/utils/index.mjs";
+import g from "../../../node_modules/classnames/index.mjs";
+import { DndContext as _, DragOverlay as $, defaultDropAnimationSideEffects as ee } from "../../../node_modules/@dnd-kit/core/dist/core.esm.mjs";
+import { SortableContext as se, verticalListSortingStrategy as le, arrayMove as oe } from "../../../node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
+import te from "./DndItem.mjs";
+import { restrictToVerticalAxis as ne, restrictToWindowEdges as ae } from "../../../node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
+import K from "../../../node_modules/lodash-es/omit.mjs";
+import ce from "../../../node_modules/@ant-design/icons/es/icons/RedoOutlined.mjs";
+import ie from "../../../node_modules/@ant-design/icons/es/icons/DragOutlined.mjs";
+const de = {
+  sideEffects: ee({
     styles: {
       active: {
         opacity: "0.5"
       }
     }
   })
-}, ye = V(() => {
-  var C;
-  const g = W(), [u, j] = H(null), { columnsMap: r, setColumnsMap: b, sortKeyColumns: x, setSortKeyColumns: K, clearPersistenceStorage: v, ...t } = J(Q), F = A(() => {
-    v == null || v(), b(t.defaultColumnKeyMap);
-  }, []), h = p(() => {
-    var l, a;
+}, De = G(() => {
+  var S;
+  const v = H(), C = J(v), [u, b] = U(null), { columnList: F, setColumnList: O, columnsMap: i, setColumnsMap: p, sortKeyColumns: x, setSortKeyColumns: T, clearPersistenceStorage: y, ...o } = X(Y), R = I(() => {
+    y == null || y(), p(o.defaultColumnKeyMap);
+  }, []), h = j(() => {
+    var l, n;
     const e = [];
-    return (l = t == null ? void 0 : t.columns) != null && l.length && ((a = t == null ? void 0 : t.columns) == null || a.map(({ key: m, dataIndex: n, ...i }) => {
-      const f = w(m || n, [m || n].filter(Boolean).join("-")), d = r[f || "null"];
-      return (d == null ? void 0 : d.show) !== !1 && e.push({
+    return (l = o == null ? void 0 : o.columns) != null && l.length && ((n = o == null ? void 0 : o.columns) == null || n.map(({ key: m, dataIndex: a, ...d }) => {
+      const f = B(m || a, [m || a].filter(Boolean).join("-")), r = i[f || "null"];
+      return (r == null ? void 0 : r.show) !== !1 && e.push({
         key: f,
-        ...B(i, ["className"]),
+        ...K(d, ["className"]),
         selectable: !1,
-        disabled: (d == null ? void 0 : d.disable) === !0
-      }), d;
-    })), e.sort(U(r));
-  }, [r, t == null ? void 0 : t.columns]), y = A((e) => x == null ? void 0 : x.findIndex((l) => l === e), [x]), k = p(() => u ? y(u) : -1, [u, y]), E = p(() => {
+        disabled: (r == null ? void 0 : r.disable) === !0
+      }), r;
+    })), e.sort(Z(i));
+  }, [i, o == null ? void 0 : o.columns]), k = I((e) => x == null ? void 0 : x.findIndex((l) => l === e), [x]), E = j(() => u ? k(u) : -1, [u, k]), D = j(() => {
     const e = [], l = /* @__PURE__ */ new Map();
-    return { list: ((m, n) => m.map(({ key: i, dataIndex: f, children: d, ...D }) => {
-      var M;
-      const N = w(i || f, [n == null ? void 0 : n.columnKey, D.index].filter(Boolean).join("-")), c = r[N || "null"] || { show: !0 };
-      (c == null ? void 0 : c.show) !== !1 && !d && e.push(N);
-      const S = {
+    return { list: ((m, a) => m.map(({ key: d, dataIndex: f, children: r, ...M }) => {
+      var w;
+      const N = B(d || f, [a == null ? void 0 : a.columnKey, M.index].filter(Boolean).join("-")), c = i[N || "null"] || { show: !0 };
+      (c == null ? void 0 : c.show) !== !1 && !r && e.push(N);
+      const A = {
         key: N,
-        ...B(D, ["className"]),
+        ...K(M, ["className"]),
         selectable: !1,
         disabled: c.disable === !0,
-        disableCheckbox: typeof c.disable == "boolean" ? c == null ? void 0 : c.disable : (M = c == null ? void 0 : c.disable) == null ? void 0 : M.checkbox,
-        isLeaf: n ? !0 : void 0
+        disableCheckbox: typeof c.disable == "boolean" ? c == null ? void 0 : c.disable : (w = c == null ? void 0 : c.disable) == null ? void 0 : w.checkbox,
+        isLeaf: a ? !0 : void 0
       };
-      return l.set(i, S), S;
-    }))(t == null ? void 0 : t.columns), keys: e, map: l };
-  }, [r, t == null ? void 0 : t.columns]), O = (e, l) => {
-    const a = { ...r };
-    ((n) => {
-      const i = { ...a[n] };
-      i.show = !e, a[n] = i;
-    })(l.key), b({ ...a });
-  }, T = (e, l) => {
-    const a = { ...r }, m = L(x, e, l);
-    m.forEach((n, i) => {
-      a[n] = { ...a[n] || {}, order: i };
-    }), b(a), K(m);
-  }, R = p(() => {
+      return l.set(d, A), A;
+    }))(o == null ? void 0 : o.columns), keys: e, map: l };
+  }, [i, o == null ? void 0 : o.columns]), V = (e, l) => {
+    const n = { ...i };
+    ((a) => {
+      const d = { ...n[a] };
+      d.show = !e, n[a] = d;
+    })(l.key), p({ ...n });
+  }, L = (e, l) => {
+    const n = { ...i }, m = oe(x, e, l);
+    m.forEach((a, d) => {
+      n[a] = { ...n[a] || {}, order: d };
+    }), p(n), T(m);
+  }, W = j(() => {
     var e, l;
-    return u ? ((l = (e = t == null ? void 0 : t.columns) == null ? void 0 : e.find((a) => a.key === u)) == null ? void 0 : l.title) ?? "" : "";
-  }, [t == null ? void 0 : t.columns, u, r, x]);
-  return s.jsxs(z, { title: "自定义列", ...q(g), width: 600, footer: !1, children: [s.jsx("div", { className: o.introduce, children: "选择要在表中显示的可用列。拖动选定的列以对其重新排序。" }), s.jsxs("div", { className: o.contaiern, children: [s.jsxs("div", { className: o.block, children: [s.jsxs("div", { className: o.header, children: [s.jsx("div", { className: o.title, children: "可用列" }), s.jsx("div", {})] }), s.jsx("div", { className: o.body, children: s.jsx("ul", { className: o.content, children: (C = E.list) == null ? void 0 : C.map((e) => {
-    const l = E.keys.includes(e.key);
-    return s.jsxs("li", { className: I(o.item, {
-      [o.checked]: !l
-    }), onClick: () => !e.disabled && O(l, e), children: [s.jsx(G, { checked: l, disabled: e.disabled }), s.jsx("span", { className: o["content-item-text"], children: e.title })] }, e.key);
-  }) }) })] }), s.jsxs("div", { className: o.block, children: [s.jsxs("div", { className: o.header, children: [s.jsx("div", { className: o.title, children: "选定的列" }), s.jsxs("div", { className: o.reset, onClick: F, children: [s.jsx("div", { children: "重置  " }), s.jsx(le, {})] })] }), s.jsx("div", { className: o.body, children: s.jsxs(X, { modifiers: [ee, se], onDragStart: (e) => {
+    return u ? ((l = (e = o == null ? void 0 : o.columns) == null ? void 0 : e.find((n) => n.key === u)) == null ? void 0 : l.title) ?? "" : "";
+  }, [o == null ? void 0 : o.columns, u, i, x]), q = () => {
+    O({ ...i }), v.resolve({ ...i }), v.hide();
+  }, z = () => {
+    p({ ...F }), C.onCancel();
+  };
+  return s.jsxs(P, { title: "自定义列", ...C, width: 600, onOk: q, onCancel: z, children: [s.jsx("div", { className: t.introduce, children: "选择要在表中显示的可用列。拖动选定的列以对其重新排序。" }), s.jsxs("div", { className: t.contaiern, children: [s.jsxs("div", { className: t.block, children: [s.jsxs("div", { className: t.header, children: [s.jsx("div", { className: t.title, children: "可用列" }), s.jsx("div", {})] }), s.jsx("div", { className: t.body, children: s.jsx("ul", { className: t.content, children: (S = D.list) == null ? void 0 : S.map((e) => {
+    const l = D.keys.includes(e.key);
+    return s.jsxs("li", { className: g(t.item, {
+      [t.checked]: !l
+    }), onClick: () => !e.disabled && V(l, e), children: [s.jsx(Q, { checked: l, disabled: e.disabled }), s.jsx("span", { className: t["content-item-text"], children: e.title })] }, e.key);
+  }) }) })] }), s.jsxs("div", { className: t.block, children: [s.jsxs("div", { className: t.header, children: [s.jsx("div", { className: t.title, children: "选定的列" }), s.jsxs("div", { className: t.reset, onClick: R, children: [s.jsx("div", { children: "重置  " }), s.jsx(ce, {})] })] }), s.jsx("div", { className: t.body, children: s.jsxs(_, { modifiers: [ne, ae], onDragStart: (e) => {
     const { active: l } = e;
-    l && j(l == null ? void 0 : l.id);
-  }, onDragCancel: () => j(null), onDragEnd: (e) => {
-    j(null);
+    l && b(l == null ? void 0 : l.id);
+  }, onDragCancel: () => b(null), onDragEnd: (e) => {
+    b(null);
     const { over: l } = e;
     if (l) {
-      const a = y(l.id);
-      k !== a && T(k, a);
+      const n = k(l.id);
+      E !== n && L(E, n);
     }
-  }, children: [s.jsx(_, { items: h == null ? void 0 : h.map((e) => e.key), strategy: $, children: s.jsx("ul", { className: o.content, style: { background: "#fff" }, children: h == null ? void 0 : h.map((e) => s.jsx(P, { item: e }, e.key)) }) }), s.jsx(Y, { adjustScale: !1, dropAnimation: oe, children: u ? s.jsxs("li", { className: I(o.moveItem), children: [s.jsx(te, { className: o.dragIcon }), s.jsx("span", { className: o["moveItem-text"], children: R })] }) : null })] }) })] })] })] });
+  }, children: [s.jsx(se, { items: h == null ? void 0 : h.map((e) => e.key), strategy: le, children: s.jsx("ul", { className: t.content, style: { background: "#fff" }, children: h == null ? void 0 : h.map((e) => s.jsx(te, { item: e }, e.key)) }) }), s.jsx($, { adjustScale: !1, dropAnimation: de, children: u ? s.jsxs("li", { className: g(t.moveItem), children: [s.jsx(ie, { className: t.dragIcon }), s.jsx("span", { className: t["moveItem-text"], children: W })] }) : null })] }) })] })] })] });
 });
 export {
-  ye as default
+  De as default
 };