bitz-react-admin-ui 1.6.6 → 1.6.8

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

@@ -1,112 +1,174 @@
-import { j as s } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { useContext as ze, useState as U, useMemo as x, useRef as v, useEffect as Be, useCallback as Me } from "react";
-import { isMobile as z } from "../../../node_modules/.store/react-device-detect@2.2.3/node_modules/react-device-detect/dist/lib.mjs";
-import { theme as Te, Table as A, Skeleton as ke } from "antd";
-import Ee from "../../BitzDrawer/index.mjs";
-import Le from "../../BitzLoadMore/index.mjs";
-import Ae from "../../BitzPagination/index.mjs";
-import We from "../../BitzNoData/index.mjs";
-import He, { TableContext as Pe } from "../Store/index.mjs";
+import { j as t } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import { useContext as ve, useState as J, useMemo as b, useRef as P, useEffect as Me, useCallback as ke } from "react";
+import { isMobile as M } from "../../../node_modules/.store/react-device-detect@2.2.3/node_modules/react-device-detect/dist/lib.mjs";
+import { theme as ze, Table as E, Skeleton as Le } from "antd";
+import We from "../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
+import Ae from "../../BitzDrawer/index.mjs";
+import Pe from "../../BitzPagination/index.mjs";
+import Ee from "../../BitzNoData/index.mjs";
+import "../../BitzList/index.less.mjs";
+import He from "../../BitzList/List.mjs";
+import "../../BitzPullRefresh/style/index.less.mjs";
+import De from "../../BitzPullRefresh/PullRefresh.mjs";
+import Se, { TableContext as Fe } from "../Store/index.mjs";
 import Oe from "../TableSkeleton/index.mjs";
-import { columnSort as X, genColumnKey as q } from "../Store/utils/index.mjs";
-import G from "../../../node_modules/.store/ahooks@3.7.10/node_modules/ahooks/es/useSize/index.mjs";
+import { columnSort as Q, genColumnKey as Y } from "../Store/utils/index.mjs";
+import H from "../../../node_modules/.store/ahooks@3.7.10/node_modules/ahooks/es/useSize/index.mjs";
+import Ve from "../ActionCol/style.mjs";
 import "./index.less.mjs";
-import $e from "../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/at.mjs";
-function Se({ showPagination: p = !0, fillEvenRow: W = !0, evenRowBgColor: H = "#f9f9f9", height: m, dataSource: t = [], total: B = 0, columns: u, loading: w = !1, skeletonNum: J = 2, skeletonRender: P, skeletonRowNum: Q = 4, skeletonRowsWidth: Y = ["35%", "100%", "100%", "60%"], mobileLoadEmit: Z = () => {
-}, mobileRefreshEmit: I = () => {
-}, operationFilter: M, enableControlPage: ee, pagination: ne, paginationEmit: se = () => {
-}, mobilePageHeight: le = 500, mobileCancelText: te = "取消", noDataTitle: oe, noDataImg: re, color: ie, size: O, showTableTool: ae = !0, tableAction: de, tableToolbar: ce, selectionBar: he, scroll: i, resetPage: fe, ...a }) {
-  const { token: xe } = Te.useToken(), d = ze(Pe), [ue, T] = U(!1), be = x(() => !!(t != null && t.length) && (t == null ? void 0 : t.length) >= B, [t, B]), [ge, ye] = U([]), we = (e, n) => {
-    var h;
-    const l = (h = M == null ? void 0 : M(e, n)) == null ? void 0 : h.filter((c) => c.type !== "divider");
-    l != null && l.length && (ye(l), T(!0));
-  }, $ = () => {
-    T(!1);
-  }, je = (e) => {
+import _e from "../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/at.mjs";
+function $e({ showPagination: B = !0, fillEvenRow: D = !0, evenRowBgColor: Ke = "#f9f9f9", height: m, dataSource: s = [], total: k = 0, columns: g, loading: j = !1, skeletonNum: Z = 2, skeletonRender: S, skeletonRowNum: I = 4, skeletonRowsWidth: ee = ["35%", "100%", "100%", "60%"], mobileLoadEmit: oe, mobileRefreshEmit: F, operationFilter: z, enableControlPage: te, pagination: ne, paginationEmit: le = () => {
+}, mobilePageHeight: Re = 500, mobileCancelText: re = "取消", noDataTitle: se, noDataImg: ae, color: qe, size: O, showTableTool: ie = !0, tableAction: ce, tableToolbar: de, selectionBar: he, scroll: c, resetPage: ue, ...d }) {
+  var U;
+  const { token: h } = ze.useToken(), { gap: fe } = Ve(), u = ve(Fe), [xe, L] = J(!1), be = b(() => !!(s != null && s.length) && (s == null ? void 0 : s.length) >= k, [s, k]), [ge, pe] = J([]), Ce = (e, o) => {
     var n;
-    T(!1), (n = e.onClick) == null || n.call(e);
-  }, b = v(null), g = G(b), S = v(null), k = v(null), _ = v(null), y = G(_), pe = x(() => {
-    var e;
-    return ((e = k.current) == null ? void 0 : e.getSize()) || 10;
-  }, [k.current]), me = (e) => {
-    var V, F;
-    const n = e.length, l = e.filter((f) => f.width), c = l.map((f) => f.width).reduce((f, ve) => f + ve, 0);
-    let r = 0;
-    if (b.current) {
-      const f = window.getComputedStyle(b.current);
-      r = parseInt(f.getPropertyValue("--toolCell-width"));
+    const l = (n = z == null ? void 0 : z(e, o)) == null ? void 0 : n.filter((r) => r.type !== "divider");
+    l != null && l.length && (pe(l), L(!0));
+  }, V = () => {
+    L(!1);
+  }, ye = (e) => {
+    var o;
+    L(!1), (o = e.onClick) == null || o.call(e);
+  }, p = P(null), C = H(p), N = P(null), W = H(N), _ = P(null), y = H(_), me = () => {
+    var l;
+    const e = (l = N.current) == null ? void 0 : l.querySelectorAll(".ant-table-body tr:not(.ant-table-measure-row)"), o = [];
+    if (e == null || e.forEach((n) => {
+      var r;
+      o.push(((r = n.querySelector(".operationCol .actionGroup")) == null ? void 0 : r.clientWidth) || 0);
+    }), o.length)
+      return Math.ceil(Math.max(...o)) + fe * 2;
+  }, $ = () => {
+    var r;
+    const e = (r = N.current) == null ? void 0 : r.querySelector(".ant-table-body"), o = e == null ? void 0 : e.clientWidth, l = ((e == null ? void 0 : e.offsetWidth) || 0) - o, n = l > 0;
+    return { tbodyWidth: o, scrollBarWidth: l, hasScrollBar: n };
+  }, we = (e) => {
+    const o = e.length, l = e.filter((x) => x.width), r = l.map((x) => x.width).reduce((x, Te) => x + Te, 0);
+    let a = 0;
+    if (p.current) {
+      const x = window.getComputedStyle(p.current);
+      a = parseInt(x.getPropertyValue("--toolCell-width"));
     }
-    let o = 0;
-    a.rowSelection && (o += r), a.expandable && (o += r);
-    const L = (F = (V = S.current) == null ? void 0 : V.querySelector(".ant-table-body")) == null ? void 0 : F.clientWidth, C = parseInt(`${N.x}`) || 0, Ce = Math.max(C, L), R = (parseInt(`${Ce}`) || 0) - c - o;
-    return R >= 0 ? R / (n - l.length) : void 0;
-  }, { y: E } = x(() => {
+    let i = 0;
+    d.rowSelection && (i += a), d.expandable && (i += a);
+    const { tbodyWidth: v } = $(), f = parseInt(`${T.x}`) || 0, Ne = Math.max(f, v), X = (parseInt(`${Ne}`) || 0) - r - i;
+    return X >= 0 ? X / (o - l.length) : void 0;
+  }, { y: A, hasScrollBar: K } = b(() => {
     if (typeof m > "u")
       return {};
-    let e = 40, n = 40;
-    if (b.current) {
-      const r = window.getComputedStyle(b.current);
-      e = parseInt(r.getPropertyValue("--cell-block") || "40"), n = parseInt(r.getPropertyValue("--toolbar-height") || "40");
+    const { hasScrollBar: e } = $();
+    let o = 40, l = 40, n = 10;
+    if (p.current) {
+      const f = window.getComputedStyle(p.current);
+      o = parseInt(f.getPropertyValue("--cell-block")), l = parseInt(f.getPropertyValue("--toolbar-height")), n = parseInt(f.getPropertyValue("--container-gap")) || 0;
     }
-    const l = y == null ? void 0 : y.height;
-    return { y: m - (l || 0) - n - e };
-  }, [m, y == null ? void 0 : y.height, g == null ? void 0 : g.height]), N = x(() => i != null && i.x ? { x: i.x, y: i.y || E } : i != null && i.y ? { x: 1e3, y: i.y } : { x: 1e3, y: E }, [i, E]), j = x(() => {
-    const e = (r) => r.map((o) => {
-      const L = q((o == null ? void 0 : o.key) || (o == null ? void 0 : o.dataIndex), o.index), C = d.columnsMap[L];
-      return C && C.show === !1 ? !1 : o.children ? {
-        ...o,
-        children: e(o.children)
-      } : o;
-    }).filter(Boolean), n = e(u);
-    if (z)
-      return n.sort(X(d.columnsMap));
-    const l = n.sort(X(d.columnsMap)), h = me(l), c = l.map((r) => ({
-      ...r,
-      ...r.width ? {} : {
+    const r = (y == null ? void 0 : y.height) || 0, a = r ? n : 0;
+    return { y: m - r - a - l - o, hasScrollBar: e };
+  }, [
+    m,
+    y == null ? void 0 : y.height,
+    C == null ? void 0 : C.height,
+    W == null ? void 0 : W.height
+  ]), T = b(() => c != null && c.x ? { x: c.x, y: c.y || A } : c != null && c.y ? { x: 1e3, y: c.y } : { x: 1e3, y: A }, [c, A]), w = b(() => {
+    const e = (a) => a.map((i) => {
+      const v = Y((i == null ? void 0 : i.key) || (i == null ? void 0 : i.dataIndex), i.index), f = u.columnsMap[v];
+      return f && f.show === !1 ? !1 : i.children ? {
+        ...i,
+        children: e(i.children)
+      } : i;
+    }).filter(Boolean), o = e(g);
+    if (M)
+      return o.sort(Q(u.columnsMap));
+    const l = o.sort(Q(u.columnsMap)), n = we(l), r = l.map((a) => ({
+      ...a,
+      ...a.width ? {
+        width: a.useMaxWidth ? me() ?? a.width : a.width
+      } : {
         // 给未设置width的列设置平均数
-        width: h
+        width: n
       }
     }));
-    return [A.SELECTION_COLUMN, A.EXPAND_COLUMN, ...c];
+    return [E.SELECTION_COLUMN, E.EXPAND_COLUMN, ...r];
   }, [
-    d.columnsMap,
-    u,
-    z,
-    N.x,
-    a.rowSelection,
-    a.expandable,
-    g == null ? void 0 : g.height
+    u.columnsMap,
+    g,
+    M,
+    T.x,
+    d.rowSelection,
+    d.expandable,
+    C == null ? void 0 : C.height
   ]);
-  Be(() => {
-    if (u && u.length > 0) {
-      const e = u.map((n) => (
+  Me(() => {
+    if (g && g.length > 0) {
+      const e = g.map((o) => (
         // @ts-ignore
-        q((n == null ? void 0 : n.key) ?? (n == null ? void 0 : n.dataIndex), n == null ? void 0 : n.dataIndex)
+        Y((o == null ? void 0 : o.key) ?? (o == null ? void 0 : o.dataIndex), o == null ? void 0 : o.dataIndex)
       ));
-      d.setSortKeyColumns(e);
+      u.setSortKeyColumns(e);
     }
-  }, [u]);
-  const Ne = x(() => `${O ?? (d == null ? void 0 : d.tableSize) ?? "lg"}BitzTable`, [O, d.tableSize]), D = x(() => ({
-    "--evenRow-BgColor": H
-    // '--tableBody-bootomBorderColor': token.Table?.borderColor || '#f0f0f0',
-  }), [
-    H
-    /** token.Table?.borderColor */
-  ]), K = Me((e, n) => W ? n % 2 === 0 ? "oddRow" : "evenRow" : "", [W]);
-  return s.jsxs("div", { className: "bitzTableBlock", children: [!z && s.jsxs("div", { ref: b, className: `bitzTableContainer ${Ne}`, style: { height: m }, children: [s.jsxs("div", { className: "bitzTableContainerBody", ref: S, children: [ae && s.jsxs("div", { className: "bitzTableToolbarBlock", children: [de || s.jsx("div", {}), ce, (a == null ? void 0 : a.rowSelection) && s.jsx(s.Fragment, { children: he })] }), s.jsx(A, { columns: j, dataSource: t, loading: !1, pagination: !1, scroll: N, ...a, style: D, rowClassName: K }), s.jsx(Oe, { columns: j, pageSize: pe, scroll: N, rowSelection: a.rowSelection, expandable: a.expandable, style: D, rowClassName: K, loading: w })] }), p && s.jsx(Ae, { elRefInstance: _, refInstance: k, enableControl: ee, pagination: ne, total: B, dataSource: t, resetPage: fe, paginationEmit: se })] }), z && s.jsxs(s.Fragment, { children: [(w || (t == null ? void 0 : t.length) > 0) && s.jsx(Le, { color: ie, height: le, loading: w, showNoMore: be, refreshEmit: I, loadEmit: Z, extra: s.jsxs("div", { className: "mobileTable", children: [t == null ? void 0 : t.map((e, n) => s.jsx("div", { className: "mobileTableRow", onClick: () => we(e, n), children: s.jsx("div", { className: "rowBox", children: j == null ? void 0 : j.map((l, h) => {
-    var c;
-    return s.jsx("div", { children: !(l != null && l.mobileHide) && s.jsxs("div", { className: "row", children: [!l.mobileHideLabel && s.jsxs("div", { className: "label", children: [`${l.title}`, "："] }), s.jsx("div", { className: "value", children: ((c = l == null ? void 0 : l.render) == null ? void 0 : c.call(l, $e(e, (l == null ? void 0 : l.dataIndex) || ""), e, n)) || (e == null ? void 0 : e[l.dataIndex]) })] }) }, h);
-  }) }) }, n)), w && Array.from({ length: J }).map((e, n) => s.jsx("div", { className: "mobileTableRow", children: s.jsx("div", { className: "rowBox", children: P ? P() : s.jsx(ke, { title: !1, paragraph: {
-    rows: Q,
-    width: Y
-  }, active: !0 }) }) }, n)), s.jsx(Ee, { className: "tableMobileDrawer", open: ue, placement: "bottom", height: "auto", closable: !1, onClose: $, children: s.jsxs("div", { className: "drawerBox", children: [s.jsx("div", { className: "boxBody", children: ge.map((e, n) => s.jsx("div", { className: "operaList", onClick: () => je(e), ...e.danger && {
-    style: { color: xe.colorError }
-  }, children: e.label }, n)) }), s.jsx("div", { className: "boxLine" }), s.jsx("div", { className: "boxFooter", onClick: $, children: te })] }) })] }) }), !w && s.jsx(We, { data: t, title: oe, img: re })] })] });
+  }, [g]);
+  const R = b(() => `${O ?? (u == null ? void 0 : u.tableSize) ?? "lg"}BitzTable`, [O, u.tableSize]), Be = b(() => We(
+    "bitzTableContainer",
+    /* "hideBorder", */
+    { hasScrollBar: K },
+    R
+  ), [R, K]), je = b(() => {
+    var e, o, l, n, r;
+    return {
+      height: m,
+      "--toolbar-bgColor": (e = h.Table) == null ? void 0 : e.toolbarBgColor,
+      "--thead-bgColor": (o = h.Table) == null ? void 0 : o.theadBgColor,
+      "--thead-hoverBgColor": (l = h.Table) == null ? void 0 : l.theadHoverBgColor,
+      "--evenRow-BgColor": (n = h.Table) == null ? void 0 : n.evenRowBgColor,
+      "--expandIcon-borderColor": (r = h.Table) == null ? void 0 : r.expandIconBorderColor
+      // '--tableBody-bootomBorderColor': token.Table?.borderColor || '#f0f0f0',
+    };
+  }, [m]), q = ke((e, o) => D ? o % 2 === 0 ? "oddRow" : "evenRow" : "", [D]), G = t.jsx(He, {
+    finished: be,
+    // @ts-ignore
+    onLoad: oe,
+    loadingText: "加载中...",
+    finishedText: "没有更多了",
+    errorText: "加载失败",
+    children: t.jsxs("div", { className: "mobileList", style: { backgroundColor: (U = h.Table) == null ? void 0 : U.mobileListBgColor }, children: [s == null ? void 0 : s.map((e, o) => {
+      var l;
+      return t.jsx("div", { className: "listItem", style: { backgroundColor: (l = h.Table) == null ? void 0 : l.listItemBgColor }, onClick: () => Ce(e, o), children: w == null ? void 0 : w.map((n, r) => {
+        var a;
+        return !(n != null && n.mobileHide) && t.jsxs("div", { className: "row", style: { color: h.colorText }, children: [!n.mobileHideLabel && t.jsxs("div", { className: "label", children: [`${n.title}`, "："] }), t.jsx("div", { className: "value", children: ((a = n == null ? void 0 : n.render) == null ? void 0 : a.call(n, _e(e, (n == null ? void 0 : n.dataIndex) || ""), e, o)) || (e == null ? void 0 : e[n.dataIndex]) })] }, r);
+      }) }, o);
+    }), j && Array.from({ length: Z }).map((e, o) => {
+      var l;
+      return t.jsx("div", { className: "listItem", style: { backgroundColor: (l = h.Table) == null ? void 0 : l.listItemBgColor }, children: t.jsx("div", { className: "row", children: S ? S() : t.jsx(Le, { title: !1, paragraph: {
+        rows: I,
+        width: ee
+      }, active: !0 }) }) }, o);
+    })] })
+  });
+  return t.jsxs("div", { className: "bitzTableBlock", children: [!M && t.jsxs("div", { ref: p, className: Be, style: je, children: [t.jsxs("div", { className: "bitzTableContainerBody", ref: N, children: [ie && t.jsxs("div", { className: "bitzTableToolbarBlock", children: [ce || t.jsx("div", {}), de, (d == null ? void 0 : d.rowSelection) && t.jsx(t.Fragment, { children: he })] }), t.jsx(E, {
+    columns: w,
+    dataSource: s,
+    loading: !1,
+    pagination: !1,
+    scroll: T,
+    ...d,
+    // style={style}
+    rowClassName: q
+  }), t.jsx(Oe, {
+    columns: w,
+    dataLength: s.length,
+    scroll: T,
+    rowSelection: d.rowSelection,
+    expandable: d.expandable,
+    // style={style}
+    rowClassName: q,
+    loading: j
+  })] }), B && t.jsx(Pe, { elRefInstance: _, enableControl: te, pagination: ne, total: k, dataSource: s, resetPage: ue, paginationEmit: le })] }), M && t.jsxs(t.Fragment, { children: [(j || (s == null ? void 0 : s.length) > 0) && t.jsx(t.Fragment, { children: F ? t.jsx(De, { onRefresh: F, children: G }) : G }), !j && t.jsx(Ee, { data: s, title: se, img: ae }), t.jsx(Ae, { className: "tableMobileDrawer", open: xe, placement: "bottom", height: "auto", closable: !1, onClose: V, children: t.jsxs("div", { className: "drawerBox", children: [t.jsx("div", { className: "boxBody", children: ge.map((e, o) => t.jsx("div", { className: "operaList", onClick: () => ye(e), ...e.danger && {
+    style: { color: h.colorError }
+  }, children: e.label }, o)) }), t.jsx("div", { className: "boxLine" }), t.jsx("div", { className: "boxFooter", onClick: V, children: re })] }) })] })] });
 }
-const Ie = (p) => (
+const uo = (B) => (
   // @ts-ignore
-  s.jsx(He, { initValue: p, children: s.jsx(Se, { ...p }) })
+  t.jsx(Se, { initValue: B, children: t.jsx($e, { ...B }) })
 );
 export {
-  Ie as default
+  uo as default
 };

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

@@ -1,30 +1,32 @@
-import { j as s } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { theme as L, Skeleton as j, Table as d } from "antd";
-import T from "../../../node_modules/.store/antd@5.15.0/node_modules/antd/es/table/ExpandIcon.mjs";
-import { useContext as _, useMemo as c, useRef as R, useEffect as w } from "react";
+import { j as i } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import { theme as L, Skeleton as O, Table as l } from "antd";
+import R from "../../../node_modules/.store/antd@5.15.0/node_modules/antd/es/table/ExpandIcon.mjs";
+import { useContext as S, useMemo as f, useRef as T, useEffect as g } from "react";
 import "../../../node_modules/.store/antd@5.15.0/node_modules/antd/es/config-provider/index.mjs";
-import N from "../../../node_modules/.store/antd@5.15.0/node_modules/antd/locale/en_US.mjs";
-import { ConfigContext as O } from "../../../node_modules/.store/antd@5.15.0/node_modules/antd/es/config-provider/context.mjs";
-const q = ({ columns: n, pageSize: a, rowSelection: i, expandable: o, loading: l, ...m }) => {
-  var u;
-  const { token: x } = L.useToken(), { table: f, locale: y = N } = _(O), C = { ...y.Table }, b = ((u = f == null ? void 0 : f.expandable) == null ? void 0 : u.expandIcon) || (o == null ? void 0 : o.expandIcon) || T(C), k = c(() => {
-    const t = a >= 20 ? 20 : a;
-    return Array.from({ length: t }).map((e, r) => ({ index: r }));
-  }, [a]), I = c(() => {
+import h from "../../../node_modules/.store/antd@5.15.0/node_modules/antd/locale/en_US.mjs";
+import { ConfigContext as w } from "../../../node_modules/.store/antd@5.15.0/node_modules/antd/es/config-provider/context.mjs";
+const U = ({ columns: s, dataLength: c, rowSelection: a, expandable: r, loading: o, ...u }) => {
+  var m;
+  const { token: x } = L.useToken(), { table: p, locale: y = h } = S(w), C = { ...y.Table }, b = ((m = p == null ? void 0 : p.expandable) == null ? void 0 : m.expandIcon) || (r == null ? void 0 : r.expandIcon) || R(C), k = f(() => {
+    if (!o)
+      return [];
+    const t = c > 4 ? c >= 20 ? 20 : c : 4;
+    return Array.from({ length: t }).map((e, n) => ({ index: n }));
+  }, [o, c]), I = f(() => {
     var t;
-    return (t = n == null ? void 0 : n.filter((e) => Object.keys(e).length !== 0)) == null ? void 0 : t.map((e) => e != null && e.fixed ? e : {
+    return (t = s == null ? void 0 : s.filter((e) => Object.keys(e).length !== 0)) == null ? void 0 : t.map((e) => e != null && e.isOperationCol ? e : {
       ...e,
       sorter: !1,
-      render: (r, M, E) => s.jsx(j, { active: !0, title: !1, paragraph: {
+      render: (n, N, _) => i.jsx(O, { active: !0, title: !1, paragraph: {
         rows: 1,
-        width: (E + 1) % 2 === 0 ? "100%" : "60%"
+        width: (_ + 1) % 2 === 0 ? "100%" : "60%"
       } })
     });
-  }, [n]), g = c(() => {
-    if (o)
+  }, [s]), E = f(() => {
+    if (r)
       return {
-        ...o,
-        expandedRowRender: () => s.jsx(s.Fragment, {}),
+        ...r,
+        expandedRowRender: () => i.jsx(i.Fragment, {}),
         expandIcon: (t) => {
           const e = b(t);
           return {
@@ -40,27 +42,29 @@ const q = ({ columns: n, pageSize: a, rowSelection: i, expandable: o, loading: l
           };
         }
       };
-  }, [o]), h = c(() => {
-    if (i)
+  }, [r]), j = f(() => {
+    if (a)
       return {
-        ...i,
+        ...a,
         selectedRowKeys: [],
         getCheckboxProps: () => ({ disabled: !0 })
       };
-  }, [i]), p = R();
-  return w(() => {
-    var e, r;
-    const t = (r = (e = p.current) == null ? void 0 : e.nativeElement) == null ? void 0 : r.querySelector(".ant-table-body");
-    t && (t.scrollTop = 0);
-  }, [l]), s.jsx(d, { ...m, expandable: g, rowSelection: h, pagination: !1, columns: [d.SELECTION_COLUMN, d.EXPAND_COLUMN, ...I], rowKey: "index", dataSource: k, loading: !1, style: {
+  }, [a]), d = T();
+  return g(() => {
+    var e, n;
+    const t = (n = (e = d.current) == null ? void 0 : e.nativeElement) == null ? void 0 : n.querySelector(".ant-table-body");
+    t && (t.scrollLeft = 0);
+  }, [o]), i.jsx(l, { ...u, ref: d, expandable: E, rowSelection: j, pagination: !1, columns: [l.SELECTION_COLUMN, l.EXPAND_COLUMN, ...I], rowKey: "index", dataSource: k, loading: !1, style: {
+    ...u.style,
     position: "absolute",
     inset: 0,
     top: 40,
-    zIndex: l ? 9999 : -1,
+    zIndex: o ? 100 : -1,
     /** 保险起见，使用了zIndex也要用opacity控制显隐 */
-    opacity: l ? 1 : 0
-  }, ref: p });
+    opacity: o ? 1 : 0,
+    background: o ? "#fff" : "transparent"
+  } });
 };
 export {
-  q as default
+  U as default
 };

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

@@ -1,126 +1,115 @@
-import { j as e } from "../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { create as X, useModal as Y, antdModalV5 as Z } from "@ebay/nice-modal-react";
-import { Modal as _, Checkbox as $ } from "antd";
-import t from "./index.module.less.mjs";
-import { useState as w, useContext as L, useEffect as ss, useCallback as B, useMemo as y } from "react";
-import { TableContext as es } from "../../Store/index.mjs";
-import { genColumnKey as g, columnSort as os } from "../../Store/utils/index.mjs";
-import F from "../../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
-import { DndContext as ls, DragOverlay as ts, defaultDropAnimationSideEffects as ns } from "../../../../node_modules/.store/@dnd-kit_core@6.1.0/node_modules/@dnd-kit/core/dist/core.esm.mjs";
-import { SortableContext as as, verticalListSortingStrategy as cs, arrayMove as is } from "../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
-import rs from "./DndItem.mjs";
-import { restrictToVerticalAxis as ms, restrictToWindowEdges as us } from "../../../../node_modules/.store/@dnd-kit_modifiers@6.0.1/node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
-import T from "../../../BitzButton/index.mjs";
+import { j as s } from "../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import { create as Q, useModal as U, antdModalV5 as X } from "@ebay/nice-modal-react";
+import { Modal as Y, Checkbox as Z, Button as $ } from "antd";
+import a from "./index.module.less.mjs";
+import { useState as A, useContext as L, useEffect as ee, useCallback as I, useMemo as k } from "react";
+import { TableContext as se } from "../../Store/index.mjs";
+import { genColumnKey as _, columnSort as oe } from "../../Store/utils/index.mjs";
+import d from "../../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
+import { DndContext as te } from "../../../../node_modules/.store/@dnd-kit_core@6.1.0/node_modules/@dnd-kit/core/dist/core.esm.mjs";
+import { SortableContext as le, verticalListSortingStrategy as ne, arrayMove as ae } from "../../../../node_modules/.store/@dnd-kit_sortable@7.0.2/node_modules/@dnd-kit/sortable/dist/sortable.esm.mjs";
+import ce from "./DndItem.mjs";
+import { restrictToVerticalAxis as ie, restrictToWindowEdges as ue } from "../../../../node_modules/.store/@dnd-kit_modifiers@6.0.1/node_modules/@dnd-kit/modifiers/dist/modifiers.esm.mjs";
+import F from "../../../BitzButton/index.mjs";
 import "./index.less.mjs";
-import { useImmer as ds } from "../../../../node_modules/.store/use-immer@0.9.0/node_modules/use-immer/dist/use-immer.module.mjs";
-import ps from "../../../../assets/iconfont/IconTuodong.mjs";
-import O from "../../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/omit.mjs";
-import xs from "../../../../node_modules/.store/@ant-design_icons@5.3.1/node_modules/@ant-design/icons/es/icons/CheckCircleOutlined.mjs";
-import hs from "../../../../node_modules/.store/@ant-design_icons@5.3.1/node_modules/@ant-design/icons/es/icons/RedoOutlined.mjs";
-const fs = {
-  sideEffects: ns({
-    styles: {
-      active: {
-        opacity: "0.5"
-      }
-    }
-  })
-}, Os = X(() => {
-  var S;
-  const x = Y(), [d, j] = w(null), [z, v] = w(!1), [c, h] = ds({
+import { useImmer as me } from "../../../../node_modules/.store/use-immer@0.9.0/node_modules/use-immer/dist/use-immer.module.mjs";
+import H from "../../../../node_modules/.store/lodash-es@4.17.21/node_modules/lodash-es/omit.mjs";
+import re from "../../../../node_modules/.store/@ant-design_icons@5.3.1/node_modules/@ant-design/icons/es/icons/CheckCircleOutlined.mjs";
+import de from "../../../../node_modules/.store/@ant-design_icons@5.3.1/node_modules/@ant-design/icons/es/icons/RedoOutlined.mjs";
+const Be = Q(() => {
+  var D;
+  const h = U(), [C, b] = A(null), [T, S] = A(!1), [c, x] = me({
     columnsMap: {},
     sortKeyColumns: []
   }), {
     persistenceType: R,
-    persistenceKey: k,
-    onlineChange: C,
-    columnsMap: V,
-    setColumnsMap: W,
-    sortKeyColumns: q,
-    setSortKeyColumns: G,
+    persistenceKey: v,
+    onlineChange: f,
+    columnsMap: z,
+    setColumnsMap: O,
+    sortKeyColumns: V,
+    setSortKeyColumns: W,
     // clearPersistenceStorage,
     ...l
-  } = L(es);
-  ss(() => {
-    h((s) => {
-      s.columnsMap = { ...V }, s.sortKeyColumns = [...q];
+  } = L(se);
+  ee(() => {
+    x((e) => {
+      e.columnsMap = { ...z }, e.sortKeyColumns = [...V];
     });
   }, []);
-  const H = B(() => {
-    h((s) => {
-      s.columnsMap = { ...l.defaultColumnKeyMap };
+  const q = I(() => {
+    x((e) => {
+      e.columnsMap = { ...l.defaultColumnKeyMap };
     });
-  }, []), p = y(() => {
+  }, []), p = k(() => {
     var o, n;
-    const s = [];
-    return (o = l == null ? void 0 : l.columns) != null && o.length && ((n = l == null ? void 0 : l.columns) == null || n.map(({ key: u, dataIndex: a, ...r }) => {
-      const f = g(u || a, [u || a].filter(Boolean).join("-")), m = c.columnsMap[f || "null"];
-      return (m == null ? void 0 : m.show) !== !1 && s.push({
-        key: f,
-        ...O(r, ["className"]),
+    const e = [];
+    return (o = l == null ? void 0 : l.columns) != null && o.length && ((n = l == null ? void 0 : l.columns) == null || n.map(({ key: r, dataIndex: t, ...u }) => {
+      const y = _(r || t, [r || t].filter(Boolean).join("-")), m = c.columnsMap[y || "null"];
+      return (m == null ? void 0 : m.show) !== !1 && e.push({
+        key: y,
+        ...H(u, ["className"]),
         selectable: !1,
         disabled: (m == null ? void 0 : m.disable) === !0
       }), m;
-    })), s.sort(os(c.columnsMap));
-  }, [c.columnsMap, l == null ? void 0 : l.columns]), M = B((s) => {
+    })), e.sort(oe(c.columnsMap));
+  }, [c.columnsMap, l == null ? void 0 : l.columns]), j = I((e) => {
     var o;
-    return (o = c.sortKeyColumns) == null ? void 0 : o.findIndex((n) => n === s);
-  }, [c.sortKeyColumns]), N = y(() => d ? M(d) : -1, [d, M]), E = y(() => {
-    const s = [], o = /* @__PURE__ */ new Map();
-    return { list: ((u, a) => u.map(({ key: r, dataIndex: f, children: m, ...K }) => {
-      var I;
-      const b = g(r || f, [a == null ? void 0 : a.columnKey, K.index].filter(Boolean).join("-")), i = c.columnsMap[b || "null"] || { show: !0 };
-      (i == null ? void 0 : i.show) !== !1 && !m && s.push(b);
-      const A = {
-        key: b,
-        ...O(K, ["className"]),
+    return (o = c.sortKeyColumns) == null ? void 0 : o.findIndex((n) => n === e);
+  }, [c.sortKeyColumns]), E = k(() => C ? j(C) : -1, [C, j]), N = k(() => {
+    const e = [], o = /* @__PURE__ */ new Map();
+    return { list: ((r, t) => r.map(({ key: u, dataIndex: y, children: m, ...K }) => {
+      var B;
+      const M = _(u || y, [t == null ? void 0 : t.columnKey, K.index].filter(Boolean).join("-")), i = c.columnsMap[M || "null"] || { show: !0 };
+      (i == null ? void 0 : i.show) !== !1 && !m && e.push(M);
+      const w = {
+        key: M,
+        ...H(K, ["className"]),
         selectable: !1,
         disabled: i.disable === !0,
-        disableCheckbox: typeof i.disable == "boolean" ? i == null ? void 0 : i.disable : (I = i == null ? void 0 : i.disable) == null ? void 0 : I.checkbox,
-        isLeaf: a ? !0 : void 0
+        disableCheckbox: typeof i.disable == "boolean" ? i == null ? void 0 : i.disable : (B = i == null ? void 0 : i.disable) == null ? void 0 : B.checkbox,
+        isLeaf: t ? !0 : void 0
       };
-      return o.set(r, A), A;
-    }))(l == null ? void 0 : l.columns), keys: s, map: o };
-  }, [c.columnsMap, l == null ? void 0 : l.columns]), J = (s, o) => {
+      return o.set(u, w), w;
+    }))(l == null ? void 0 : l.columns), keys: e, map: o };
+  }, [c.columnsMap, l == null ? void 0 : l.columns]), G = (e, o) => {
     const n = { ...c.columnsMap };
-    ((a) => {
-      const r = { ...n[a] };
-      r.show = !s, n[a] = r;
-    })(o.key), v(!0), h((a) => {
-      a.columnsMap = { ...n };
+    ((t) => {
+      const u = { ...n[t] };
+      u.show = !e, n[t] = u;
+    })(o.key), S(!0), x((t) => {
+      t.columnsMap = { ...n };
     });
-  }, P = (s, o) => {
-    const n = { ...c.columnsMap }, u = is(c.sortKeyColumns, s, o);
-    u.forEach((a, r) => {
-      n[a] = { ...n[a] || {}, order: r };
-    }), v(!0), h((a) => {
-      a.columnsMap = { ...n }, a.sortKeyColumns = u;
+  }, J = (e, o) => {
+    const n = { ...c.columnsMap }, r = ae(c.sortKeyColumns, e, o);
+    r.forEach((t, u) => {
+      n[t] = { ...n[t] || {}, order: u };
+    }), S(!0), x((t) => {
+      t.columnsMap = { ...n }, t.sortKeyColumns = r;
     });
-  }, Q = y(() => {
-    var s, o;
-    return d ? ((o = (s = l == null ? void 0 : l.columns) == null ? void 0 : s.find((n) => n.key === d)) == null ? void 0 : o.title) ?? "" : "";
-  }, [l == null ? void 0 : l.columns, d]), U = () => {
-    W(c.columnsMap), G(c.sortKeyColumns), R === "online" && k && (C == null || C(k, c.columnsMap)), x.resolve({ ...c.columnsMap }), x.hide();
-  }, D = () => {
-    x.hide();
+  }, P = () => {
+    O(c.columnsMap), W(c.sortKeyColumns), R === "online" && v && (f == null || f(v, c.columnsMap)), h.resolve({ ...c.columnsMap }), h.hide();
+  }, g = () => {
+    h.hide();
   };
-  return e.jsxs(_, { className: "tableColumnSettingModal", title: "自定义列", ...Z(x), width: 600, onCancel: D, footer: e.jsxs(e.Fragment, { children: [e.jsx(T, { type: "primary", icon: e.jsx(xs, {}), onClick: U, disabled: !z, children: "保存" }), e.jsx(T, { onClick: D, children: "取消" })] }), children: [e.jsx("div", { className: t.introduce, children: "选择要在表中显示的可用列。拖动选定的列以对其重新排序。" }), e.jsxs("div", { className: t.container, children: [e.jsxs("div", { className: t.block, children: [e.jsxs("div", { className: t.header, children: [e.jsx("div", { className: t.title, children: "可用列" }), e.jsx("div", {})] }), e.jsx("div", { className: t.body, children: e.jsx("ul", { className: t.content, children: (S = E.list) == null ? void 0 : S.map((s) => {
-    const o = E.keys.includes(s.key);
-    return e.jsxs("li", { className: F(t.item, {
-      [t.checked]: !o
-    }), onClick: () => !s.disabled && J(o, s), children: [e.jsx($, { checked: o, disabled: s.disabled }), e.jsx("span", { className: t["content-item-text"], children: s.title })] }, s.key);
-  }) }) })] }), e.jsxs("div", { className: t.block, children: [e.jsxs("div", { className: t.header, children: [e.jsx("div", { className: t.title, children: "选定列" }), e.jsxs("div", { className: t.reset, onClick: H, children: [e.jsx("div", { children: "重置  " }), e.jsx(hs, {})] })] }), e.jsx("div", { className: t.body, children: e.jsxs(ls, { modifiers: [ms, us], onDragStart: (s) => {
-    const { active: o } = s;
-    o && j(o == null ? void 0 : o.id);
-  }, onDragCancel: () => j(null), onDragEnd: (s) => {
-    j(null);
-    const { over: o } = s;
+  return s.jsxs(Y, { className: "tableColumnSettingModal", title: "自定义列", ...X(h), styles: { body: { maxHeight: window.innerHeight - 300 } }, width: 600, onCancel: g, footer: s.jsxs(s.Fragment, { children: [s.jsx(F, { type: "primary", icon: s.jsx(re, {}), onClick: P, disabled: !T, children: "保存" }), s.jsx(F, { onClick: g, children: "取消" })] }), children: [s.jsx("div", { className: d(a.introduce, "tableColumnSetting_introduce"), children: "选择要在表中显示的可用列。拖动选定的列以对其重新排序。" }), s.jsxs("div", { className: d(a.container, "tableColumnSetting_container"), style: { maxHeight: window.innerHeight - 390, overflow: "auto" }, children: [s.jsxs("div", { className: a.block, children: [s.jsxs("div", { className: d(a.header, "tableColumnSetting_header"), children: [s.jsx("div", { className: d(a.title, "tableColumnSetting_title"), children: "可用列" }), s.jsx("div", {})] }), s.jsx("div", { className: d(a.body, "tableColumnSetting_body"), children: s.jsx("ul", { className: a.content, children: (D = N.list) == null ? void 0 : D.map((e) => {
+    const o = N.keys.includes(e.key);
+    return s.jsxs("li", { className: d(a.item, {
+      [a.checked]: !o,
+      tableColumnSetting_checked: !o
+    }), onClick: () => !e.disabled && G(o, e), children: [s.jsx(Z, { checked: o, disabled: e.disabled }), s.jsx("span", { className: d(a["content-item-text"], "tableColumnSetting_content-item-text"), children: e.title })] }, e.key);
+  }) }) })] }), s.jsxs("div", { className: a.block, children: [s.jsxs("div", { className: a.header, children: [s.jsx("div", { className: a.title, children: "选定列" }), s.jsx($, { type: "link", icon: s.jsx(de, {}), size: "small", onClick: q, children: "重置" })] }), s.jsx("div", { className: d(a.body, "tableColumnSetting_body-order"), children: s.jsx(te, { modifiers: [ie, ue], onDragStart: (e) => {
+    const { active: o } = e;
+    o && b(o == null ? void 0 : o.id);
+  }, onDragCancel: () => b(null), onDragEnd: (e) => {
+    b(null);
+    const { over: o } = e;
     if (o) {
-      const n = M(o.id);
-      N !== n && P(N, n);
+      const n = j(o.id);
+      E !== n && J(E, n);
     }
-  }, children: [e.jsx(as, { items: p == null ? void 0 : p.map((s) => s.key), strategy: cs, children: e.jsx("ul", { className: t.content, style: { background: "#fff" }, children: p == null ? void 0 : p.map((s) => e.jsx(rs, { item: s }, s.key)) }) }), e.jsx(ts, { adjustScale: !1, dropAnimation: fs, children: d ? e.jsxs("li", { className: F(t.moveItem), children: [e.jsx(ps, { size: 14, className: t.dragIcon }), e.jsx("span", { className: t["moveItem-text"], children: Q })] }) : null })] }) })] })] })] });
+  }, children: s.jsx(le, { items: p == null ? void 0 : p.map((e) => e.key), strategy: ne, children: s.jsx("ul", { className: a.content, children: p == null ? void 0 : p.map((e) => s.jsx(ce, { item: e }, e.key)) }) }) }) })] })] })] });
 });
 export {
-  Os as default
+  Be as default
 };