szld-libs 0.2.32 → 0.2.34

package/es/components/SearchTable/index.js

@@ -1,8 +1,7 @@
 import { jsxs, Fragment, jsx } from "react/jsx-runtime";
 import { Table } from "antd";
 import classNames from "classnames";
-import _ from "lodash";
-import { useRef, useState, useEffect, useCallback, useMemo } from "react";
+import { useState, useEffect } from "react";
 import { Resizable } from "react-resizable";
 import { getLocalStorage } from "../../utils";
 import CreateForm from "../CreateForm";
@@ -28,7 +27,6 @@ function SearchTable(props) {
     storageKey = "szld_table_cell_width",
     ...rest
   } = tableProps;
-  const ref = useRef(null);
   const [columns, setColumns] = useState([]);
   const getWidth = (v) => {
     var _a, _b;
@@ -46,24 +44,36 @@ function SearchTable(props) {
     if (list.length === 0) {
       return;
     }
-    const result = list.map((v) => ({
-      ...v,
-      width: getWidth(v)
-    }));
+    const result = list == null ? void 0 : list.filter((v) => !v.hidden).map((v) => {
+      if (v.dataIndex) {
+        return {
+          ...v,
+          width: getWidth(v),
+          onHeaderCell: (column) => ({
+            width: column.width,
+            resizeable,
+            onResize: (_e, { size }) => handleResize(column, size)
+          })
+        };
+      }
+      return v;
+    });
+    if (result.length > 0) {
+      result[result.length - 1].width = void 0;
+    }
     setColumns(result);
-    ref.current = Date.now();
   }, [tableProps.columns, tableId, minColumnWidth]);
-  const handleResize = useCallback(
-    (column, size) => {
-      const list = _.cloneDeep(columns);
-      if (!list || list.length === 0) {
-        return;
-      }
-      const index = list == null ? void 0 : list.findIndex((v) => v.dataIndex === column.dataIndex);
-      list[index] = {
-        ...list[index],
-        width: size.width
-      };
+  const handleResize = (column, size) => {
+    setColumns((prevColumns) => {
+      const list = prevColumns == null ? void 0 : prevColumns.map((v) => {
+        if (v.dataIndex === column.dataIndex) {
+          return {
+            ...v,
+            width: size.width
+          };
+        }
+        return v;
+      });
       if (tableId) {
         const obj = getLocalStorage(storageKey) || {};
         obj[tableId] = obj[tableId] || {};
@@ -74,44 +84,26 @@ function SearchTable(props) {
         });
         localStorage.setItem(storageKey, JSON.stringify(obj));
       }
-      setColumns(list);
-    },
-    [columns, tableId, storageKey]
-  );
-  const realColumns = useMemo(() => {
-    if (!ref.current || columns === void 0) {
-      return [];
-    }
-    const result = columns == null ? void 0 : columns.filter((v) => !v.hidden).map((v) => ({
-      ...v,
-      width: v.width,
-      onHeaderCell: (column) => ({
-        width: column.width,
-        resizeable,
-        onResize: (_e, { size }) => handleResize(column, size)
-      })
-    }));
-    if (result.length > 0) {
-      result[result.length - 1].width = void 0;
-    }
-    return result;
-  }, [resizeable, columns, ref.current, minColumnWidth]);
+      return list;
+    });
+  };
   const components = {
     header: {
       cell: ResizeableTitle
-    }
+    },
+    ...rest == null ? void 0 : rest.components
   };
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     searchProps && /* @__PURE__ */ jsx(CreateForm, { hiddenTitle: true, ...searchProps, items: searchProps.items }),
     /* @__PURE__ */ jsx(
       Table,
       {
-        ...rest,
-        columns: realColumns,
         scroll: {
-          x: realColumns.reduce((a, b) => a + (typeof b.width === "number" ? b.width : minColumnWidth), 0)
+          x: columns == null ? void 0 : columns.reduce((a, b) => a + (typeof b.width === "number" ? b.width : minColumnWidth), 0)
         },
+        ...rest,
         components,
+        columns,
         className: classNames(classes.table, tableProps == null ? void 0 : tableProps.className),
         pagination: typeof (tableProps == null ? void 0 : tableProps.pagination) === "boolean" ? tableProps.pagination : {
           showPrevNextJumpers: true,

package/es/index.js

@@ -2,38 +2,26 @@ import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from "react";
 import ReactDOM from "react-dom/client";
 import { BrowserRouter } from "react-router-dom";
-import { Button } from "antd";
+import { Table, Button } from "antd";
 import useConfig from "./hooks/useConfig";
-import { AES, SearchTable } from "./main";
+import { SearchTable } from "./main";
 let key = "U2FsdGVkX1/dG1NSXNR9hnp3Ech/v6Gh8CDDJxgBm1EPFQel12ySIf84ARXCPwTae7TzwgPvjOyE3S5rAEzl/wAZmId6pbezpFeFcJqxdmIl3FeluYHFxJzQHDETTvrr3G/REvv00kHptOVwg6ecjPH6yk7PNit0sWTBLorROxLxMD8lVDmOA66p7Zp4QnYzqScYJGFbutmfHYXfBRBe1Q2UKummJ798svNY5SIwEwl4spzgyWmhARtuyq4zhysFrj/xODuNDjtwitA6XfX566WcZkj3F+2P+mkYzDYOhXXaomnlybjrZ2hEHfcczQhUfJd89O8PNIuEWo24wjYRgMdKlw5CWSeocFCqV7ZJ/CV/7vNRcaO4awKlFNobLikkwDznxpcX+4UEej+ED+pgfmPQLsKedcfEscStkSAZXaD5pBRTiFU9xGLfDt6seUrEnMBeXkpMIY9j1SZDDK18/G7lSHjDQMZYZP6sfLdBdwY=";
 const Demo = () => {
   useConfig(key);
   useEffect(() => {
-    jiami();
   }, []);
-  const jiami = () => {
-    const aes = new AES();
-    aes.encrypt(
-      JSON.stringify({
-        AppID: "GZY_SZLD_GZYDP",
-        Password: "GZY_SZLD_GZYDP2557013",
-        copyright: " © 云雁科技有限公司 2023 版权所有",
-        icp: 'ICP备案/许可证号：<a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">湘B2-20090059</a> 公网安备号 44030502008569 隐私政策',
-        tel: "400-607-0705",
-        Salt: "HnSzldjt#2557013#"
-      })
-    );
-  };
   const columns = [
     {
       dataIndex: "a",
       title: "a"
     },
+    Table.EXPAND_COLUMN,
     {
       dataIndex: "b",
       title: "b",
       width: 400
     },
+    Table.SELECTION_COLUMN,
     {
       dataIndex: "c",
       title: "c"
@@ -42,9 +30,39 @@ const Demo = () => {
   const [list, setList] = useState([]);
   return /* @__PURE__ */ jsxs("div", { style: { height: "100vh" }, children: [
     /* @__PURE__ */ jsx(Button, { onClick: () => setList(columns), children: "test" }),
-    /* @__PURE__ */ jsx(SearchTable, { tableProps: { columns: list, dataSource: [], resizeable: true, tableId: "demo1" } })
+    /* @__PURE__ */ jsx(
+      SearchTable,
+      {
+        tableProps: {
+          columns: list,
+          dataSource: [
+            { a: 1, b: 2, c: 3, id: 1 },
+            { a: 1, b: 2, c: 3, id: 2 },
+            { a: 1, b: 2, c: 3, id: 3 }
+          ],
+          resizeable: true,
+          rowKey: "id",
+          rowSelection: {},
+          expandable: {
+            expandedRowRender: () => {
+              return /* @__PURE__ */ jsx("div", { children: "123" });
+            }
+          },
+          tableId: "demo1",
+          storageKey: "szld-libs-test",
+          components: {
+            body: {
+              cell: CustomCell
+            }
+          }
+        }
+      }
+    )
   ] });
 };
+const CustomCell = (props) => {
+  return /* @__PURE__ */ jsx("td", { ...props, className: "tdtdtdtd", children: props.children });
+};
 ReactDOM.createRoot(document.getElementById("root")).render(
   /* @__PURE__ */ jsx(BrowserRouter, { children: /* @__PURE__ */ jsx(Demo, {}) })
 );

package/lib/components/SearchTable/index.js

@@ -2,7 +2,6 @@
 const jsxRuntime = require("react/jsx-runtime");
 const antd = require("antd");
 const classNames = require("classnames");
-const _ = require("lodash");
 const react = require("react");
 const reactResizable = require("react-resizable");
 const utils = require("../../utils");
@@ -29,7 +28,6 @@ function SearchTable(props) {
     storageKey = "szld_table_cell_width",
     ...rest
   } = tableProps;
-  const ref = react.useRef(null);
   const [columns, setColumns] = react.useState([]);
   const getWidth = (v) => {
     var _a, _b;
@@ -47,24 +45,36 @@ function SearchTable(props) {
     if (list.length === 0) {
       return;
     }
-    const result = list.map((v) => ({
-      ...v,
-      width: getWidth(v)
-    }));
+    const result = list == null ? void 0 : list.filter((v) => !v.hidden).map((v) => {
+      if (v.dataIndex) {
+        return {
+          ...v,
+          width: getWidth(v),
+          onHeaderCell: (column) => ({
+            width: column.width,
+            resizeable,
+            onResize: (_e, { size }) => handleResize(column, size)
+          })
+        };
+      }
+      return v;
+    });
+    if (result.length > 0) {
+      result[result.length - 1].width = void 0;
+    }
     setColumns(result);
-    ref.current = Date.now();
   }, [tableProps.columns, tableId, minColumnWidth]);
-  const handleResize = react.useCallback(
-    (column, size) => {
-      const list = _.cloneDeep(columns);
-      if (!list || list.length === 0) {
-        return;
-      }
-      const index = list == null ? void 0 : list.findIndex((v) => v.dataIndex === column.dataIndex);
-      list[index] = {
-        ...list[index],
-        width: size.width
-      };
+  const handleResize = (column, size) => {
+    setColumns((prevColumns) => {
+      const list = prevColumns == null ? void 0 : prevColumns.map((v) => {
+        if (v.dataIndex === column.dataIndex) {
+          return {
+            ...v,
+            width: size.width
+          };
+        }
+        return v;
+      });
       if (tableId) {
         const obj = utils.getLocalStorage(storageKey) || {};
         obj[tableId] = obj[tableId] || {};
@@ -75,44 +85,26 @@ function SearchTable(props) {
         });
         localStorage.setItem(storageKey, JSON.stringify(obj));
       }
-      setColumns(list);
-    },
-    [columns, tableId, storageKey]
-  );
-  const realColumns = react.useMemo(() => {
-    if (!ref.current || columns === void 0) {
-      return [];
-    }
-    const result = columns == null ? void 0 : columns.filter((v) => !v.hidden).map((v) => ({
-      ...v,
-      width: v.width,
-      onHeaderCell: (column) => ({
-        width: column.width,
-        resizeable,
-        onResize: (_e, { size }) => handleResize(column, size)
-      })
-    }));
-    if (result.length > 0) {
-      result[result.length - 1].width = void 0;
-    }
-    return result;
-  }, [resizeable, columns, ref.current, minColumnWidth]);
+      return list;
+    });
+  };
   const components = {
     header: {
       cell: ResizeableTitle
-    }
+    },
+    ...rest == null ? void 0 : rest.components
   };
   return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
     searchProps && /* @__PURE__ */ jsxRuntime.jsx(CreateForm, { hiddenTitle: true, ...searchProps, items: searchProps.items }),
     /* @__PURE__ */ jsxRuntime.jsx(
       antd.Table,
       {
-        ...rest,
-        columns: realColumns,
         scroll: {
-          x: realColumns.reduce((a, b) => a + (typeof b.width === "number" ? b.width : minColumnWidth), 0)
+          x: columns == null ? void 0 : columns.reduce((a, b) => a + (typeof b.width === "number" ? b.width : minColumnWidth), 0)
         },
+        ...rest,
         components,
+        columns,
         className: classNames(classes.table, tableProps == null ? void 0 : tableProps.className),
         pagination: typeof (tableProps == null ? void 0 : tableProps.pagination) === "boolean" ? tableProps.pagination : {
           showPrevNextJumpers: true,

package/lib/index.js

@@ -10,31 +10,19 @@ let key = "U2FsdGVkX1/dG1NSXNR9hnp3Ech/v6Gh8CDDJxgBm1EPFQel12ySIf84ARXCPwTae7Tzw
 const Demo = () => {
   useConfig(key);
   react.useEffect(() => {
-    jiami();
   }, []);
-  const jiami = () => {
-    const aes = new main.AES();
-    aes.encrypt(
-      JSON.stringify({
-        AppID: "GZY_SZLD_GZYDP",
-        Password: "GZY_SZLD_GZYDP2557013",
-        copyright: " © 云雁科技有限公司 2023 版权所有",
-        icp: 'ICP备案/许可证号：<a href="https://beian.miit.gov.cn/#/Integrated/index" target="_blank">湘B2-20090059</a> 公网安备号 44030502008569 隐私政策',
-        tel: "400-607-0705",
-        Salt: "HnSzldjt#2557013#"
-      })
-    );
-  };
   const columns = [
     {
       dataIndex: "a",
       title: "a"
     },
+    antd.Table.EXPAND_COLUMN,
     {
       dataIndex: "b",
       title: "b",
       width: 400
     },
+    antd.Table.SELECTION_COLUMN,
     {
       dataIndex: "c",
       title: "c"
@@ -43,9 +31,39 @@ const Demo = () => {
   const [list, setList] = react.useState([]);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { style: { height: "100vh" }, children: [
     /* @__PURE__ */ jsxRuntime.jsx(antd.Button, { onClick: () => setList(columns), children: "test" }),
-    /* @__PURE__ */ jsxRuntime.jsx(main.SearchTable, { tableProps: { columns: list, dataSource: [], resizeable: true, tableId: "demo1" } })
+    /* @__PURE__ */ jsxRuntime.jsx(
+      main.SearchTable,
+      {
+        tableProps: {
+          columns: list,
+          dataSource: [
+            { a: 1, b: 2, c: 3, id: 1 },
+            { a: 1, b: 2, c: 3, id: 2 },
+            { a: 1, b: 2, c: 3, id: 3 }
+          ],
+          resizeable: true,
+          rowKey: "id",
+          rowSelection: {},
+          expandable: {
+            expandedRowRender: () => {
+              return /* @__PURE__ */ jsxRuntime.jsx("div", { children: "123" });
+            }
+          },
+          tableId: "demo1",
+          storageKey: "szld-libs-test",
+          components: {
+            body: {
+              cell: CustomCell
+            }
+          }
+        }
+      }
+    )
   ] });
 };
+const CustomCell = (props) => {
+  return /* @__PURE__ */ jsxRuntime.jsx("td", { ...props, className: "tdtdtdtd", children: props.children });
+};
 ReactDOM.createRoot(document.getElementById("root")).render(
   /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.BrowserRouter, { children: /* @__PURE__ */ jsxRuntime.jsx(Demo, {}) })
 );

package/package.json

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