bitz-react-admin-ui 2.1.8 → 2.2.0

package/dist/components/BitzTable/Table/utils.mjs

@@ -1,40 +1,41 @@
 import { j as f } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { Skeleton as x, Table as l } from "antd";
-function a(o, r) {
-  return o == null ? void 0 : o.map((e) => {
+import { Skeleton as x, Table as d } from "antd";
+function a(i, r) {
+  return i == null ? void 0 : i.map((e) => {
     const n = { ...e };
-    return e != null && e.isOperationCol || e != null && e.isCheckboxCol || e != null && e.isExpandIconCol || r.includes(e) ? e : (n != null && n.children && (n.children = a(n == null ? void 0 : n.children, r)), {
+    return e != null && e.isOperationCol || e != null && e.isDragSortCol || e != null && e.isCheckboxCol || e != null && e.isExpandIconCol || r.includes(e) ? e : (n != null && n.children && (n.children = a(n == null ? void 0 : n.children, r)), {
       ...n,
       sorter: !1,
-      render: (d, i, t) => /* @__PURE__ */ f.jsx(
+      render: (t, l, o) => /* @__PURE__ */ f.jsx(
         x,
         {
           active: !0,
           title: !1,
           paragraph: {
             rows: 1,
-            width: (t + 1) % 2 === 0 ? "100%" : "60%"
+            width: (o + 1) % 2 === 0 ? "100%" : "60%"
           }
         }
       )
     });
   });
 }
-const C = 0, c = 1;
-function s(o, r, e, n) {
-  let d = C;
+const C = 0, s = 1;
+function h(i, r, e, n) {
+  const t = [...r];
+  let l = C;
   if (e) {
-    const i = o.indexOf(l.SELECTION_COLUMN);
-    i >= 0 && (d = i), r.splice(d, 0, l.SELECTION_COLUMN);
+    const o = (i ?? []).indexOf(d.SELECTION_COLUMN);
+    o >= 0 && (l = o), t.splice(l, 0, d.SELECTION_COLUMN);
   }
   if (n) {
-    let i = 0;
-    const t = o.indexOf(l.EXPAND_COLUMN);
-    t >= 0 && (i = t), e && d === 0 && t === -1 && (i = c), r.splice(i, 0, l.EXPAND_COLUMN);
+    let o = 0;
+    const c = (i ?? []).indexOf(d.EXPAND_COLUMN);
+    c >= 0 && (o = c), e && l === 0 && c === -1 && (o = s), t.splice(o, 0, d.EXPAND_COLUMN);
   }
-  return r;
+  return t;
 }
 export {
-  s as getColumnsWithTool,
+  h as getColumnsWithTool,
   a as loopBuildSkeleton
 };

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

@@ -8,5 +8,6 @@ export interface ColumnConfigModalProps {
     onChange?: BitzTableToolBarProps['onColumnChange'];
     getContainer: ModalProps['getContainer'];
 }
+export declare const exportConfigTitle = "\u5BFC\u51FA\u8BBE\u7F6E";
 declare const ColumnConfigModal: FC<ColumnConfigModalProps>;
 export default ColumnConfigModal;

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

@@ -1,122 +1,109 @@
 import { j as e } from "../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { Modal as re, Typography as oe, Card as se, Segmented as ne, Flex as le, message as W } from "antd";
-import { useState as m, useContext as q, useRef as K, useMemo as ie, useEffect as ae } from "react";
-import { BitzTableContext as ce } from "../../Store/index.mjs";
-import A from "../../../BitzButton/index.mjs";
-import fe from "../../../BitzTheme/index.mjs";
-import me from "../../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
-import ue from "./StylesConfig/index.mjs";
-import de from "./ColumnsSort/index.mjs";
-import pe from "./ExportConfig/index.mjs";
-import { styles as ge } from "./style.mjs";
-import { BitzConfigContext as ye } from "../../../BitzConfigProvider/context.mjs";
-import Ce from "../../../../node_modules/.store/@ant-design_icons@5.3.6/node_modules/@ant-design/icons/es/icons/CheckCircleOutlined.mjs";
-import xe from "../../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/omit.mjs";
-const Ne = ({
-  open: u,
-  title: G,
-  onChange: s,
-  close: n,
+import { Segmented as _, message as w } from "antd";
+import { useState as m, useContext as H, useRef as j, useMemo as $ } from "react";
+import { BitzTableContext as ee } from "../../Store/index.mjs";
+import L from "../../../BitzButton/index.mjs";
+import te from "../../../BitzTheme/index.mjs";
+import oe from "./StylesConfig/index.mjs";
+import re from "./ColumnsSort/index.mjs";
+import se from "./ExportConfig/index.mjs";
+import { BitzConfigContext as ne } from "../../../BitzConfigProvider/context.mjs";
+import le from "../Modal/index.mjs";
+import ie from "../../../../node_modules/.store/@ant-design_icons@5.3.6/node_modules/@ant-design/icons/es/icons/CheckCircleOutlined.mjs";
+import ae from "../../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/omit.mjs";
+const fe = "导出设置", he = ({
+  open: A,
+  title: D,
+  onChange: n,
+  close: l,
   getContainer: I
 }) => {
-  const { token: l } = fe.useToken(), [i, a] = m(1), [J, d] = m(!1);
+  const { token: T } = te.useToken(), [i, a] = m(1), [q, c] = m(!1);
   m(!1);
-  const [P, r] = m(!1), {
-    persistenceType: Q,
-    persistenceKey: T,
-    onlineChange: p,
-    setColumnsMap: U,
-    setSortKeyColumns: X,
-    stylesStorageType: Y,
-    stylesStorageKey: k,
-    setTableStylesConfig: g,
-    onlineStylesConfigChange: y,
-    exportStorageType: Z,
-    exportStorageKey: v,
-    setTableExportConfig: _,
-    onlineExportConfigChange: C
-  } = q(ce), o = q(ye).Table, t = K(null), B = K(null), x = K(null), $ = async () => {
-    var F, R, z, w, E, M, N, O, V, H, L, D;
-    if (P)
+  const [G, o] = m(!1), {
+    persistenceType: J,
+    persistenceKey: R,
+    onlineChange: u,
+    setColumnsMap: N,
+    stylesStorageType: P,
+    stylesStorageKey: b,
+    setTableStylesConfig: p,
+    onlineStylesConfigChange: d,
+    defaultTableExportConfig: Q,
+    exportStorageType: U,
+    exportStorageKey: h,
+    setTableExportConfig: W,
+    onlineExportConfigChange: g
+  } = H(ee), r = H(ne).Table, s = j(null), k = j(null), x = j(null), X = async () => {
+    var v, z, B, E, F, K, M, O, V;
+    if (G)
       return;
-    r(!0);
-    const S = (F = t.current) == null ? void 0 : F.getCheckedKeys();
-    if (!(S != null && S.length)) {
-      a(2), W.error("表格至少需要显示一列"), r(!1);
+    o(!0);
+    const t = (v = s.current) == null ? void 0 : v.getCheckedKeys();
+    if (!(t != null && t.length)) {
+      a(2), w.error("表格至少需要显示一列"), o(!1);
       return;
     }
-    if (!((R = x.current) == null ? void 0 : R.hasOne())) {
-      a(3), W.error("导出设置至少需要一个字段"), r(!1);
+    if (!((z = x.current) == null ? void 0 : z.hasOne())) {
+      a(3), w.error("导出设置至少需要一个字段"), o(!1);
       return;
     }
-    const j = (z = B.current) == null ? void 0 : z.getFormInstance(), f = await (j == null ? void 0 : j.getFieldsValue()), ee = xe(f, "stylesScope"), h = {
-      ...(w = t.current) == null ? void 0 : w.getLeftSortColumns(),
-      ...(E = t.current) == null ? void 0 : E.getCenterSortColumns(),
-      ...(M = t.current) == null ? void 0 : M.getRightSortColumns()
-    }, te = [
-      ...((N = t.current) == null ? void 0 : N.getLeftSortKeys()) ?? [],
-      ...((O = t.current) == null ? void 0 : O.getCenterSortKeys()) ?? [],
-      ...((V = t.current) == null ? void 0 : V.getRightSortKeys()) ?? []
-    ], b = ((H = x.current) == null ? void 0 : H.getExportConfig()) ?? [];
-    g == null || g(ee), (L = o == null ? void 0 : o.setStylesScope) == null || L.call(o, f.stylesScope ? "global" : "current"), U(h), X(te), _(b), Y === "online" && k && (y == null || y(k, f)), Q === "online" && T && (p == null || p(T, h)), Z === "online" && v && (C == null || C(v, b)), r(!1), s ? (d(!0), (D = s == null ? void 0 : s(f, h, b)) == null || D.finally(() => {
-      d(!1), n();
-    })) : n();
-  }, c = ie(() => l.mode === "dark", [l.mode]);
-  return ae(() => {
-    u || (a(1), d(!1), r(!1));
-  }, [u]), /* @__PURE__ */ e.jsx(
-    re,
+    const y = (B = k.current) == null ? void 0 : B.getFormInstance(), f = await (y == null ? void 0 : y.getFieldsValue()), Z = ae(f, "stylesScope"), C = {
+      ...(E = s.current) == null ? void 0 : E.getLeftSortColumns(),
+      ...(F = s.current) == null ? void 0 : F.getCenterSortColumns(),
+      ...(K = s.current) == null ? void 0 : K.getRightSortColumns()
+    }, S = ((M = x.current) == null ? void 0 : M.getExportConfig()) ?? Q;
+    p == null || p(Z), (O = r == null ? void 0 : r.setStylesScope) == null || O.call(r, f.stylesScope ? "global" : "current"), N(C), W(S), P === "online" && b && (d == null || d(b, f)), J === "online" && R && (u == null || u(R, C)), U === "online" && h && (g == null || g(h, S)), o(!1), n ? (c(!0), (V = n == null ? void 0 : n(f, C, S)) == null || V.finally(() => {
+      c(!1), l();
+    })) : l();
+  };
+  $(() => T.mode === "dark", [T.mode]);
+  const Y = () => {
+    a(1), c(!1), o(!1);
+  };
+  return /* @__PURE__ */ e.jsx(
+    le,
     {
-      className: me(ge(l), "tableConfigModal"),
-      title: /* @__PURE__ */ e.jsx(oe.Title, { style: { fontSize: 16, margin: 0 }, children: G }),
-      destroyOnClose: !0,
+      open: A,
+      title: D,
+      close: l,
+      closeAfter: Y,
       getContainer: I,
-      open: u,
-      onCancel: n,
-      style: {
-        "--sortCard-bgColor": c ? "#444" : "#f2f2f2",
-        "--sortCard-titleColor": c ? "#ccc" : "#777",
-        "--radioCard-bgColor": c ? "#444" : "#F2F2F2",
-        "--radioCard-bgHoverColor": c ? "#333" : l.colorBgContainer
-      },
-      styles: { body: { maxHeight: window.innerHeight - 300 } },
-      width: 700,
       footer: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
         /* @__PURE__ */ e.jsx(
-          A,
+          L,
           {
             type: "primary",
-            icon: /* @__PURE__ */ e.jsx(Ce, {}),
-            onClick: $,
-            loading: J,
+            icon: /* @__PURE__ */ e.jsx(ie, {}),
+            onClick: X,
+            loading: q,
             children: "保存"
           }
         ),
-        /* @__PURE__ */ e.jsx(A, { onClick: n, children: "取消" })
+        /* @__PURE__ */ e.jsx(L, { onClick: l, children: "取消" })
       ] }),
-      children: /* @__PURE__ */ e.jsxs(se, { className: "container", bordered: !1, children: [
-        /* @__PURE__ */ e.jsx("div", { className: "segmentedWrapper", children: /* @__PURE__ */ e.jsx(
-          ne,
-          {
-            size: "large",
-            options: [
-              { label: "外观设置", value: 1 },
-              { label: "列设置", value: 2 },
-              { label: "导出设置", value: 3 }
-            ],
-            value: i,
-            onChange: a
-          }
-        ) }),
-        /* @__PURE__ */ e.jsxs(le, { className: "containerBody", children: [
-          /* @__PURE__ */ e.jsx(ue, { ref: B, display: i === 1 }),
-          /* @__PURE__ */ e.jsx(de, { ref: t, display: i === 2 }),
-          /* @__PURE__ */ e.jsx(pe, { ref: x, display: i === 3 })
-        ] })
+      extra: /* @__PURE__ */ e.jsx(
+        _,
+        {
+          size: "large",
+          options: [
+            { label: "外观设置", value: 1 },
+            { label: "列设置", value: 2 },
+            { label: fe, value: 3 }
+          ],
+          value: i,
+          onChange: a
+        }
+      ),
+      children: (t) => /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
+        /* @__PURE__ */ e.jsx(oe, { ref: k, display: i === 1 }),
+        /* @__PURE__ */ e.jsx(re, { parentHeight: t, ref: s, display: i === 2 }),
+        /* @__PURE__ */ e.jsx(se, { parentHeight: t, refInstance: x, display: i === 3, showSelectRadio: !1 })
       ] })
     }
   );
 };
 export {
-  Ne as default
+  he as default,
+  fe as exportConfigTitle
 };

package/dist/components/BitzTable/ToolBar/ColConfigIcon/ColumnsSort/DndItem.d.ts

@@ -1,10 +1,11 @@
 import React from 'react';
 export interface DndItemProps {
-    placement: 'left' | 'center' | 'right';
+    placement?: 'left' | 'center' | 'right';
     item: any;
-    onLeftClick: (key: any, placement: 'left' | 'center' | 'right') => void;
-    onRightClick: (key: any, placement: 'left' | 'center' | 'right') => void;
-    onCheckboxChange: (key: any, checked: boolean) => void;
+    isDragOverlay?: boolean;
+    onLeftClick?: (key: any, placement: 'left' | 'center' | 'right') => void;
+    onRightClick?: (key: any, placement: 'left' | 'center' | 'right') => void;
+    onCheckboxChange?: (key: any, checked: boolean) => void;
 }
 declare const _default: React.NamedExoticComponent<DndItemProps>;
 export default _default;

package/dist/components/BitzTable/ToolBar/ColConfigIcon/ColumnsSort/DndItem.mjs

@@ -1,13 +1,13 @@
 import { j as o } from "../../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import D, { useState as E, useMemo as F } from "react";
-import { useSortable as R } from "../../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
-import { CSS as b } from "../../../../../node_modules/.store/@dnd-kit_utilities@3.2.2/node_modules/@dnd-kit/utilities/dist/utilities.esm.mjs";
-import { Flex as p, Checkbox as v, Tooltip as w } from "antd";
-import M from "../../../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
-import O from "../../../../../assets/iconfont/IconDragOrder.mjs";
-import g from "../../../../../assets/iconfont/IconColumnFixedLeft.mjs";
-import h from "../../../../../assets/iconfont/IconColumnFixedRight.mjs";
-import x from "../../../../../assets/iconfont/IconColumnCancelFixed.mjs";
+import F, { useState as v, useMemo as M } from "react";
+import { useSortable as O } from "../../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
+import { CSS as _ } from "../../../../../node_modules/.store/@dnd-kit_utilities@3.2.2/node_modules/@dnd-kit/utilities/dist/utilities.esm.mjs";
+import { theme as I, Flex as d, Checkbox as k, Tooltip as $ } from "antd";
+import q from "../../../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
+import A from "../../../../../assets/iconfont/IconDragOrder.mjs";
+import x from "../../../../../assets/iconfont/IconColumnFixedLeft.mjs";
+import g from "../../../../../assets/iconfont/IconColumnFixedRight.mjs";
+import h from "../../../../../assets/iconfont/IconColumnCancelFixed.mjs";
 import "../../../../../assets/iconfont/IconMore.mjs";
 import "../../../../../assets/iconfont/IconIcFluentHomeRegular.mjs";
 import "../../../../../assets/iconfont/IconKuansongde.mjs";
@@ -37,46 +37,53 @@ import "../../../../../assets/iconfont/IconFabu.mjs";
 import "../../../../../assets/iconfont/IconShanchu1.mjs";
 import "../../../../../assets/iconfont/IconShanchu.mjs";
 import "../../../../../assets/iconfont/IconTuodong.mjs";
-const d = ({ icon: t, className: r, open: e, title: i, onClick: n }) => /* @__PURE__ */ o.jsx(
-  w,
-  {
-    getTooltipContainer: (s) => s.parentElement,
-    title: i,
-    open: e ? !1 : void 0,
-    children: /* @__PURE__ */ o.jsx(t, { className: r, onClick: n })
-  }
-), T = ({
+const j = ({ icon: t, className: n, open: r, title: e, onClick: i }) => {
+  const { token: s } = I.useToken();
+  return /* @__PURE__ */ o.jsx(
+    $,
+    {
+      getTooltipContainer: (p) => p.parentElement,
+      title: e,
+      open: r ? !1 : void 0,
+      children: /* @__PURE__ */ o.jsx(t, { size: s.fontSize + 4, className: n, onClick: i })
+    }
+  );
+}, B = ({
   item: t,
+  isDragOverlay: n,
   placement: r,
   onLeftClick: e,
   onRightClick: i,
-  onCheckboxChange: n
+  onCheckboxChange: s
 }) => {
   const {
-    attributes: s,
+    attributes: p,
     isDragging: m,
-    setNodeRef: u,
-    listeners: j,
-    transform: C,
-    transition: I
-  } = R({
+    setNodeRef: S,
+    listeners: y,
+    transform: N,
+    transition: T
+  } = O({
     id: t == null ? void 0 : t.key
     // disabled: item?.disabled,
-  }), k = {
-    transition: I,
-    transform: b.Transform.toString(C)
-  }, y = ({ target: l }) => {
-    n(t.key, l.checked);
-  }, [N, S] = E(!1), c = (l) => {
-    S(l);
-  }, { text: a, icon: f } = F(() => r === "left" ? {
+  }), { token: w } = I.useToken(), z = {
+    transition: T,
+    transform: _.Transform.toString(N),
+    ...m && {
+      opacity: 0.6
+    }
+  }, D = ({ target: l }) => {
+    s == null || s(t.key, l.checked);
+  }, [a, E] = v(!1), c = (l) => {
+    E(l);
+  }, { text: f, icon: u } = M(() => r === "left" ? {
     text: {
       left: "取消固定",
       right: "固定在右侧"
     },
     icon: {
-      left: x,
-      right: h
+      left: h,
+      right: g
     }
   } : r === "center" ? {
     text: {
@@ -84,8 +91,8 @@ const d = ({ icon: t, className: r, open: e, title: i, onClick: n }) => /* @__PU
       right: "固定在右侧"
     },
     icon: {
-      left: g,
-      right: h
+      left: x,
+      right: g
     }
   } : {
     text: {
@@ -93,59 +100,58 @@ const d = ({ icon: t, className: r, open: e, title: i, onClick: n }) => /* @__PU
       right: "取消固定"
     },
     icon: {
-      left: g,
-      right: x
+      left: x,
+      right: h
     }
   }, [r]);
   return /* @__PURE__ */ o.jsxs(
-    p,
+    "div",
     {
-      align: "center",
-      className: M({ draggingSortItem: m }, "sortItem"),
-      style: k,
-      ref: u,
+      className: q({ sortItemDragging: m }, "sortItem", { showSortItemOperat: a && !n }),
+      style: z,
+      ref: S,
       onMouseEnter: () => c(!0),
       onMouseLeave: () => c(!1),
-      ...s,
+      ...p,
       children: [
-        /* @__PURE__ */ o.jsx(p, { align: "center", className: "dragIcon", ...j, children: /* @__PURE__ */ o.jsx(O, {}) }),
+        /* @__PURE__ */ o.jsx(d, { align: "center", className: "dragIcon", ...y, children: /* @__PURE__ */ o.jsx(A, { size: w.fontSize + 4 }) }),
         /* @__PURE__ */ o.jsx(
-          v,
+          k,
           {
             checked: t.show,
-            onChange: y,
+            onChange: D,
             title: t.title,
             children: t.title
           }
         ),
         /* @__PURE__ */ o.jsxs(
-          p,
+          d,
           {
             style: {
               height: "100%",
-              display: N ? "flex" : "none"
+              display: a && !n ? "flex" : "none"
             },
             align: "center",
             className: "operation pointerCursor",
             children: [
               /* @__PURE__ */ o.jsx(
-                d,
+                j,
                 {
                   className: "leftOperation",
-                  title: a.left,
+                  title: f.left,
                   open: m,
-                  icon: f.left,
-                  onClick: () => e(t.key, r)
+                  icon: u.left,
+                  onClick: () => e == null ? void 0 : e(t.key, r)
                 }
               ),
               /* @__PURE__ */ o.jsx(
-                d,
+                j,
                 {
                   className: "rightOperation",
-                  title: a.right,
+                  title: f.right,
                   open: m,
-                  icon: f.right,
-                  onClick: () => i(t.key, r)
+                  icon: u.right,
+                  onClick: () => i == null ? void 0 : i(t.key, r)
                 }
               )
             ]
@@ -154,7 +160,7 @@ const d = ({ icon: t, className: r, open: e, title: i, onClick: n }) => /* @__PU
       ]
     }
   );
-}, It = D.memo(T);
+}, Tt = F.memo(B);
 export {
-  It as default
+  Tt as default
 };