bitz-react-admin-ui 1.7.6 → 1.7.8

package/dist/components/BitzTable/ToolBar/ColConfigIcon/ColumnSettingModal.mjs

@@ -1,121 +1,124 @@
 import { j as o } from "../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { create as Z, useModal as L, antdModalV5 as ee } from "@ebay/nice-modal-react";
-import { Modal as oe, Typography as se, Checkbox as te, Button as le } from "antd";
+import { create as oe, useModal as se, antdModalV5 as te } from "@ebay/nice-modal-react";
+import { Modal as le, Typography as ne, Checkbox as re, Button as ae } from "antd";
 import r from "./index.module.less.mjs";
-import { useState as R, useContext as ne, useEffect as re, useCallback as A, useMemo as C } from "react";
-import { TableContext as ae } from "../../Store/index.mjs";
-import { genColumnKey as O, columnSort as ce } from "../../Store/utils/index.mjs";
+import { useState as N, useContext as ce, useEffect as ie, useCallback as V, useMemo as M } from "react";
+import { TableContext as me } from "../../Store/index.mjs";
+import { genColumnKey as F, columnSort as de } from "../../Store/utils/index.mjs";
 import p from "../../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
-import { DndContext as ie } from "../../../../node_modules/.store/@dnd-kit_core@6.1.0/node_modules/@dnd-kit/core/dist/core.esm.mjs";
-import { SortableContext as me, verticalListSortingStrategy as de, arrayMove as ue } from "../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
-import pe from "./DndItem.mjs";
-import { restrictToVerticalAxis as he, restrictToWindowEdges as xe } from "../../../../node_modules/.store/@dnd-kit_modifiers@6.0.1/node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
-import V from "../../../BitzButton/index.mjs";
-import { useImmer as be } from "../../../../node_modules/.store/use-immer@0.9.0/node_modules/use-immer/dist/use-immer.module.mjs";
-import { css as ye } from "../../../../node_modules/.store/@emotion_css@11.11.2/node_modules/@emotion/css/dist/emotion-css.esm.mjs";
-import fe from "../../../BitzTheme/index.mjs";
+import { DndContext as ue } from "../../../../node_modules/.store/@dnd-kit_core@6.1.0/node_modules/@dnd-kit/core/dist/core.esm.mjs";
+import { SortableContext as pe, verticalListSortingStrategy as he, arrayMove as xe } from "../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
+import fe from "./DndItem.mjs";
+import { restrictToVerticalAxis as be, restrictToWindowEdges as ye } from "../../../../node_modules/.store/@dnd-kit_modifiers@6.0.1/node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
+import P from "../../../BitzButton/index.mjs";
+import { useImmer as Ce } from "../../../../node_modules/.store/use-immer@0.9.0/node_modules/use-immer/dist/use-immer.module.mjs";
+import { css as Me } from "../../../../node_modules/.store/@emotion_css@11.11.2/node_modules/@emotion/css/dist/emotion-css.esm.mjs";
+import je from "../../../BitzTheme/index.mjs";
 import "./index.less.mjs";
-import F from "../../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/omit.mjs";
-import Ce from "../../../../node_modules/.store/@ant-design_icons@5.3.3/node_modules/@ant-design/icons/es/icons/CheckCircleOutlined.mjs";
-import Me from "../../../../node_modules/.store/@ant-design_icons@5.3.3/node_modules/@ant-design/icons/es/icons/RedoOutlined.mjs";
-const Fe = Z(() => {
-  var T, D, I, _;
-  const { token: i } = fe.useToken(), b = L(), [M, j] = R(null), [P, S] = R(!1), [a, y] = be({
+import W from "../../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/omit.mjs";
+import ke from "../../../../node_modules/.store/@ant-design_icons@5.3.3/node_modules/@ant-design/icons/es/icons/CheckCircleOutlined.mjs";
+import ge from "../../../../node_modules/.store/@ant-design_icons@5.3.3/node_modules/@ant-design/icons/es/icons/RedoOutlined.mjs";
+const $e = oe(({ onChange: f }) => {
+  var _, E, z, H;
+  const { token: i } = je.useToken(), b = se(), [j, k] = N(null), [$, K] = N(!1), [q, w] = N(!1), [a, y] = Ce({
     columnsMap: {},
     sortKeyColumns: []
   }), {
-    persistenceType: W,
-    persistenceKey: N,
+    persistenceType: G,
+    persistenceKey: B,
     onlineChange: g,
-    columnsMap: $,
-    setColumnsMap: q,
-    sortKeyColumns: G,
-    setSortKeyColumns: J,
+    columnsMap: J,
+    setColumnsMap: L,
+    sortKeyColumns: Q,
+    setSortKeyColumns: U,
     // clearPersistenceStorage,
     ...l
-  } = ne(ae);
-  re(() => {
+  } = ce(me);
+  ie(() => {
     y((e) => {
-      e.columnsMap = { ...$ }, e.sortKeyColumns = [...G];
+      e.columnsMap = { ...J }, e.sortKeyColumns = [...Q];
     });
   }, []);
-  const Q = A(() => {
+  const X = V(() => {
     y((e) => {
       e.columnsMap = { ...l.defaultColumnKeyMap };
     });
-  }, []), h = C(() => {
+  }, []), h = M(() => {
     var s, n;
     const e = [];
     return (s = l == null ? void 0 : l.columns) != null && s.length && ((n = l == null ? void 0 : l.columns) == null || n.map(({ key: u, dataIndex: t, ...m }) => {
-      const f = O(
+      const C = F(
         u || t,
         [u || t].filter(Boolean).join("-")
-      ), d = a.columnsMap[f || "null"];
+      ), d = a.columnsMap[C || "null"];
       return (d == null ? void 0 : d.show) !== !1 && e.push({
-        key: f,
-        ...F(m, ["className"]),
+        key: C,
+        ...W(m, ["className"]),
         selectable: !1,
         disabled: (d == null ? void 0 : d.disable) === !0
       }), d;
-    })), e.sort(ce(a.columnsMap));
-  }, [a.columnsMap, l == null ? void 0 : l.columns]), k = A(
+    })), e.sort(de(a.columnsMap));
+  }, [a.columnsMap, l == null ? void 0 : l.columns]), S = V(
     (e) => {
       var s;
       return (s = a.sortKeyColumns) == null ? void 0 : s.findIndex((n) => n === e);
     },
     [a.sortKeyColumns]
-  ), K = C(
-    () => M ? k(M) : -1,
-    [M, k]
-  ), w = C(() => {
+  ), T = M(
+    () => j ? S(j) : -1,
+    [j, S]
+  ), D = M(() => {
     const e = [], s = /* @__PURE__ */ new Map();
-    return { list: ((u, t) => u.map(({ key: m, dataIndex: f, children: d, ...E }) => {
-      var z;
-      const v = O(
-        m || f,
-        [t == null ? void 0 : t.columnKey, E.index].filter(Boolean).join("-")
+    return { list: ((u, t) => u.map(({ key: m, dataIndex: C, children: d, ...R }) => {
+      var O;
+      const v = F(
+        m || C,
+        [t == null ? void 0 : t.columnKey, R.index].filter(Boolean).join("-")
       ), c = a.columnsMap[v || "null"] || { show: !0 };
       (c == null ? void 0 : c.show) !== !1 && !d && e.push(v);
-      const H = {
+      const A = {
         key: v,
-        ...F(E, ["className"]),
+        ...W(R, ["className"]),
         selectable: !1,
         disabled: c.disable === !0,
-        disableCheckbox: typeof c.disable == "boolean" ? c == null ? void 0 : c.disable : (z = c == null ? void 0 : c.disable) == null ? void 0 : z.checkbox,
+        disableCheckbox: typeof c.disable == "boolean" ? c == null ? void 0 : c.disable : (O = c == null ? void 0 : c.disable) == null ? void 0 : O.checkbox,
         isLeaf: t ? !0 : void 0
       };
-      return s.set(m, H), H;
+      return s.set(m, A), A;
     }))(l == null ? void 0 : l.columns), keys: e, map: s };
-  }, [a.columnsMap, l == null ? void 0 : l.columns]), U = (e, s) => {
+  }, [a.columnsMap, l == null ? void 0 : l.columns]), Y = (e, s) => {
     const n = { ...a.columnsMap };
     ((t) => {
       const m = { ...n[t] };
       m.show = !e, n[t] = m;
-    })(s.key), S(!0), y((t) => {
+    })(s.key), w(!0), y((t) => {
       t.columnsMap = { ...n };
     });
-  }, X = (e, s) => {
-    const n = { ...a.columnsMap }, u = ue(a.sortKeyColumns, e, s);
+  }, Z = (e, s) => {
+    const n = { ...a.columnsMap }, u = xe(a.sortKeyColumns, e, s);
     u.forEach((t, m) => {
       n[t] = { ...n[t] || {}, order: m };
-    }), S(!0), y((t) => {
+    }), w(!0), y((t) => {
       t.columnsMap = { ...n }, t.sortKeyColumns = u;
     });
-  }, Y = () => {
-    q(a.columnsMap), J(a.sortKeyColumns), W === "online" && N && (g == null || g(N, a.columnsMap)), b.resolve({ ...a.columnsMap }), b.hide();
-  }, B = () => {
+  }, ee = () => {
+    var e;
+    L(a.columnsMap), U(a.sortKeyColumns), G === "online" && B && (g == null || g(B, a.columnsMap)), f ? (K(!0), (e = f == null ? void 0 : f(a.columnsMap)) == null || e.finally(() => {
+      K(!1), b.hide();
+    })) : b.hide();
+  }, I = () => {
     b.hide();
-  }, x = C(() => i.mode === "dark", [i.mode]);
+  }, x = M(() => i.mode === "dark", [i.mode]);
   return /* @__PURE__ */ o.jsxs(
-    oe,
+    le,
     {
       className: "tableColumnSettingModal",
-      title: /* @__PURE__ */ o.jsx(se.Title, { level: 4, style: { margin: 0 }, children: "自定义列" }),
-      ...ee(b),
+      title: /* @__PURE__ */ o.jsx(ne.Title, { style: { fontSize: 16, margin: 0 }, children: "列设置" }),
+      ...te(b),
       style: {
-        "--modalContent-bgColor": (T = i.Modal) == null ? void 0 : T.contentBg,
-        "--header-bgColor": (D = i.Modal) == null ? void 0 : D.headerBg,
-        "--footer-bgColor": (I = i.Modal) == null ? void 0 : I.footerBg,
+        "--modalContent-bgColor": (_ = i.Modal) == null ? void 0 : _.contentBg,
+        "--header-bgColor": (E = i.Modal) == null ? void 0 : E.headerBg,
+        "--footer-bgColor": (z = i.Modal) == null ? void 0 : z.footerBg,
         "--blockTitle-colorBg": x ? "#333" : "#fff",
         "--leftBody-bgColor": x ? "#262626" : "#e0e0e0",
         "--rightBody-bgColor": x ? "#262626" : "#fff",
@@ -127,19 +130,20 @@ const Fe = Z(() => {
       },
       styles: { body: { maxHeight: window.innerHeight - 300 } },
       width: 600,
-      onCancel: B,
+      onCancel: I,
       footer: /* @__PURE__ */ o.jsxs(o.Fragment, { children: [
         /* @__PURE__ */ o.jsx(
-          V,
+          P,
           {
             type: "primary",
-            icon: /* @__PURE__ */ o.jsx(Ce, {}),
-            onClick: Y,
-            disabled: !P,
+            icon: /* @__PURE__ */ o.jsx(ke, {}),
+            onClick: ee,
+            disabled: !q,
+            loading: $,
             children: "保存"
           }
         ),
-        /* @__PURE__ */ o.jsx(V, { onClick: B, children: "取消" })
+        /* @__PURE__ */ o.jsx(P, { onClick: I, children: "取消" })
       ] }),
       children: [
         /* @__PURE__ */ o.jsx("div", { className: p(r.introduce, "tableColumnSetting_introduce"), children: "选择要在表中显示的可用列。拖动选定的列以对其重新排序。" }),
@@ -154,8 +158,8 @@ const Fe = Z(() => {
                   /* @__PURE__ */ o.jsx("div", { className: p(r.title, "tableColumnSetting_title"), children: "可用列" }),
                   /* @__PURE__ */ o.jsx("div", {})
                 ] }),
-                /* @__PURE__ */ o.jsx("div", { className: p(r.body, "tableColumnSetting_body"), children: /* @__PURE__ */ o.jsx("ul", { className: r.content, children: (_ = w.list) == null ? void 0 : _.map((e) => {
-                  const s = w.keys.includes(e.key);
+                /* @__PURE__ */ o.jsx("div", { className: p(r.body, "tableColumnSetting_body"), children: /* @__PURE__ */ o.jsx("ul", { className: r.content, children: (H = D.list) == null ? void 0 : H.map((e) => {
+                  const s = D.keys.includes(e.key);
                   return /* @__PURE__ */ o.jsxs(
                     "li",
                     {
@@ -163,9 +167,9 @@ const Fe = Z(() => {
                         [r.checked]: !s,
                         tableColumnSetting_checked: !s
                       }),
-                      onClick: () => !e.disabled && U(s, e),
+                      onClick: () => !e.disabled && Y(s, e),
                       children: [
-                        /* @__PURE__ */ o.jsx(te, { checked: s, disabled: e.disabled }),
+                        /* @__PURE__ */ o.jsx(re, { checked: s, disabled: e.disabled }),
                         /* @__PURE__ */ o.jsx(
                           "span",
                           {
@@ -189,13 +193,13 @@ const Fe = Z(() => {
                 /* @__PURE__ */ o.jsxs("div", { className: r.header, children: [
                   /* @__PURE__ */ o.jsx("div", { className: r.title, children: "选定列" }),
                   /* @__PURE__ */ o.jsx(
-                    le,
+                    ae,
                     {
                       type: "link",
-                      icon: /* @__PURE__ */ o.jsx(Me, {}),
+                      icon: /* @__PURE__ */ o.jsx(ge, {}),
                       size: "small",
-                      onClick: Q,
-                      className: ye`
+                      onClick: X,
+                      className: Me`
                 &:hover {
                   color: ${i.colorPrimary} !important;
                 }
@@ -205,28 +209,28 @@ const Fe = Z(() => {
                   )
                 ] }),
                 /* @__PURE__ */ o.jsx("div", { className: p(r.body, "tableColumnSetting_body-order"), children: /* @__PURE__ */ o.jsx(
-                  ie,
+                  ue,
                   {
-                    modifiers: [he, xe],
+                    modifiers: [be, ye],
                     onDragStart: (e) => {
                       const { active: s } = e;
-                      s && j(s == null ? void 0 : s.id);
+                      s && k(s == null ? void 0 : s.id);
                     },
-                    onDragCancel: () => j(null),
+                    onDragCancel: () => k(null),
                     onDragEnd: (e) => {
-                      j(null);
+                      k(null);
                       const { over: s } = e;
                       if (s) {
-                        const n = k(s.id);
-                        K !== n && X(K, n);
+                        const n = S(s.id);
+                        T !== n && Z(T, n);
                       }
                     },
                     children: /* @__PURE__ */ o.jsx(
-                      me,
+                      pe,
                       {
                         items: h == null ? void 0 : h.map((e) => e.key),
-                        strategy: de,
-                        children: /* @__PURE__ */ o.jsx("ul", { className: r.content, children: h == null ? void 0 : h.map((e) => /* @__PURE__ */ o.jsx(pe, { item: e }, e.key)) })
+                        strategy: he,
+                        children: /* @__PURE__ */ o.jsx("ul", { className: r.content, children: h == null ? void 0 : h.map((e) => /* @__PURE__ */ o.jsx(fe, { item: e }, e.key)) })
                       }
                     )
                   }
@@ -240,5 +244,5 @@ const Fe = Z(() => {
   );
 });
 export {
-  Fe as default
+  $e as default
 };

package/dist/components/BitzTable/ToolBar/ColConfigIcon/index.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
+import { BitzTableToolBarProps } from '..';
 interface ColumnSettingProps {
     order?: number;
     show?: boolean;
     icon?: React.ReactNode;
-    onChange?: (columns: any) => void;
+    onChange?: BitzTableToolBarProps['onColumnChange'];
 }
 declare const _default: React.MemoExoticComponent<(props: ColumnSettingProps) => import("react/jsx-runtime").JSX.Element | null>;
 export default _default;

package/dist/components/BitzTable/ToolBar/ColConfigIcon/index.mjs

@@ -1,34 +1,38 @@
 import { j as t } from "../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import u, { useContext as c } from "react";
-import { Tooltip as d } from "antd";
+import a, { useContext as u } from "react";
+import { Tooltip as c } from "antd";
 import { show as f } from "@ebay/nice-modal-react";
 import C from "./ColumnSettingModal.mjs";
-import x from "../style.mjs";
-import h from "../../../BitzButton/index.mjs";
+import d from "../style.mjs";
+import x from "../../../BitzButton/index.mjs";
 import { TableContext as g } from "../../Store/index.mjs";
-import j from "../../../../node_modules/.store/@ant-design_icons@5.3.3/node_modules/@ant-design/icons/es/icons/SettingOutlined.mjs";
-const S = (o) => {
-  const { order: m, show: i = !0, icon: l = /* @__PURE__ */ t.jsx(j, {}) } = o, { toolbarItemClassName: r } = x(), { uuid: e } = c(g), s = () => {
-    f(`ColumnSettingModal-${e}`).then((a) => {
-      var n;
-      (n = o.onChange) == null || n.call(o, a);
-    });
-  };
+import h from "../../../../node_modules/.store/@ant-design_icons@5.3.3/node_modules/@ant-design/icons/es/icons/SettingOutlined.mjs";
+const j = (o) => {
+  const { order: m, show: i = !0, icon: l = /* @__PURE__ */ t.jsx(h, {}) } = o, { toolbarItemClassName: r } = d(), { uuid: e } = u(g);
   return i ? /* @__PURE__ */ t.jsxs(t.Fragment, { children: [
-    /* @__PURE__ */ t.jsx(C, { id: `ColumnSettingModal-${e}` }),
-    /* @__PURE__ */ t.jsx(d, { title: "列设置", open: !1, children: /* @__PURE__ */ t.jsx(
-      h,
+    /* @__PURE__ */ t.jsx(
+      C,
+      {
+        id: `ColumnSettingModal-${e}`,
+        onChange: async (s) => {
+          var n;
+          return (n = o.onChange) == null ? void 0 : n.call(o, s);
+        }
+      }
+    ),
+    /* @__PURE__ */ t.jsx(c, { title: "列设置", open: !1, children: /* @__PURE__ */ t.jsx(
+      x,
       {
         type: "text",
         className: r,
-        onClick: s,
+        onClick: () => f(`ColumnSettingModal-${e}`),
         icon: l,
         style: { order: m },
         children: "列设置"
       }
     ) })
   ] }) : null;
-}, N = u.memo(S);
+}, N = a.memo(j);
 export {
   N as default
 };

package/dist/components/BitzTable/ToolBar/DensityIcon/index.mjs

@@ -1,17 +1,23 @@
-import { j as o } from "../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { memo as d, useContext as y } from "react";
-import { Dropdown as u, Tooltip as b } from "antd";
-import { TableContext as f } from "../../Store/index.mjs";
-import k from "../style.mjs";
-import h from "../../../BitzButton/index.mjs";
-import j from "../../../../node_modules/.store/@ant-design_icons@5.3.3/node_modules/@ant-design/icons/es/icons/ColumnHeightOutlined.mjs";
-const C = (e) => {
-  const { order: m, show: s = !0, icon: r = /* @__PURE__ */ o.jsx(j, {}) } = e, t = y(f), { toolbarItemClassName: a } = k(), c = {
-    selectedKeys: [t.tableSize],
-    onClick: ({ key: x }) => {
-      var n, i;
-      const l = x;
-      (n = t.setTableSize) == null || n.call(t, l), (i = e == null ? void 0 : e.onChange) == null || i.call(e, l);
+import { j as t } from "../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import { memo as f, useContext as b } from "react";
+import { Dropdown as k, Tooltip as j } from "antd";
+import { TableContext as h } from "../../Store/index.mjs";
+import C from "../style.mjs";
+import g from "../../../BitzButton/index.mjs";
+import w from "../../../../node_modules/.store/@ant-design_icons@5.3.3/node_modules/@ant-design/icons/es/icons/ColumnHeightOutlined.mjs";
+const D = (e) => {
+  const { order: m, show: r = !0, icon: c = /* @__PURE__ */ t.jsx(w, {}) } = e, {
+    persistenceType: a,
+    persistenceKey: s,
+    onlineSizeChange: o,
+    tableSize: y,
+    setTableSize: l
+  } = b(h), { toolbarItemClassName: x } = C(), d = {
+    selectedKeys: [y],
+    onClick: ({ key: u }) => {
+      var i;
+      const n = u;
+      l == null || l(n), a === "online" && s && (o == null || o(s, n)), (i = e == null ? void 0 : e.onChange) == null || i.call(e, n);
     },
     items: [
       {
@@ -36,17 +42,17 @@ const C = (e) => {
       }
     ]
   };
-  return s ? /* @__PURE__ */ o.jsx(u, { menu: c, trigger: ["click"], children: /* @__PURE__ */ o.jsx(b, { title: "表格密度", open: !1, children: /* @__PURE__ */ o.jsx(
-    h,
+  return r ? /* @__PURE__ */ t.jsx(k, { menu: d, trigger: ["click"], children: /* @__PURE__ */ t.jsx(j, { title: "表格密度", open: !1, children: /* @__PURE__ */ t.jsx(
+    g,
     {
       style: { order: m },
       type: "text",
-      className: a,
-      icon: r,
+      className: x,
+      icon: c,
       children: "表格密度"
     }
   ) }) }) : null;
-}, B = d(C);
+}, G = f(D);
 export {
-  B as default
+  G as default
 };

package/dist/components/BitzTable/ToolBar/index.d.ts

@@ -6,6 +6,7 @@ import { DensitySize } from '../Store';
 import { MouseEventHandler } from 'react';
 import FullscreenIcon from './FullscreenIcon';
 import { ToolEnum } from '@/components/BitzConfigProvider/context';
+import { ColumnsConfigProps } from '..';
 export type MenuKeysType = 'excel';
 export type ExportEvent = (key: MenuKeysType) => void;
 export interface BitzTableToolBarProps {
@@ -23,7 +24,7 @@ export interface BitzTableToolBarProps {
     /** 表格布局更改 */
     onSizeChange?: (size: DensitySize) => void;
     /** 列配置更改 */
-    onColumnChange?: (columns: any) => void;
+    onColumnChange?: (columns: Record<string, ColumnsConfigProps>) => Promise<void>;
 }
 type CompoundedComponent = React.ForwardRefExoticComponent<BitzTableToolBarProps> & {
     ExportIcon: typeof ExportIcon;

package/dist/node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs

@@ -1,5 +1,5 @@
 import { getDefaultExportFromCjs as u } from "../../../../../_virtual/_commonjsHelpers.mjs";
-import { __module as i } from "../../../../../_virtual/index2.mjs";
+import { __module as i } from "../../../../../_virtual/index.mjs";
 /*!
 	Copyright (c) 2018 Jed Watson.
 	Licensed under the MIT License (MIT), see