szld-libs 0.2.44 → 0.2.46

package/es/components/BackHeader/index.d.ts

@@ -1,13 +1,23 @@
-import { CSSProperties, ReactNode } from "react";
+import { CSSProperties, ReactNode } from 'react';
 interface BackHeaderProps {
+    /** 是否显示返回按钮 */
     isBack?: boolean;
+    /** 页头标题 */
     title: string | ReactNode;
+    /** 页头副标题 */
     subTitle?: string | ReactNode;
+    /** 标题右侧元素 */
     extra?: ReactNode;
+    /** 自定义class */
     className?: string;
+    /** 自定义页头style */
     style?: CSSProperties;
+    /** 自定义标题style */
     titleStyle?: CSSProperties;
+    /** 重要程度，相当于 h1、h2、h3、h4、h5 */
     level?: 1 | 2 | 3 | 4 | 5;
+    /** 自定义图标 */
+    icon?: React.ReactNode;
 }
 declare const BackHeader: (props: BackHeaderProps) => import("react/jsx-runtime").JSX.Element;
 export default BackHeader;

package/es/components/BackHeader/index.js

@@ -1,5 +1,5 @@
 import { jsxs, jsx } from "react/jsx-runtime";
-import { Space, Typography } from "antd";
+import { Space, Button, Typography } from "antd";
 import { ArrowLeftOutlined } from "@ant-design/icons";
 import { useNavigate } from "react-router-dom";
 import classNames from "classnames";
@@ -13,16 +13,7 @@ const styles = {
 };
 const { Title, Text } = Typography;
 const BackHeader = (props) => {
-  const {
-    isBack = true,
-    title: title2,
-    extra,
-    subTitle = null,
-    className,
-    style,
-    titleStyle,
-    level = 2
-  } = props;
+  const { isBack = true, title: title2, extra, subTitle = null, className, style, titleStyle, level = 2, icon } = props;
   const navigate = useNavigate();
   const renderSubtitle = () => {
     if (typeof subTitle === "string") {
@@ -35,7 +26,7 @@ const BackHeader = (props) => {
   };
   return /* @__PURE__ */ jsxs("div", { className: classNames(styles.main, className), style, children: [
     /* @__PURE__ */ jsxs(Space, { children: [
-      isBack && /* @__PURE__ */ jsx(ArrowLeftOutlined, { style: { fontSize: 24 }, onClick: goBack }),
+      isBack && /* @__PURE__ */ jsx(Button, { type: "text", icon: icon || /* @__PURE__ */ jsx(ArrowLeftOutlined, { style: { fontSize: 24 } }), onClick: goBack }),
       /* @__PURE__ */ jsxs(Title, { level, className: styles.title, style: titleStyle, children: [
         title2,
         renderSubtitle()

package/es/components/SearchTable/index.d.ts

@@ -4,6 +4,7 @@ import { CreateFormProps } from '../CreateForm';
 export interface TableColumnProps<T> extends ColumnType<T> {
     hidden?: boolean;
     width?: number | string;
+    minWidth?: number | string;
 }
 export interface MTableProps<T> extends Omit<TableProps<T>, 'columns'> {
     columns?: TableColumnProps<T>[];

package/es/components/SearchTable/index.js

@@ -1,7 +1,7 @@
 import { jsxs, Fragment, jsx } from "react/jsx-runtime";
 import { Table } from "antd";
 import classNames from "classnames";
-import { useState, useEffect } from "react";
+import { useState, useEffect, useMemo } from "react";
 import { Resizable } from "react-resizable";
 import { getLocalStorage } from "../../utils";
 import CreateForm from "../CreateForm";
@@ -22,12 +22,12 @@ function SearchTable(props) {
   const { tableProps = {}, searchProps } = props;
   const {
     minColumnWidth = 200,
-    resizeable = true,
+    resizeable = false,
     tableId,
     storageKey = "szld_table_cell_width",
     ...rest
   } = tableProps;
-  const [columns, setColumns] = useState([]);
+  const [columns, setColumns] = useState(tableProps.columns || []);
   const getWidth = (v) => {
     var _a, _b;
     let width = v.width || minColumnWidth;
@@ -42,7 +42,7 @@ function SearchTable(props) {
   };
   useEffect(() => {
     const list = tableProps.columns || [];
-    if (list.length === 0) {
+    if (list.length === 0 || !resizeable) {
       return;
     }
     const result = list == null ? void 0 : list.filter((v) => !v.hidden).map((v) => {
@@ -60,10 +60,11 @@ function SearchTable(props) {
       return v;
     });
     if (result.length > 0) {
+      result[result.length - 1].minWidth = result[result.length - 1].width;
       result[result.length - 1].width = void 0;
     }
     setColumns(result);
-  }, [tableProps.columns, tableId, minColumnWidth]);
+  }, [tableProps.columns, tableId, minColumnWidth, resizeable]);
   const handleResize = (column, size) => {
     setColumns((prevColumns) => {
       const list = prevColumns == null ? void 0 : prevColumns.map((v) => {
@@ -95,13 +96,24 @@ function SearchTable(props) {
     },
     ...rest == null ? void 0 : rest.components
   };
+  const scollX = useMemo(() => {
+    var _a;
+    const getWidth2 = (v) => {
+      let width = v.width || v.minWidth;
+      if (!width || typeof width === "string") {
+        width = minColumnWidth;
+      }
+      return width;
+    };
+    return (_a = columns == null ? void 0 : columns.map((v) => getWidth2(v))) == null ? void 0 : _a.reduce((a, b) => a + b, 0);
+  }, [columns, minColumnWidth]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     searchProps && /* @__PURE__ */ jsx(CreateForm, { hiddenTitle: true, ...searchProps, items: searchProps.items }),
     /* @__PURE__ */ jsx(
       Table,
       {
         scroll: {
-          x: columns == null ? void 0 : columns.reduce((a, b) => a + (typeof b.width === "number" ? b.width : minColumnWidth), 0)
+          x: scollX
         },
         ...rest,
         components,

package/es/index.js

@@ -4,7 +4,7 @@ import ReactDOM from "react-dom/client";
 import { BrowserRouter } from "react-router-dom";
 import { Table, Button } from "antd";
 import useConfig from "./hooks/useConfig";
-import { useRowSelection, SearchTable } from "./main";
+import { useRowSelection, BackHeader, SearchTable } from "./main";
 let key = "U2FsdGVkX1/dG1NSXNR9hnp3Ech/v6Gh8CDDJxgBm1EPFQel12ySIf84ARXCPwTae7TzwgPvjOyE3S5rAEzl/wAZmId6pbezpFeFcJqxdmIl3FeluYHFxJzQHDETTvrr3G/REvv00kHptOVwg6ecjPH6yk7PNit0sWTBLorROxLxMD8lVDmOA66p7Zp4QnYzqScYJGFbutmfHYXfBRBe1Q2UKummJ798svNY5SIwEwl4spzgyWmhARtuyq4zhysFrj/xODuNDjtwitA6XfX566WcZkj3F+2P+mkYzDYOhXXaomnlybjrZ2hEHfcczQhUfJd89O8PNIuEWo24wjYRgMdKlw5CWSeocFCqV7ZJ/CV/7vNRcaO4awKlFNobLikkwDznxpcX+4UEej+ED+pgfmPQLsKedcfEscStkSAZXaD5pBRTiFU9xGLfDt6seUrEnMBeXkpMIY9j1SZDDK18/G7lSHjDQMZYZP6sfLdBdwY=";
 const Demo = () => {
   useConfig(key);
@@ -27,14 +27,21 @@ const Demo = () => {
       title: "c"
     }
   ];
-  const [list, setList] = useState(Array(10).fill(0).map((v, i) => ({ id: i })));
+  const [list, setList] = useState(
+    Array(10).fill(0).map((v, i) => ({ id: i }))
+  );
   const [current, setCurrent] = useState(1);
   const data = [{ id: 1 }, { id: 12 }, { id: 21 }];
-  const { selectedKeys, selectedRows, setSelectedKeys } = useRowSelection({ dataSource: list, rowKey: "id", defaultRows: data });
+  const { selectedKeys, selectedRows, setSelectedKeys } = useRowSelection({
+    dataSource: list,
+    rowKey: "id",
+    defaultRows: data
+  });
   useEffect(() => {
     setSelectedKeys([1, 12, 21]);
   }, []);
   return /* @__PURE__ */ jsxs("div", { style: { height: "100vh" }, children: [
+    /* @__PURE__ */ jsx(BackHeader, { title: "新增系统", isBack: true }),
     /* @__PURE__ */ jsx(Button, { onClick: () => setList(columns), children: "test" }),
     /* @__PURE__ */ jsx(
       "div",
@@ -54,18 +61,31 @@ const Demo = () => {
             {
               dataIndex: "id",
               title: "ID"
+            },
+            {
+              dataIndex: "a",
+              title: "a",
+              width: 200
+            },
+            {
+              dataIndex: "a2",
+              title: "a",
+              width: 200
+            },
+            {
+              dataIndex: "a3",
+              title: "a",
+              width: 200
+            },
+            {
+              dataIndex: "a4",
+              title: "a",
+              width: 400
             }
           ],
           dataSource: list,
           resizeable: true,
           rowKey: "id",
-          rowSelection: {
-            selectedRowKeys: selectedKeys,
-            preserveSelectedRowKeys: true,
-            onChange(keys) {
-              setSelectedKeys(keys);
-            }
-          },
           pagination: {
             total: 25,
             current,

package/lib/components/BackHeader/index.d.ts

@@ -1,13 +1,23 @@
-import { CSSProperties, ReactNode } from "react";
+import { CSSProperties, ReactNode } from 'react';
 interface BackHeaderProps {
+    /** 是否显示返回按钮 */
     isBack?: boolean;
+    /** 页头标题 */
     title: string | ReactNode;
+    /** 页头副标题 */
     subTitle?: string | ReactNode;
+    /** 标题右侧元素 */
     extra?: ReactNode;
+    /** 自定义class */
     className?: string;
+    /** 自定义页头style */
     style?: CSSProperties;
+    /** 自定义标题style */
     titleStyle?: CSSProperties;
+    /** 重要程度，相当于 h1、h2、h3、h4、h5 */
     level?: 1 | 2 | 3 | 4 | 5;
+    /** 自定义图标 */
+    icon?: React.ReactNode;
 }
 declare const BackHeader: (props: BackHeaderProps) => import("react/jsx-runtime").JSX.Element;
 export default BackHeader;

package/lib/components/BackHeader/index.js

@@ -14,16 +14,7 @@ const styles = {
 };
 const { Title, Text } = antd.Typography;
 const BackHeader = (props) => {
-  const {
-    isBack = true,
-    title: title2,
-    extra,
-    subTitle = null,
-    className,
-    style,
-    titleStyle,
-    level = 2
-  } = props;
+  const { isBack = true, title: title2, extra, subTitle = null, className, style, titleStyle, level = 2, icon } = props;
   const navigate = reactRouterDom.useNavigate();
   const renderSubtitle = () => {
     if (typeof subTitle === "string") {
@@ -36,7 +27,7 @@ const BackHeader = (props) => {
   };
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: classNames(styles.main, className), style, children: [
     /* @__PURE__ */ jsxRuntime.jsxs(antd.Space, { children: [
-      isBack && /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowLeftOutlined, { style: { fontSize: 24 }, onClick: goBack }),
+      isBack && /* @__PURE__ */ jsxRuntime.jsx(antd.Button, { type: "text", icon: icon || /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowLeftOutlined, { style: { fontSize: 24 } }), onClick: goBack }),
       /* @__PURE__ */ jsxRuntime.jsxs(Title, { level, className: styles.title, style: titleStyle, children: [
         title2,
         renderSubtitle()

package/lib/components/SearchTable/index.d.ts

@@ -4,6 +4,7 @@ import { CreateFormProps } from '../CreateForm';
 export interface TableColumnProps<T> extends ColumnType<T> {
     hidden?: boolean;
     width?: number | string;
+    minWidth?: number | string;
 }
 export interface MTableProps<T> extends Omit<TableProps<T>, 'columns'> {
     columns?: TableColumnProps<T>[];

package/lib/components/SearchTable/index.js

@@ -23,12 +23,12 @@ function SearchTable(props) {
   const { tableProps = {}, searchProps } = props;
   const {
     minColumnWidth = 200,
-    resizeable = true,
+    resizeable = false,
     tableId,
     storageKey = "szld_table_cell_width",
     ...rest
   } = tableProps;
-  const [columns, setColumns] = react.useState([]);
+  const [columns, setColumns] = react.useState(tableProps.columns || []);
   const getWidth = (v) => {
     var _a, _b;
     let width = v.width || minColumnWidth;
@@ -43,7 +43,7 @@ function SearchTable(props) {
   };
   react.useEffect(() => {
     const list = tableProps.columns || [];
-    if (list.length === 0) {
+    if (list.length === 0 || !resizeable) {
       return;
     }
     const result = list == null ? void 0 : list.filter((v) => !v.hidden).map((v) => {
@@ -61,10 +61,11 @@ function SearchTable(props) {
       return v;
     });
     if (result.length > 0) {
+      result[result.length - 1].minWidth = result[result.length - 1].width;
       result[result.length - 1].width = void 0;
     }
     setColumns(result);
-  }, [tableProps.columns, tableId, minColumnWidth]);
+  }, [tableProps.columns, tableId, minColumnWidth, resizeable]);
   const handleResize = (column, size) => {
     setColumns((prevColumns) => {
       const list = prevColumns == null ? void 0 : prevColumns.map((v) => {
@@ -96,13 +97,24 @@ function SearchTable(props) {
     },
     ...rest == null ? void 0 : rest.components
   };
+  const scollX = react.useMemo(() => {
+    var _a;
+    const getWidth2 = (v) => {
+      let width = v.width || v.minWidth;
+      if (!width || typeof width === "string") {
+        width = minColumnWidth;
+      }
+      return width;
+    };
+    return (_a = columns == null ? void 0 : columns.map((v) => getWidth2(v))) == null ? void 0 : _a.reduce((a, b) => a + b, 0);
+  }, [columns, minColumnWidth]);
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     searchProps && /* @__PURE__ */ jsxRuntime.jsx(CreateForm, { hiddenTitle: true, ...searchProps, items: searchProps.items }),
     /* @__PURE__ */ jsxRuntime.jsx(
       antd.Table,
       {
         scroll: {
-          x: columns == null ? void 0 : columns.reduce((a, b) => a + (typeof b.width === "number" ? b.width : minColumnWidth), 0)
+          x: scollX
         },
         ...rest,
         components,

package/lib/index.js

@@ -28,14 +28,21 @@ const Demo = () => {
       title: "c"
     }
   ];
-  const [list, setList] = react.useState(Array(10).fill(0).map((v, i) => ({ id: i })));
+  const [list, setList] = react.useState(
+    Array(10).fill(0).map((v, i) => ({ id: i }))
+  );
   const [current, setCurrent] = react.useState(1);
   const data = [{ id: 1 }, { id: 12 }, { id: 21 }];
-  const { selectedKeys, selectedRows, setSelectedKeys } = main.useRowSelection({ dataSource: list, rowKey: "id", defaultRows: data });
+  const { selectedKeys, selectedRows, setSelectedKeys } = main.useRowSelection({
+    dataSource: list,
+    rowKey: "id",
+    defaultRows: data
+  });
   react.useEffect(() => {
     setSelectedKeys([1, 12, 21]);
   }, []);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { height: "100vh" }, children: [
+    /* @__PURE__ */ jsxRuntime.jsx(main.BackHeader, { title: "新增系统", isBack: true }),
     /* @__PURE__ */ jsxRuntime.jsx(antd.Button, { onClick: () => setList(columns), children: "test" }),
     /* @__PURE__ */ jsxRuntime.jsx(
       "div",
@@ -55,18 +62,31 @@ const Demo = () => {
             {
               dataIndex: "id",
               title: "ID"
+            },
+            {
+              dataIndex: "a",
+              title: "a",
+              width: 200
+            },
+            {
+              dataIndex: "a2",
+              title: "a",
+              width: 200
+            },
+            {
+              dataIndex: "a3",
+              title: "a",
+              width: 200
+            },
+            {
+              dataIndex: "a4",
+              title: "a",
+              width: 400
             }
           ],
           dataSource: list,
           resizeable: true,
           rowKey: "id",
-          rowSelection: {
-            selectedRowKeys: selectedKeys,
-            preserveSelectedRowKeys: true,
-            onChange(keys) {
-              setSelectedKeys(keys);
-            }
-          },
           pagination: {
             total: 25,
             current,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "szld-libs",
   "private": false,
-  "version": "0.2.44",
+  "version": "0.2.46",
   "type": "module",
   "scripts": {
     "dev": "vite",