bitz-react-admin-ui 2.2.5 → 2.2.7

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

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

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

@@ -30,7 +30,7 @@ const T = ({ children: m, loading: t, ...e }) => {
       },
       children: a.Children.map(m, (r) => {
         var n, s;
-        return ((s = (n = r.props) == null ? void 0 : n.additionalProps) == null ? void 0 : s["data-column-name"]) === "dragSortCell" ? a.cloneElement(r, {
+        return ((s = (n = r.props) == null ? void 0 : n.additionalProps) == null ? void 0 : s["data-column-name"]) === "dragSorterCell" ? a.cloneElement(r, {
           children: /* @__PURE__ */ i.jsx(
             j,
             {
@@ -38,7 +38,7 @@ const T = ({ children: m, loading: t, ...e }) => {
               style: {
                 touchAction: "none",
                 cursor: t === "true" ? "default" : "move",
-                fontSize: "calc(var(--fontSize) + 3px)",
+                fontSize: "calc(var(--fontSize) + 2px)",
                 color: t === "true" ? l.colorTextDisabled : "inherit"
               },
               ...u

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

@@ -4,15 +4,11 @@ import { SkeletonParagraphProps } from 'antd/es/skeleton/Paragraph';
 import { AnyObject } from 'antd/es/_util/type';
 import type { RowClassName } from 'rc-table/es/interface';
 import { ColumnStateType, DensitySize, StylesStateType, ExportColumnStateType } from '../Store';
-import { ActionsFunType, BitzTableColumnsType } from '..';
+import { ActionsFunType, BitzTableColumnsType, SelelctionAlertProps } from '..';
 import { BitzTableBorderedType } from '@/components/BitzConfigProvider/context';
-import { TableRowSelection } from 'antd/es/table/interface';
 import { DragEndEvent } from '@dnd-kit/core';
 import './index.less';
-export interface BitzTableRowSelectionProps<RecordType> extends TableRowSelection<RecordType> {
-    onClear?: () => void;
-}
-export interface BitzTableProps<RecordType = any> extends Omit<TableProps<RecordType>, 'size' | 'pagination' | 'bordered' | 'rowSelection'> {
+export interface BitzTableProps<RecordType = any> extends Omit<TableProps<RecordType>, 'size' | 'pagination' | 'bordered'> {
     /** 是否开启rowHover样式 */
     rowHoverable?: boolean;
     /** 是否开启斑马纹样式 */
@@ -21,8 +17,6 @@ export interface BitzTableProps<RecordType = any> extends Omit<TableProps<Record
     bordered?: BitzTableBorderedType;
     /** PC端：是否显示分页 */
     showPagination?: boolean;
-    /** PC端：是否显示分页选中条数据 */
-    showSelected?: boolean;
     /** PC端：BitzTable组件的整体高度，由外部通过视口高度减去其他元素高度和间隙的结果 */
     height?: number;
     /** table可滚动区域的最大宽高的值 */
@@ -40,8 +34,6 @@ export interface BitzTableProps<RecordType = any> extends Omit<TableProps<Record
     operationFilter?: ActionsFunType<RecordType>;
     /** PC&移动端：请求加载状态 */
     loading?: boolean;
-    /** 多选/单选 */
-    rowSelection?: BitzTableRowSelectionProps<RecordType>;
     /** 骨架屏列表个数 */
     skeletonNum?: {
         pc?: number;
@@ -57,6 +49,8 @@ export interface BitzTableProps<RecordType = any> extends Omit<TableProps<Record
     size?: DensitySize;
     /** 是否启用分页组件的受控属性 */
     enableControlPage?: boolean;
+    /** 多选/单选操作 */
+    selelctionAlert?: SelelctionAlertProps;
     /** 分页控件的分页属性 */
     pagination?: {
         page: number;