szld-libs 0.2.44 → 0.2.45

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

@@ -27,10 +27,16 @@ 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]);
   }, []);
@@ -54,18 +60,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/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,10 +28,16 @@ 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]);
   }, []);
@@ -55,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/package.json

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