bitz-react-admin-ui 2.3.1 → 2.3.3

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

@@ -1,154 +1,154 @@
-import { j as y } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { useContext as D, useRef as Z, useMemo as o, useCallback as I } from "react";
-import { Table as tt } from "antd";
-import et from "../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
-import { BitzTableContext as rt, toolCols as nt } from "../Store/index.mjs";
-import ot from "../../../node_modules/.store/ahooks@3.7.11/node_modules/ahooks/es/useSize/index.mjs";
-import st from "../ActionCol/style.mjs";
-import at from "../../BitzTheme/index.mjs";
-import lt from "../../../node_modules/.store/antd@5.16.2/node_modules/antd/es/table/ExpandIcon.mjs";
+import { j as C } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import { useContext as L, useRef as ee, useMemo as o, useCallback as j } from "react";
+import { Table as te } from "antd";
+import ne from "../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
+import { BitzTableContext as re, toolCols as oe } from "../Store/index.mjs";
+import se from "../../../node_modules/.store/ahooks@3.7.11/node_modules/ahooks/es/useSize/index.mjs";
+import ae from "../../BitzTheme/index.mjs";
+import le from "../../../node_modules/.store/antd@5.16.2/node_modules/antd/es/table/ExpandIcon.mjs";
 import "../../../node_modules/.store/antd@5.16.2/node_modules/antd/es/config-provider/index.mjs";
-import ct from "../../../node_modules/.store/antd@5.16.2/node_modules/antd/locale/en_US.mjs";
-import { getColumnsWithTool as it, loopBuildSkeleton as ut } from "../Table/utils.mjs";
-import { ConfigContext as mt } from "../../../node_modules/.store/antd@5.16.2/node_modules/antd/es/config-provider/context.mjs";
-function Bt({
+import ie from "../../../node_modules/.store/antd@5.16.2/node_modules/antd/locale/en_US.mjs";
+import { getColumnsWithTool as ce, loopBuildSkeleton as ue } from "../Table/utils.mjs";
+import { tablePaddingInline as me } from "../../BitzConfigProvider/context.mjs";
+import { ConfigContext as fe } from "../../../node_modules/.store/antd@5.16.2/node_modules/antd/es/config-provider/context.mjs";
+function Te({
   dataSource: u,
   columns: g,
   loading: l,
   scroll: s,
   components: f,
-  expandable: c,
+  expandable: i,
   rowSelection: m,
   ...a
 }) {
-  var T, p;
-  const { token: L } = at.useToken(), { gap: j } = st(), { showColumnBorder: K, rowHoverable: M } = D(rt), h = Z(null), C = ot((T = h.current) == null ? void 0 : T.nativeElement), q = o(() => {
-    let t = (s == null ? void 0 : s.x) ?? 1e3;
-    return s != null && s.x ? { x: t, y: s.y || 400 } : s != null && s.y ? { x: t, y: s.y } : { x: t, y: 400 };
-  }, [s]), P = () => {
-    var n, r;
-    const t = (r = (n = h.current) == null ? void 0 : n.nativeElement) == null ? void 0 : r.querySelectorAll(
+  var p, W, E;
+  const { token: x } = ae.useToken(), K = ((p = x.Table) == null ? void 0 : p.cellPaddingInline) ?? me, { showColumnBorder: M, rowHoverable: P } = L(re), h = ee(null), w = se((W = h.current) == null ? void 0 : W.nativeElement), q = o(() => {
+    let e = (s == null ? void 0 : s.x) ?? 1e3;
+    return s != null && s.x ? { x: e, y: s.y || 400 } : s != null && s.y ? { x: e, y: s.y } : { x: e, y: 400 };
+  }, [s]), A = () => {
+    var r, n;
+    const e = (n = (r = h.current) == null ? void 0 : r.nativeElement) == null ? void 0 : n.querySelectorAll(
       "& > .bitzTableContainerBody > .ant-table-wrapper.bitzTable > .ant-spin-nested-loading > .ant-spin-container > .ant-table > .ant-table-container > .ant-table-body > table > .ant-table-tbody > tr:not(.ant-table-measure-row, .ant-table-expanded-row)"
-    ), e = [];
-    if (t == null || t.forEach((i) => {
+    ), t = [];
+    if (e == null || e.forEach((c) => {
       var b;
-      e.push(
-        ((b = i.querySelector("& > .operationCol .actionGroup")) == null ? void 0 : b.clientWidth) || 0
+      t.push(
+        ((b = c.querySelector("& > .operationCol .actionGroup")) == null ? void 0 : b.clientWidth) || 0
       );
-    }), e.length)
-      return Math.ceil(Math.max(...e)) + j * 2;
-  }, A = () => {
-    var b, W, E, v, N;
-    const t = (W = (b = h.current) == null ? void 0 : b.nativeElement) == null ? void 0 : W.querySelector(
+    }), t.length)
+      return Math.ceil(Math.max(...t)) + K * 2;
+  }, $ = () => {
+    var b, I, v, N, D;
+    const e = (I = (b = h.current) == null ? void 0 : b.nativeElement) == null ? void 0 : I.querySelector(
       ".ant-table-body"
-    ), e = t == null ? void 0 : t.clientWidth, r = ((t == null ? void 0 : t.offsetWidth) || 0) - e > 0, i = (N = (v = (E = h.current) == null ? void 0 : E.nativeElement) == null ? void 0 : v.querySelector(
+    ), t = e == null ? void 0 : e.clientWidth, n = ((e == null ? void 0 : e.offsetWidth) || 0) - t > 0, c = (D = (N = (v = h.current) == null ? void 0 : v.nativeElement) == null ? void 0 : N.querySelector(
       ".ant-table-cell-scrollbar"
-    )) == null ? void 0 : N.offsetWidth;
-    return { tbodyWidth: e, scrollbarSize: i, hasScrollBar: r };
-  }, { hasScrollBar: x, scrollbarSize: R } = o(() => {
-    const { hasScrollBar: t, scrollbarSize: e } = A();
+    )) == null ? void 0 : D.offsetWidth;
+    return { tbodyWidth: t, scrollbarSize: c, hasScrollBar: n };
+  }, { hasScrollBar: R, scrollbarSize: k } = o(() => {
+    const { hasScrollBar: e, scrollbarSize: t } = $();
     return {
-      hasScrollBar: t,
-      scrollbarSize: e
+      hasScrollBar: e,
+      scrollbarSize: t
     };
-  }, [C == null ? void 0 : C.height]), d = o(() => {
-    const t = g ?? [], n = t.filter((r) => !nt.includes(r)).map((r) => ({
-      ...r,
-      width: r.useMaxWidth ? P() ?? r.width : r.width
+  }, [w == null ? void 0 : w.height]), d = o(() => {
+    const e = g ?? [], r = e.filter((n) => !oe.includes(n)).map((n) => ({
+      ...n,
+      width: n.useMaxWidth ? A() ?? n.width : n.width
     }));
-    return it(
-      t,
-      n,
+    return ce(
+      e,
+      r,
       !1,
       !!m,
-      !!c
+      !!i
     );
-  }, [g]), k = o(() => ut(d), [d]), G = o(() => l ? k : d, [l, d, k]), S = o(() => {
-    const t = (u == null ? void 0 : u.length) ?? 0, e = t > 4 ? t >= 8 ? 8 : t : 4;
-    return Array.from({ length: e }).map((r, i) => ({
-      key: `${Date.now()}${i}`
+  }, [g]), S = o(() => ue(d), [d]), F = o(() => l ? S : d, [l, d, S]), z = o(() => {
+    const e = (u == null ? void 0 : u.length) ?? 0, t = e > 4 ? e >= 8 ? 8 : e : 4;
+    return Array.from({ length: t }).map((n, c) => ({
+      key: `${Date.now()}${c}`
     }));
-  }, [u]), $ = o(() => l ? S : u, [l, u, S]), { table: w, locale: F = ct } = D(mt), H = { ...F.Table }, _ = ((p = w == null ? void 0 : w.expandable) == null ? void 0 : p.expandIcon) || (c == null ? void 0 : c.expandIcon) || lt(H), z = o(() => {
-    if (c)
+  }, [u]), G = o(() => l ? z : u, [l, u, z]), { table: y, locale: H = ie } = L(fe), _ = { ...H.Table }, J = ((E = y == null ? void 0 : y.expandable) == null ? void 0 : E.expandIcon) || (i == null ? void 0 : i.expandIcon) || le(_), B = o(() => {
+    if (i)
       return {
-        ...c,
-        expandedRowRender: () => /* @__PURE__ */ y.jsx(y.Fragment, {}),
-        expandIcon: (t) => {
-          const e = _(t);
+        ...i,
+        expandedRowRender: () => /* @__PURE__ */ C.jsx(C.Fragment, {}),
+        expandIcon: (e) => {
+          const t = J(e);
           return {
-            ...e,
+            ...t,
             props: {
-              ...e.props,
+              ...t.props,
               disabled: !0,
               style: {
-                ...e.props.style,
-                backgroundColor: L.colorBgContainerDisabled
+                ...t.props.style,
+                backgroundColor: x.colorBgContainerDisabled
               }
             }
           };
         }
       };
-  }, [c]), J = o(() => l ? z : c, [l, c, z]), B = o(() => {
+  }, [i]), O = o(() => l ? B : i, [l, i, B]), T = o(() => {
     if (m)
       return {
         ...m,
         selectedRowKeys: [],
         getCheckboxProps: () => ({ disabled: !0 })
       };
-  }, [m]), O = o(() => l ? B : m, [l, m, B]), Q = o(() => l ? void 0 : a.rowKey, [l, a.rowKey]), U = I(
-    (t, e) => {
-      var r;
+  }, [m]), Q = o(() => l ? T : m, [l, m, T]), U = o(() => l ? void 0 : a.rowKey, [l, a.rowKey]), V = j(
+    (e, t) => {
+      var n;
       if (!a.onRow)
         return {};
-      const n = (r = a.onRow) == null ? void 0 : r.call(a, t, e);
-      return n.onClick && (n.className = "rowPointerCursor"), n;
+      const r = (n = a.onRow) == null ? void 0 : n.call(a, e, t);
+      return r.onClick && (r.className = "rowPointerCursor"), r;
     },
     [a.onRow]
-  ), V = I(
-    (t, e, n) => {
-      const r = e % 2 === 0 ? "oddRow" : "evenRow";
+  ), X = j(
+    (e, t, r) => {
+      const n = t % 2 === 0 ? "oddRow" : "evenRow";
       if (a.rowClassName) {
-        const i = a.rowClassName(t, e, n);
-        return et(r, i);
+        const c = a.rowClassName(e, t, r);
+        return ne(n, c);
       }
-      return r;
+      return n;
     },
     [a.rowClassName]
-  ), X = (t) => {
-    var n;
-    const e = { ...t };
-    return e.className.includes("ant-table-cell-fix-right") && !x && ((n = e.style) != null && n.right) && (e.style = {
-      ...e.style,
-      right: e.style.right - (R || 0)
-    }), /* @__PURE__ */ y.jsx("th", { ...e });
-  }, Y = o(() => ({
+  ), Y = (e) => {
+    var r;
+    const t = { ...e };
+    return t.className.includes("ant-table-cell-fix-right") && !R && ((r = t.style) != null && r.right) && (t.style = {
+      ...t.style,
+      right: t.style.right - (k || 0)
+    }), /* @__PURE__ */ C.jsx("th", { ...t });
+  }, Z = o(() => ({
     ...f,
     header: {
       ...f == null ? void 0 : f.header,
-      cell: X
+      cell: Y
     }
-  }), [f, x, R]);
-  return /* @__PURE__ */ y.jsx(
-    tt,
+  }), [f, R, k]);
+  return /* @__PURE__ */ C.jsx(
+    te,
     {
       ...a,
-      bordered: K,
-      columns: G,
-      dataSource: $,
+      bordered: M,
+      columns: F,
+      dataSource: G,
       loading: !1,
       pagination: !1,
       scroll: q,
-      expandable: J,
-      rowSelection: O,
-      onRow: U,
-      rowClassName: V,
-      components: Y,
-      rowKey: Q,
-      rowHoverable: M,
+      expandable: O,
+      rowSelection: Q,
+      onRow: V,
+      rowClassName: X,
+      components: Z,
+      rowKey: U,
+      rowHoverable: P,
       ref: h
     }
   );
 }
 export {
-  Bt as default
+  Te as default
 };

package/dist/components/BitzTable/Table/SortTableContext.d.ts

@@ -1,12 +1,10 @@
-import { DragEndEvent } from '@dnd-kit/core';
 import { ReactNode } from 'react';
 interface SortTableContextProps {
     children?: ReactNode;
     enabledRowDragSort?: boolean;
     dataSource: any[];
     mergeRowKey: string;
-    onDragEnd: (event: DragEndEvent) => void;
+    onDragEnd: (newCols: any[]) => void;
 }
-declare function SortTableContext({ children, enabledRowDragSort, dataSource, mergeRowKey, onDragEnd, }: SortTableContextProps): import("react/jsx-runtime").JSX.Element;
-declare const _default: import("react").MemoExoticComponent<typeof SortTableContext>;
-export default _default;
+declare function SortTableContext({ children, enabledRowDragSort, dataSource, mergeRowKey, onDragEnd: dragEndEmit, }: SortTableContextProps): import("react/jsx-runtime").JSX.Element;
+export default SortTableContext;

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

@@ -1,25 +1,48 @@
-import { j as t } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { DndContext as a } from "../../../node_modules/.store/@dnd-kit_core@6.1.0/node_modules/@dnd-kit/core/dist/core.esm.mjs";
-import { restrictToVerticalAxis as n } from "../../../node_modules/.store/@dnd-kit_modifiers@6.0.1/node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
-import { SortableContext as x, verticalListSortingStrategy as f } from "../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
-import { memo as p } from "react";
-function l({
-  children: r,
-  enabledRowDragSort: o,
-  dataSource: e,
-  mergeRowKey: m,
-  onDragEnd: i
+import { j as n } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import { DndContext as v } from "../../../node_modules/.store/@dnd-kit_core@6.1.0/node_modules/@dnd-kit/core/dist/core.esm.mjs";
+import { restrictToVerticalAxis as u } from "../../../node_modules/.store/@dnd-kit_modifiers@6.0.1/node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
+import { SortableContext as j, verticalListSortingStrategy as C, arrayMove as D } from "../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
+import { useState as S } from "react";
+function T({
+  children: a,
+  enabledRowDragSort: x,
+  dataSource: i,
+  mergeRowKey: d,
+  onDragEnd: f
 }) {
-  return o ? /* @__PURE__ */ t.jsx(a, { modifiers: [n], onDragEnd: i, children: /* @__PURE__ */ t.jsx(
-    x,
+  const [c, s] = S(-1), l = (t) => {
+    var r, e;
+    const { active: o } = t;
+    o && s((e = (r = o.data) == null ? void 0 : r.current) == null ? void 0 : e.sortable.index);
+  }, g = (t) => {
+    var r, e;
+    const { over: o } = t;
+    if (o) {
+      const m = (e = (r = o.data) == null ? void 0 : r.current) == null ? void 0 : e.sortable.index;
+      c !== m && p(c, m);
+    }
+  }, p = (t, o) => {
+    const r = D(i.slice() ?? [], t, o);
+    f(r), s(-1);
+  };
+  return x ? /* @__PURE__ */ n.jsx(
+    v,
     {
-      items: e.map((s) => s[m]),
-      strategy: f,
-      children: r
+      modifiers: [u],
+      onDragStart: l,
+      onDragEnd: g,
+      onDragCancel: () => s(-1),
+      children: /* @__PURE__ */ n.jsx(
+        j,
+        {
+          items: i.map((t) => t[d]),
+          strategy: C,
+          children: a
+        }
+      )
     }
-  ) }) : /* @__PURE__ */ t.jsx(t.Fragment, { children: r });
+  ) : /* @__PURE__ */ n.jsx(n.Fragment, { children: a });
 }
-const C = p(l);
 export {
-  C as default
+  T as default
 };

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

@@ -6,7 +6,6 @@ import type { RowClassName } from 'rc-table/es/interface';
 import { ColumnStateType, DensitySize, StylesStateType, ExportColumnStateType } from '../Store';
 import { ActionsFunType, BitzTableColumnsType, SelelctionAlertProps } from '..';
 import { BitzTableBorderedType } from '@/components/BitzConfigProvider/context';
-import { DragEndEvent } from '@dnd-kit/core';
 import './index.less';
 export interface BitzTableProps<RecordType = any> extends Omit<TableProps<RecordType>, 'size' | 'pagination' | 'bordered'> {
     /** 是否开启rowHover样式 */
@@ -61,7 +60,7 @@ export interface BitzTableProps<RecordType = any> extends Omit<TableProps<Record
     /** 是否启用拖拽 */
     enabledRowDragSort?: boolean;
     /** 拖拽结束 */
-    onRowDragEnd?: (event: DragEndEvent) => void;
+    onRowDragEnd?: (newCols: RecordType[]) => void;
     /** 移动端：加载更多返回函数 */
     /** 移动端：下拉刷新 */
     mobileRefreshEmit?: () => Promise<unknown> | void;