bitz-react-admin-ui 1.9.8 → 2.0.0

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

@@ -1,40 +1,10 @@
-export declare const getCssVar: ({ height, evenRowBgColor, colorBgContainer, table, gap, borderColor, }: {
+export declare const getCssVar: ({ height, evenRowBgColor, colorBgContainer, table, gap, borderColor, scrollbarWidth, other, }: {
     height: any;
     evenRowBgColor: any;
     colorBgContainer: any;
     table: any;
     gap: any;
     borderColor: any;
-}) => {
-    height: any;
-    '--toolbar-bgColor': any;
-    '--thead-bgColor': any;
-    '--thead-hoverBgColor': any;
-    '--evenRow-BgColor': any;
-    '--oddRow-BgColor': any;
-    '--radioCheckbox-borderColor': any;
-    '--expandIcon-borderColor': any;
-    '--rowHover-bgColor': any;
-    '--borderColor': any;
-    '--container-gap': string;
-    '--xlTable-fontSize': string;
-    '--lgTable-fontSize': string;
-    '--mdTable-fontSize': string;
-    '--smTable-fontSize': string;
-    '--xsTable-fontSize': string;
-    '--xlTable-height': string;
-    '--lgTable-height': string;
-    '--mdTable-height': string;
-    '--smTable-height': string;
-    '--xsTable-height': string;
-    '--xlTable-lineHeight': string;
-    '--lgTable-lineHeight': string;
-    '--mdTable-lineHeight': string;
-    '--smTable-lineHeight': string;
-    '--xsTable-lineHeight': string;
-    '--xlSkeleton-height': string;
-    '--lgSkeleton-height': string;
-    '--mdSkeleton-height': string;
-    '--smSkeleton-height': string;
-    '--xsSkeleton-height': string;
-};
+    scrollbarWidth: any;
+    other: any;
+}) => any;

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

@@ -1,10 +1,12 @@
-const u = ({
+const j = ({
   height: v,
   evenRowBgColor: w,
   colorBgContainer: e,
   table: o,
   gap: I,
-  borderColor: R
+  borderColor: R,
+  scrollbarWidth: u,
+  other: V
 }) => {
   var h, i, g, x, r, n, T, p, s, d, $, H, m, S, C, k, f, z, B, c;
   return {
@@ -19,6 +21,7 @@ const u = ({
     "--rowHover-bgColor": o == null ? void 0 : o.rowHoverBg,
     "--borderColor": R,
     "--container-gap": `${I}px`,
+    "--scrollbar-width": `${u || 0}px`,
     "--xlTable-fontSize": `${(h = o == null ? void 0 : o.xlTable) == null ? void 0 : h.fontSize}px`,
     "--lgTable-fontSize": `${(i = o == null ? void 0 : o.lgTable) == null ? void 0 : i.fontSize}px`,
     "--mdTable-fontSize": `${(g = o == null ? void 0 : o.mdTable) == null ? void 0 : g.fontSize}px`,
@@ -38,10 +41,11 @@ const u = ({
     "--lgSkeleton-height": `${(f = o == null ? void 0 : o.lgTable) == null ? void 0 : f.skeletonHeight}px`,
     "--mdSkeleton-height": `${(z = o == null ? void 0 : o.mdTable) == null ? void 0 : z.skeletonHeight}px`,
     "--smSkeleton-height": `${(B = o == null ? void 0 : o.smTable) == null ? void 0 : B.skeletonHeight}px`,
-    "--xsSkeleton-height": `${(c = o == null ? void 0 : o.xsTable) == null ? void 0 : c.skeletonHeight}px`
+    "--xsSkeleton-height": `${(c = o == null ? void 0 : o.xsTable) == null ? void 0 : c.skeletonHeight}px`,
     // '--tableBody-bootomBorderColor': table?.borderColor || '#f0f0f0',
+    ...V
   };
 };
 export {
-  u as getCssVar
+  j as getCssVar
 };

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

@@ -3,7 +3,7 @@ import { create as se, useModal as te, antdModalV5 as le } from "@ebay/nice-moda
 import { Modal as ne, Typography as re, Checkbox as ae, Button as ce } from "antd";
 import r from "./index.module.less.mjs";
 import { useState as N, useContext as ie, useEffect as me, useCallback as V, useMemo as M } from "react";
-import { TableContext as de } from "../../Store/index.mjs";
+import { BitzTableContext as de } from "../../Store/index.mjs";
 import { genColumnKey as F, columnSort as ue } from "../../Store/utils/index.mjs";
 import p from "../../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
 import { DndContext as pe } from "../../../../node_modules/.store/@dnd-kit_core@6.1.0/node_modules/@dnd-kit/core/dist/core.esm.mjs";

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

@@ -3,12 +3,12 @@ import C, { useContext as g, useState as x, useMemo as h, useEffect as j } from
 import { Tooltip as b } from "antd";
 import { show as E } from "@ebay/nice-modal-react";
 import S from "./ColumnSettingModal.mjs";
-import p from "../style.mjs";
-import v from "../../../BitzButton/index.mjs";
-import { TableContext as y } from "../../Store/index.mjs";
-import B from "../../../../node_modules/.store/@ant-design_icons@5.3.5/node_modules/@ant-design/icons/es/icons/SettingOutlined.mjs";
-const L = (n) => {
-  const { order: c, show: a = !0, icon: u = /* @__PURE__ */ e.jsx(B, {}) } = n, { toolbarItemClassName: f } = p(), { uuid: l } = g(y), [s, i] = x(!1), d = h(() => s ? !1 : void 0, [s]);
+import B from "../style.mjs";
+import p from "../../../BitzButton/index.mjs";
+import { BitzTableContext as v } from "../../Store/index.mjs";
+import y from "../../../../node_modules/.store/@ant-design_icons@5.3.5/node_modules/@ant-design/icons/es/icons/SettingOutlined.mjs";
+const z = (n) => {
+  const { order: c, show: a = !0, icon: u = /* @__PURE__ */ e.jsx(y, {}) } = n, { toolbarItemClassName: f } = B(), { uuid: l } = g(v), [s, i] = x(!1), d = h(() => s ? !1 : void 0, [s]);
   return j(() => (document == null || document.addEventListener("fullscreenchange", (o) => {
     var t, r, m;
     (t = o.target) != null && t.classList.contains("bitzTableBlock") && (i(!!document.fullscreenElement), (m = (r = document.fullscreenElement) == null ? void 0 : r.classList) != null && m.contains("bitzTableBlock") || i(!1));
@@ -26,7 +26,7 @@ const L = (n) => {
       }
     ),
     /* @__PURE__ */ e.jsx(b, { title: "列设置", open: !1, children: /* @__PURE__ */ e.jsx(
-      v,
+      p,
       {
         type: "text",
         className: f,
@@ -37,7 +37,7 @@ const L = (n) => {
       }
     ) })
   ] }) : null;
-}, R = C.memo(L);
+}, R = C.memo(z);
 export {
   R as default
 };

package/dist/components/BitzTable/ToolBar/DensityIcon/index.mjs

@@ -1,24 +1,24 @@
 import { j as l } from "../../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
 import { memo as k, useContext as g } from "react";
-import { Tooltip as h } from "antd";
-import { TableContext as j } from "../../Store/index.mjs";
-import z from "../style.mjs";
+import { Tooltip as z } from "antd";
+import { BitzTableContext as h } from "../../Store/index.mjs";
+import j from "../style.mjs";
 import C from "../../../BitzButton/index.mjs";
 import S from "../../Dropdown/index.mjs";
 import D from "../../../../node_modules/.store/@ant-design_icons@5.3.5/node_modules/@ant-design/icons/es/icons/ColumnHeightOutlined.mjs";
 const I = ({ defaultSize: e, items: n }) => n.map((t) => t.key === e ? {
   ...t,
   label: `${t.label}（默认）`
-} : t), w = (e) => {
-  const { order: n, show: t = !0, icon: c = /* @__PURE__ */ l.jsx(D, {}) } = e, {
-    sizeStorageType: u,
-    sizeStorageKey: m,
+} : t), p = (e) => {
+  const { order: n, show: t = !0, icon: u = /* @__PURE__ */ l.jsx(D, {}) } = e, {
+    sizeStorageType: f,
+    sizeStorageKey: s,
     onlineSizeChange: i,
-    defaultTableSize: f,
-    tableSize: s,
+    defaultTableSize: y,
+    tableSize: a,
     setTableSize: r
-  } = g(j), { toolbarItemClassName: y } = z(), d = I({
-    defaultSize: f,
+  } = g(h), { toolbarItemClassName: d } = j(), x = I({
+    defaultSize: y,
     items: [
       {
         key: "xl",
@@ -41,26 +41,34 @@ const I = ({ defaultSize: e, items: n }) => n.map((t) => t.key === e ? {
         label: "特紧凑"
       }
     ]
-  }), x = {
-    selectedKeys: [s],
-    onClick: (b) => {
-      var a;
-      const { key: o } = b;
-      o !== s && (r == null || r(o), u === "online" && m && (i == null || i(m, o)), (a = e == null ? void 0 : e.onChange) == null || a.call(e, o));
+  }), b = {
+    selectedKeys: [a],
+    onClick: (m) => {
+      var c;
+      const { key: o } = m;
+      o !== a && (r == null || r(o), f === "online" && s && (i == null || i(s, o)), (c = e == null ? void 0 : e.onChange) == null || c.call(e, o));
     },
-    items: d
+    items: x
   };
-  return t ? /* @__PURE__ */ l.jsx(S, { menu: x, trigger: ["click"], children: /* @__PURE__ */ l.jsx(h, { title: "表格密度", open: !1, children: /* @__PURE__ */ l.jsx(
-    C,
+  return t ? /* @__PURE__ */ l.jsx(
+    S,
     {
-      style: { order: n },
-      type: "text",
-      className: y,
-      icon: c,
-      children: "表格密度"
+      menu: b,
+      trigger: ["click"],
+      getPopupContainer: (m) => m.parentElement,
+      children: /* @__PURE__ */ l.jsx(z, { title: "表格密度", open: !1, children: /* @__PURE__ */ l.jsx(
+        C,
+        {
+          style: { order: n },
+          type: "text",
+          className: d,
+          icon: u,
+          children: "表格密度"
+        }
+      ) })
     }
-  ) }) }) : null;
-}, O = k(w);
+  ) : null;
+}, G = k(p);
 export {
-  O as default
+  G as default
 };

package/dist/components/BitzTable/ToolBar/style.mjs

@@ -1,4 +1,4 @@
-import { TableContext as $ } from "../Store/index.mjs";
+import { BitzTableContext as $ } from "../Store/index.mjs";
 import "../../../node_modules/.store/@ant-design_cssinjs@1.18.5/node_modules/@ant-design/cssinjs/es/extractStyle.mjs";
 import "../../../node_modules/.store/@ant-design_cssinjs@1.18.5/node_modules/@ant-design/cssinjs/es/hooks/useCacheToken.mjs";
 import { useContext as f, useMemo as g } from "react";
@@ -14,7 +14,7 @@ import "../../../node_modules/.store/@ant-design_cssinjs@1.18.5/node_modules/@an
 import u from "../../../node_modules/.store/classnames@2.5.1/node_modules/classnames/index.mjs";
 import x from "../../BitzTheme/index.mjs";
 const J = () => {
-  const { theme: T, token: i, hashId: n } = x.useToken(), { tableSize: a } = f($), d = g(() => a ?? "lg", [a]), r = "toolbarItem", m = "ToolbarItemBtn", S = (o, t, e) => {
+  const { theme: T, token: i, hashId: n } = x.useToken(), { tableSize: a } = f($), d = g(() => a ?? "lg", [a]), r = "toolbarItem", m = "ToolbarItemBtn", z = (o, t, e) => {
     var l, s, p, b, c;
     return [
       {
@@ -73,10 +73,10 @@ const J = () => {
     ];
   };
   h({ theme: T, token: i, hashId: n, path: [r] }, () => [
-    S(r, m, i)
+    z(r, m, i)
   ]);
-  const z = `${d}${m}`;
-  return { toolbarItemClassName: u(r, z, n) };
+  const S = `${d}${m}`;
+  return { toolbarItemClassName: u(r, S, n) };
 };
 export {
   J as default

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

@@ -1,5 +1,5 @@
 import { BitzTableProps } from './Table';
-import BitzTableProvider, { TableContext as BitzTableContext, DensitySize as BitzTableSizeType, SizeStateType, ColumnStateType } from './Store';
+import BitzTableProvider, { BitzTableContext, DensitySize as BitzTableSizeType, SizeStateType, ColumnStateType } from './Store';
 import ActionBar from './ActionBar';
 import ToolBar from './ToolBar';
 import ActionCol from './ActionCol';

package/dist/components/BitzTable/index.mjs

@@ -1,17 +1,17 @@
 import t from "./Table/index.mjs";
-import { TableContext as c, default as f } from "./Store/index.mjs";
+import { BitzTableContext as f, default as b } from "./Store/index.mjs";
 import r from "./ActionBar/index.mjs";
-import e from "./ToolBar/index.mjs";
-import i from "./ActionCol/index.mjs";
+import i from "./ToolBar/index.mjs";
+import e from "./ActionCol/index.mjs";
 import a from "./SelectionBar/index.mjs";
 const o = t;
 process.env.NODE_ENV !== "production" && (o.displayName = "BitzTable");
 o.ActionBar = r;
-o.ToolBar = e;
+o.ToolBar = i;
 o.SelectionBar = a;
-o.ActionCol = i;
+o.ActionCol = e;
 export {
-  c as BitzTableContext,
-  f as BitzTableProvider,
+  f as BitzTableContext,
+  b as BitzTableProvider,
   o as default
 };

package/dist/components/BitzTableSelect/Picker/index.d.ts

@@ -1,5 +1,5 @@
 import { FC, Key, ReactNode } from 'react';
-import { PaginationProps, SelectProps as AntSelectProps } from 'antd';
+import { SelectProps as AntSelectProps } from 'antd';
 import { BaseOptionType } from 'antd/es/select';
 import { ColumnsType } from 'antd/es/table';
 import { PaginationChangeEvent, TableSelectPopupParentRender, FieldNames } from '..';
@@ -22,7 +22,10 @@ export interface TableSelectProps<T extends BaseOptionType> extends AntSelectPro
     /** 表格总数据条数 */
     total: number;
     /** 分页属性 */
-    page: PaginationProps;
+    page?: {
+        page: number;
+        size: number;
+    };
     /** 分页切换 */
     onPageChange: PaginationChangeEvent;
     /** 表格搜索input元素 */

package/dist/components/BitzTableSelect/SelectPopup/getData.d.ts

@@ -1,7 +1,7 @@
 /** 表格单元格操作 */
 export declare const getColumns: (columnOption: any, tableData: any, page: any) => any[];
 /** 展开表格 */
-export declare const getExpandable: (prop?: string) => {
+export declare const getExpandable: (prop?: string, loading?: boolean) => {
     expandable: {
         rowExpandable: (record: any) => any;
         expandedRowRender: (record: any) => import("react/jsx-runtime").JSX.Element;

package/dist/components/BitzTableSelect/SelectPopup/getData.mjs

@@ -1,59 +1,57 @@
-import { j as o } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
-import { Table as m } from "antd";
-import a from "../../BitzDescriptions/index.mjs";
-import p from "../TableCell/index.mjs";
+import { j as i } from "../../../node_modules/.store/react@18.2.0/node_modules/react/jsx-runtime.mjs";
+import p from "../../BitzDescriptions/index.mjs";
+import m from "../TableCell/index.mjs";
 import u from "../TextBlock/index.mjs";
-const S = (n, r, e) => {
-  const l = n.map((t) => (typeof t.title == "string" && (t.title = /* @__PURE__ */ o.jsx(u, { value: t.title, bold: 600 })), {
-    ...t,
-    render: (i, c, g) => {
-      const f = (r == null ? void 0 : r.length) === 1 ? !1 : g + 1 > ((r == null ? void 0 : r.length) || 0) / 2;
-      if (t != null && t.render) {
-        const s = t.render(i, c, g);
+const b = (o, n, e) => {
+  const l = o.map((r) => (typeof r.title == "string" && (r.title = /* @__PURE__ */ i.jsx(u, { value: r.title, bold: 600 })), {
+    ...r,
+    width: "auto",
+    render: (t, c, g) => {
+      const f = (n == null ? void 0 : n.length) === 1 ? !1 : g + 1 > ((n == null ? void 0 : n.length) || 0) / 2;
+      if (r != null && r.render) {
+        const s = r.render(t, c, g);
         if (typeof s == "object")
           return s;
         if (["boolean", "number", "bigint", "string"].includes(
           typeof s
         ))
-          return /* @__PURE__ */ o.jsx(p, { value: `${s}`, isLatterHalf: f });
+          return /* @__PURE__ */ i.jsx(m, { value: `${s}`, isLatterHalf: f });
       }
-      return !i && !["boolean", "number", "bigint"].includes(typeof i) ? /* @__PURE__ */ o.jsx(u, { value: "-" }) : /* @__PURE__ */ o.jsx(p, { value: i, isLatterHalf: f });
+      return !t && !["boolean", "number", "bigint"].includes(typeof t) ? /* @__PURE__ */ i.jsx(u, { value: "-" }) : /* @__PURE__ */ i.jsx(m, { value: t, isLatterHalf: f });
     }
   }));
   return [
-    m.SELECTION_COLUMN,
-    m.EXPAND_COLUMN,
     {
       title: "序号",
       rowScope: "row",
       className: "numRow",
-      width: 50,
-      render: (t, i, c) => c + 1 + (e.pageIndex - 1) * e.pageSize
+      width: 80,
+      render: (r, t, c) => c + 1 + (e.page - 1) * e.size
     },
     ...l
   ];
-}, w = (n) => n ? {
+}, j = (o, n) => o ? {
   expandable: {
-    rowExpandable: (r) => {
-      var e;
-      return (e = r[n]) == null ? void 0 : e.length;
-    },
-    expandedRowRender: (r) => {
+    rowExpandable: (e) => {
       var l;
-      const e = (l = r[n]) == null ? void 0 : l.map((t) => (typeof t.label == "string" && (t.label = /* @__PURE__ */ o.jsx(u, { minRows: 1, maxRows: 5, value: t.label })), typeof t.children == "string" && (t.children = /* @__PURE__ */ o.jsx(u, { minRows: 1, maxRows: 5, value: t.children })), t));
-      return /* @__PURE__ */ o.jsx(
-        a,
+      return n ? !0 : (l = e[o]) == null ? void 0 : l.length;
+    },
+    expandedRowRender: (e) => {
+      var r;
+      const l = (r = e[o]) == null ? void 0 : r.map((t) => (typeof t.label == "string" && (t.label = /* @__PURE__ */ i.jsx(u, { minRows: 1, maxRows: 5, value: t.label })), typeof t.children == "string" && (t.children = /* @__PURE__ */ i.jsx(u, { minRows: 1, maxRows: 5, value: t.children })), t));
+      return /* @__PURE__ */ i.jsx(
+        p,
         {
           size: "small",
           bordered: !0,
-          items: e,
+          items: l,
           column: { xs: 1, sm: 1, md: 1, lg: 2, xl: 2, xxl: 2 }
         }
       );
     }
   }
-} : null, R = (n, r) => {
-  if (n) {
+} : null, w = (o, n) => {
+  if (o) {
     const e = {
       gutter: 20,
       left: {
@@ -68,7 +66,7 @@ const S = (n, r, e) => {
         button: 4
       }
     };
-    return r || (e.right.search = 11, e.right.operation = 13, e.right.toolTagSelect = 0, e.right.totalSelect = 11, e.right.button = void 0), e;
+    return n || (e.right.search = 11, e.right.operation = 13, e.right.toolTagSelect = 0, e.right.totalSelect = 11, e.right.button = void 0), e;
   } else {
     const e = {
       gutter: 0,
@@ -84,11 +82,11 @@ const S = (n, r, e) => {
         button: void 0
       }
     };
-    return r || (e.right.search = 11, e.right.operation = 13, e.right.toolTagSelect = 0, e.right.totalSelect = 11), e;
+    return n || (e.right.search = 11, e.right.operation = 13, e.right.toolTagSelect = 0, e.right.totalSelect = 11), e;
   }
 };
 export {
-  S as getColumns,
-  w as getExpandable,
-  R as getLayoutConfig
+  b as getColumns,
+  j as getExpandable,
+  w as getLayoutConfig
 };