bitz-react-admin-ui 2.0.9 → 2.1.0

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

@@ -13,88 +13,53 @@ import { styles as re } from "./style.mjs";
 import { BitzConfigContext as se } from "../../../BitzConfigProvider/context.mjs";
 import le from "../../../../node_modules/.store/@ant-design_icons@5.3.6/node_modules/@ant-design/icons/es/icons/CheckCircleOutlined.mjs";
 import ne from "../../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/omit.mjs";
-const be = A(
-  ({ title: R, onChange: r, getContainer: N }) => {
-    const { token: s } = _.useToken(), l = G(), [n, V] = p(1), [w, y] = p(!1);
-    p(!1);
-    const {
-      persistenceType: H,
-      persistenceKey: g,
-      onlineChange: a,
-      setColumnsMap: L,
-      setSortKeyColumns: E,
-      stylesStorageType: D,
-      stylesStorageKey: C,
-      setTableStylesConfig: m,
-      onlineStylesConfigChange: c
-      // clearPersistenceStorage,
-    } = M(Z), o = M(se).Table, t = T(null), x = T(null), O = async () => {
-      var S, j, h, b, k, v, B, F, K;
-      const d = (S = x.current) == null ? void 0 : S.getFormInstance(), f = await (d == null ? void 0 : d.getFieldsValue()), W = ne(f, "stylesScope"), u = {
-        ...(j = t.current) == null ? void 0 : j.getLeftSortColumns(),
-        ...(h = t.current) == null ? void 0 : h.getCenterSortColumns(),
-        ...(b = t.current) == null ? void 0 : b.getRightSortColumns()
-      }, q = [
-        ...(k = t.current) == null ? void 0 : k.getLeftSortKeys(),
-        ...(v = t.current) == null ? void 0 : v.getCenterSortKeys(),
-        ...(B = t.current) == null ? void 0 : B.getRightSortKeys()
-      ];
-      m == null || m(W), (F = o == null ? void 0 : o.setStylesScope) == null || F.call(o, f.stylesScope ? "global" : "current"), L(u), E(q), D === "online" && C && (c == null || c(C, f)), H === "online" && g && (a == null || a(g, u)), r ? (y(!0), (K = r == null ? void 0 : r(u)) == null || K.finally(() => {
-        y(!1), l.hide();
-      })) : l.hide();
-    }, i = Y(() => s.mode === "dark", [s.mode]);
-    return /* @__PURE__ */ e.jsx(
-      J,
-      {
-        className: $(re(s), "tableConfigModal"),
-        title: /* @__PURE__ */ e.jsx(P.Title, { style: { fontSize: 16, margin: 0 }, children: R }),
-        getContainer: N,
-        ...I(l),
-        style: {
-          "--sortCard-bgColor": i ? "#444" : "#f2f2f2",
-          "--sortCard-titleColor": i ? "#ccc" : "#777",
-          "--radioCard-bgColor": i ? "#444" : "#F2F2F2",
-          "--radioCard-bgHoverColor": i ? "#333" : s.colorBgContainer
-        },
-        styles: { body: { maxHeight: window.innerHeight - 300 } },
-        width: 700,
-        footer: /* @__PURE__ */ e.jsxs(e.Fragment, { children: [
-          /* @__PURE__ */ e.jsx(
-            z,
-            {
-              type: "primary",
-              icon: /* @__PURE__ */ e.jsx(le, {}),
-              onClick: O,
-              loading: w,
-              children: "保存"
-            }
-          ),
-          /* @__PURE__ */ e.jsx(z, { onClick: () => l.hide(), children: "取消" })
-        ] }),
-        children: /* @__PURE__ */ e.jsxs(Q, { className: "container", bordered: !1, children: [
-          /* @__PURE__ */ e.jsx("div", { className: "segmentedWrapper", children: /* @__PURE__ */ e.jsx(
-            U,
-            {
-              size: "large",
-              options: [
-                { label: "外观设置", value: 1 },
-                { label: "列设置", value: 2 },
-                { label: "导出设置", value: 3 }
-              ],
-              value: n,
-              onChange: V
-            }
-          ) }),
-          /* @__PURE__ */ e.jsxs(X, { className: "containerBody", children: [
-            /* @__PURE__ */ e.jsx(ee, { ref: x, display: n === 1 }),
-            /* @__PURE__ */ e.jsx(te, { ref: t, display: n === 2 }),
-            /* @__PURE__ */ e.jsx(oe, { display: n === 3 })
-          ] })
-        ] })
-      }
-    );
-  }
-);
+const be = A(({ title: R, onChange: r, getContainer: D }) => {
+  const { token: s } = _.useToken(), l = G(), [n, N] = p(1), [V, g] = p(!1);
+  p(!1);
+  const {
+    persistenceType: w,
+    persistenceKey: y,
+    onlineChange: a,
+    setColumnsMap: H,
+    setSortKeyColumns: L,
+    stylesStorageType: E,
+    stylesStorageKey: C,
+    setTableStylesConfig: m,
+    onlineStylesConfigChange: c
+    // clearPersistenceStorage,
+  } = M(Z), o = M(se).Table, t = T(null), x = T(null), O = async () => {
+    var S, j, h, b, B, F, k, v, K;
+    const d = (S = x.current) == null ? void 0 : S.getFormInstance(), u = await (d == null ? void 0 : d.getFieldsValue()), W = ne(u, "stylesScope"), f = {
+      ...(j = t.current) == null ? void 0 : j.getLeftSortColumns(),
+      ...(h = t.current) == null ? void 0 : h.getCenterSortColumns(),
+      ...(b = t.current) == null ? void 0 : b.getRightSortColumns()
+    }, q = [
+      ...(B = t.current) == null ? void 0 : B.getLeftSortKeys(),
+      ...(F = t.current) == null ? void 0 : F.getCenterSortKeys(),
+      ...(k = t.current) == null ? void 0 : k.getRightSortKeys()
+    ];
+    m == null || m(W), (v = o == null ? void 0 : o.setStylesScope) == null || v.call(o, u.stylesScope ? "global" : "current"), H(f), L(q), E === "online" && C && (c == null || c(C, u)), w === "online" && y && (a == null || a(y, f)), r ? (g(!0), (K = r == null ? void 0 : r(f)) == null || K.finally(() => {
+      g(!1), l.hide();
+    })) : l.hide();
+  }, i = Y(() => s.mode === "dark", [s.mode]);
+  return e.jsx(J, { className: $(re(s), "tableConfigModal"), title: e.jsx(P.Title, { style: { fontSize: 16, margin: 0 }, children: R }), getContainer: D, ...I(l), style: {
+    "--sortCard-bgColor": i ? "#444" : "#f2f2f2",
+    "--sortCard-titleColor": i ? "#ccc" : "#777",
+    "--radioCard-bgColor": i ? "#444" : "#F2F2F2",
+    "--radioCard-bgHoverColor": i ? "#333" : s.colorBgContainer
+  }, styles: { body: { maxHeight: window.innerHeight - 300 } }, width: 700, footer: e.jsxs(e.Fragment, { children: [e.jsx(z, {
+    type: "primary",
+    icon: e.jsx(le, {}),
+    onClick: O,
+    // disabled={!isEdit}
+    loading: V,
+    children: "保存"
+  }), e.jsx(z, { onClick: () => l.hide(), children: "取消" })] }), children: e.jsxs(Q, { className: "container", bordered: !1, children: [e.jsx("div", { className: "segmentedWrapper", children: e.jsx(U, { size: "large", options: [
+    { label: "外观设置", value: 1 },
+    { label: "列设置", value: 2 },
+    { label: "导出设置", value: 3 }
+  ], value: n, onChange: N }) }), e.jsxs(X, { className: "containerBody", children: [e.jsx(ee, { ref: x, display: n === 1 }), e.jsx(te, { ref: t, display: n === 2 }), e.jsx(oe, { display: n === 3 })] })] }) });
+});
 export {
   be as default
 };

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

@@ -1,103 +1,29 @@
-import { j as s } from "../../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import { j as o } from "../../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
 import E, { useState as O, useMemo as R } from "react";
-import { useSortable as v } from "../../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
-import { CSS as w } from "../../../../../node_modules/.store/@dnd-kit_utilities@3.2.2/node_modules/@dnd-kit/utilities/dist/utilities.esm.mjs";
-import { Flex as f, Checkbox as D, Tooltip as M } from "antd";
+import { useSortable as w } from "../../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
+import { CSS as D } from "../../../../../node_modules/.store/@dnd-kit_utilities@3.2.2/node_modules/@dnd-kit/utilities/dist/utilities.esm.mjs";
+import { Flex as f, Checkbox as M, Tooltip as T } from "antd";
 import h from "../../../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
 import i from "../../../../../node_modules/.store/@ant-design_icons@5.3.6/node_modules/@ant-design/icons/es/icons/PicRightOutlined.mjs";
-const g = ({ icon: o, className: r, open: e, title: n, onClick: t }) => /* @__PURE__ */ s.jsx(
-  M,
-  {
-    getTooltipContainer: (l) => l.parentElement,
-    title: n,
-    open: e ? !1 : void 0,
-    children: /* @__PURE__ */ s.jsx(o, { className: r, onClick: t })
-  }
-), T = ({
-  item: o,
-  placement: r,
-  onLeftClick: e,
-  onRightClick: n,
-  onCheckboxChange: t
-}) => {
-  const {
-    attributes: l,
-    isDragging: a,
-    setNodeRef: u,
-    listeners: x,
-    transform: p,
-    transition: j
-  } = v({
-    id: o == null ? void 0 : o.key
+const g = ({ icon: s, className: e, open: r, title: n, onClick: t }) => o.jsx(T, { getTooltipContainer: (l) => l.parentElement, title: n, open: r ? !1 : void 0, children: o.jsx(s, { className: e, onClick: t }) }), v = ({ item: s, placement: e, onLeftClick: r, onRightClick: n, onCheckboxChange: t }) => {
+  const { attributes: l, isDragging: a, setNodeRef: u, listeners: x, transform: p, transition: k } = w({
+    id: s == null ? void 0 : s.key
     // disabled: item?.disabled,
-  }), k = {
-    transition: j,
-    transform: w.Transform.toString(p)
-  }, C = h({
-    disabledCheckbox: (o == null ? void 0 : o.disabled) || (o == null ? void 0 : o.fixed)
-  }), b = ({ target: c }) => {
-    o != null && o.disabled || o != null && o.fixed || t(o.key, c.checked);
-  }, [N, y] = O(!1), d = (c) => {
+  }), C = {
+    transition: k,
+    transform: D.Transform.toString(p)
+  }, j = h({
+    disabledCheckbox: (s == null ? void 0 : s.disabled) || (s == null ? void 0 : s.fixed)
+  }), N = ({ target: c }) => {
+    s != null && s.disabled || s != null && s.fixed || t(s.key, c.checked);
+  }, [b, y] = O(!1), d = (c) => {
     y(c);
-  }, { left: S, right: I } = R(() => r === "left" ? { left: "取消固定", right: "固定在右侧" } : r === "center" ? { left: "固定在左侧", right: "固定在右侧" } : { left: "固定在左侧", right: "取消固定" }, [r]);
-  return /* @__PURE__ */ s.jsxs(
-    f,
-    {
-      align: "center",
-      className: h({ draggingSortItem: a }, "sortItem"),
-      style: k,
-      ref: u,
-      onMouseEnter: () => d(!0),
-      onMouseLeave: () => d(!1),
-      ...l,
-      children: [
-        /* @__PURE__ */ s.jsx(f, { align: "center", className: "dragIcon", ...x, children: /* @__PURE__ */ s.jsx(i, {}) }),
-        /* @__PURE__ */ s.jsx(
-          D,
-          {
-            checked: o.show,
-            className: C,
-            onChange: b,
-            title: o.title,
-            children: o.title
-          }
-        ),
-        !(o != null && o.isOperationCol) && /* @__PURE__ */ s.jsxs(
-          f,
-          {
-            style: {
-              height: "100%",
-              display: N ? "flex" : "none"
-            },
-            className: "operation pointerCursor",
-            children: [
-              /* @__PURE__ */ s.jsx(
-                g,
-                {
-                  className: "leftOperation",
-                  title: S,
-                  open: a,
-                  icon: i,
-                  onClick: () => e(o.key, r)
-                }
-              ),
-              /* @__PURE__ */ s.jsx(
-                g,
-                {
-                  className: "rightOperation",
-                  title: I,
-                  open: a,
-                  icon: i,
-                  onClick: () => n(o.key, r)
-                }
-              )
-            ]
-          }
-        )
-      ]
-    }
-  );
-}, A = E.memo(T);
+  }, { left: S, right: I } = R(() => e === "left" ? { left: "取消固定", right: "固定在右侧" } : e === "center" ? { left: "固定在左侧", right: "固定在右侧" } : { left: "固定在左侧", right: "取消固定" }, [e]);
+  return o.jsxs(f, { align: "center", className: h({ draggingSortItem: a }, "sortItem"), style: C, ref: u, onMouseEnter: () => d(!0), onMouseLeave: () => d(!1), ...l, children: [o.jsx(f, { align: "center", className: "dragIcon", ...x, children: o.jsx(i, {}) }), o.jsx(M, { checked: s.show, className: j, onChange: N, title: s.title, children: s.title }), !(s != null && s.isOperationCol) && o.jsxs(f, { style: {
+    height: "100%",
+    display: b ? "flex" : "none"
+  }, className: "operation pointerCursor", children: [o.jsx(g, { className: "leftOperation", title: S, open: a, icon: i, onClick: () => r(s.key, e) }), o.jsx(g, { className: "rightOperation", title: I, open: a, icon: i, onClick: () => n(s.key, e) })] })] });
+}, A = E.memo(v);
 export {
   A as default
 };

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

@@ -1,88 +1,48 @@
 import { j as m } from "../../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { genColumnKey as C, columnSort as S } from "../../../Store/utils/index.mjs";
-import { DndContext as D } from "../../../../../node_modules/.store/@dnd-kit_core@6.1.0/node_modules/@dnd-kit/core/dist/core.esm.mjs";
-import { restrictToVerticalAxis as y, restrictToWindowEdges as E } from "../../../../../node_modules/.store/@dnd-kit_modifiers@6.0.1/node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
-import { SortableContext as I, verticalListSortingStrategy as K, arrayMove as A } from "../../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
-import { Flex as N } from "antd";
-import { useMemo as T, useState as F } from "react";
-import R from "./DndItem.mjs";
-import V from "../../../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/omit.mjs";
-const P = ({
-  placement: u,
-  dataList: n,
-  keys: f,
-  columnsMap: s,
-  onLeftClick: a,
-  onRightClick: p,
-  onChange: h,
-  onMoveEnd: d
-}) => {
-  const g = T(() => {
+import { genColumnKey as S, columnSort as j } from "../../../Store/utils/index.mjs";
+import { DndContext as w } from "../../../../../node_modules/.store/@dnd-kit_core@6.1.0/node_modules/@dnd-kit/core/dist/core.esm.mjs";
+import { restrictToVerticalAxis as E, restrictToWindowEdges as y } from "../../../../../node_modules/.store/@dnd-kit_modifiers@6.0.1/node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
+import { SortableContext as I, verticalListSortingStrategy as K, arrayMove as k } from "../../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
+import { Flex as A } from "antd";
+import { useMemo as N, useState as R } from "react";
+import T from "./DndItem.mjs";
+import F from "../../../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/omit.mjs";
+const O = ({ placement: x, dataList: n, keys: a, columnsMap: s, onLeftClick: u, onRightClick: g, onChange: h, onMoveEnd: p }) => {
+  const d = N(() => {
     const o = [];
-    return n != null && n.length && (n == null || n.map(
-      ({ key: r, dataIndex: e, ...i }) => {
-        const c = C(
-          r || e,
-          [r || e].join("-")
-        ), t = s[c || "null"];
-        return o.push({
-          key: c,
-          ...V(i, ["className"]),
-          selectable: !1,
-          disabled: (t == null ? void 0 : t.disabled) === !0,
-          show: t == null ? void 0 : t.show
-        }), t;
-      }
-    )), o.sort(S(s));
-  }, [s, n]), [x, l] = F(-1), v = (o) => {
+    return n != null && n.length && (n == null || n.map(({ key: r, dataIndex: e, ...i }) => {
+      const c = S(r || e, [r || e].join("-")), t = s[c || "null"];
+      return o.push({
+        key: c,
+        ...F(i, ["className"]),
+        selectable: !1,
+        disabled: (t == null ? void 0 : t.disabled) === !0,
+        show: t == null ? void 0 : t.show
+      }), t;
+    })), o.sort(j(s));
+  }, [s, n]), [f, l] = R(-1), C = (o) => {
     const { active: r } = o;
     r && l(r.data.current.sortable.index);
   }, b = (o) => {
     const { over: r } = o;
     if (r) {
       const e = r.data.current.sortable.index;
-      x !== e && (j(x, e), l(-1));
+      f !== e && (v(f, e), l(-1));
     }
-  }, j = (o, r) => {
-    const e = {}, i = A(f, o, r);
+  }, v = (o, r) => {
+    const e = {}, i = k(a, o, r);
     i.forEach((c, t) => {
       e[c] = { ...s[c], order: t };
-    }), d(e, i);
-  }, w = (o, r) => {
+    }), p(e, i);
+  }, D = (o, r) => {
     const e = { ...s };
     e[o] = { ...e[o], show: r }, h(
       e
       /*, newCheckedKeys*/
     );
   };
-  return /* @__PURE__ */ m.jsx(
-    D,
-    {
-      modifiers: [y, E],
-      onDragStart: v,
-      onDragEnd: b,
-      onDragCancel: () => l(-1),
-      children: /* @__PURE__ */ m.jsx(
-        I,
-        {
-          items: f,
-          strategy: K,
-          children: /* @__PURE__ */ m.jsx(N, { vertical: !0, className: "sortList", children: g.map((o) => /* @__PURE__ */ m.jsx(
-            R,
-            {
-              item: o,
-              placement: u,
-              onLeftClick: a,
-              onRightClick: p,
-              onCheckboxChange: w
-            },
-            o.key
-          )) })
-        }
-      )
-    }
-  );
+  return m.jsx(w, { modifiers: [E, y], onDragStart: C, onDragEnd: b, onDragCancel: () => l(-1), children: m.jsx(I, { items: a, strategy: K, children: m.jsx(A, { vertical: !0, className: "sortList", children: d.map((o) => m.jsx(T, { item: o, placement: x, onLeftClick: u, onRightClick: g, onCheckboxChange: D }, o.key)) }) }) });
 };
 export {
-  P as default
+  O as default
 };

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

@@ -10,5 +10,5 @@ export interface ColumnsSortImperativeProps {
     getRightSortColumns: () => any;
     getRightSortKeys: () => any;
 }
-declare const ColumnsSort: import("react").ForwardRefExoticComponent<ColumnsSortProps & import("react").RefAttributes<ColumnsSortImperativeProps>>;
-export default ColumnsSort;
+declare const _default: import("react").MemoExoticComponent<import("react").ForwardRefExoticComponent<ColumnsSortProps & import("react").RefAttributes<ColumnsSortImperativeProps>>>;
+export default _default;