@ecoding/components.antd 0.3.33 → 0.3.35

package/lib/core/form.list/index.js

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
-import { Typography, Form, Button, Space } from 'antd';
-import { PlusCircleOutlined } from '@ant-design/icons';
+import { Typography, Form, Button, Space, Tooltip } from 'antd';
+import { PlusCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons';
 const C = ({ columns, rules, name, hideOperation, hideHeader, hideBottom, operation, i18n, afterRemove, afterAdd }) => {
     const tdStyle = {
         verticalAlign: 'top',
@@ -38,10 +38,14 @@ const C = ({ columns, rules, name, hideOperation, hideHeader, hideBottom, operat
                             if (column.require) {
                                 return (React.createElement("th", { style: Object.assign({}, thStyle, { width: column.width || 200 }) },
                                     React.createElement("span", { style: { color: '#ff4d4f' } }, "*"),
-                                    " ",
-                                    column.title));
+                                    column.title,
+                                    column.tooltip ? (React.createElement(Tooltip, { placement: "top", title: column.tooltip || undefined },
+                                        React.createElement(QuestionCircleOutlined, { style: { paddingLeft: 4, color: "rgba(0, 0, 0, 0.45)" } }))) : null));
                             }
-                            return React.createElement("th", { style: Object.assign({}, thStyle, { width: column.width || 200 }) }, column.title);
+                            return (React.createElement("th", { style: Object.assign({}, thStyle, { width: column.width || 200 }) },
+                                column.title,
+                                column.tooltip ? (React.createElement(Tooltip, { placement: "top", title: column.tooltip || undefined },
+                                    React.createElement(QuestionCircleOutlined, { style: { paddingLeft: 4, color: "rgba(0, 0, 0, 0.45)" } }))) : null));
                         }),
                         hideOperation ? null : operation ? (React.createElement("th", { style: Object.assign({}, thStyle, { width: operation.width || 150, right: 0, position: "sticky" }) }, operation.title || "操作")) : (React.createElement("th", { style: Object.assign({}, thStyle, { width: 150, right: 0, position: "sticky" }) }, i18n ? i18n.$t("global.operation", "操作") : "操作"))))),
                     React.createElement("tbody", null, fields.map((field, index) => {
@@ -49,7 +53,7 @@ const C = ({ columns, rules, name, hideOperation, hideHeader, hideBottom, operat
                             React.createElement("td", { style: tdStyle }, index + 1),
                             columns.map((column, i) => {
                                 return (React.createElement("td", { style: tdStyle },
-                                    React.createElement(Form.Item, { style: { marginBottom: 0 }, tooltip: column.tooltip || undefined, name: [field.name, column.name], rules: column.rules || [] }, column.render(field, index))));
+                                    React.createElement(Form.Item, { style: { marginBottom: 0 }, name: [field.name, column.name], rules: column.rules || [] }, column.render(field, index))));
                             }),
                             hideOperation ? null : operation ? (React.createElement("td", { style: Object.assign({}, tdStyle, { right: 0, position: "sticky", backgroundColor: "#fff" }) },
                                 React.createElement(Space, null,

package/lib/core/table-pro/index.d.ts

@@ -5,6 +5,7 @@ interface IProps {
     header?: React.ReactNode;
     buttonArea?: React.ReactNode;
     filterArea?: React.ReactElement;
+    horizontalArea?: React.ReactElement;
     searchInputArea?: React.ReactElement;
     loading?: boolean;
     rowKey: string;
@@ -15,6 +16,7 @@ interface IProps {
     pagination?: any;
     offsetY?: number;
     onChange?: (pagination: TablePaginationConfig, filters: Record<string, FilterValue | null>, sorter: SorterResult<any> | SorterResult<any>[], extra: TableCurrentDataSource<any>) => void;
+    expandable: any;
     filterTitle?: string;
     columnsTitle?: string;
     selectType?: "checkbox" | "radio";

package/lib/core/table-pro/index.js

@@ -2,7 +2,8 @@ import React, { memo, useEffect, useMemo, useRef, useState } from 'react';
 import { Popover, Button, Typography, Table } from 'antd';
 import { FilterOutlined, MenuOutlined } from '@ant-design/icons';
 import TableProColumns from "./columns";
-const TablePro = memo(({ className, header, buttonArea, filterArea, searchInputArea, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, bordered, selectChangeHandler, selectType, onChange, columnsTitle, filterTitle }) => {
+import { getDelateTargetByClassName } from "../../helpers/dom";
+const TablePro = memo(({ className, header, buttonArea, filterArea, horizontalArea, searchInputArea, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, bordered, selectChangeHandler, selectType, onChange, expandable, columnsTitle, filterTitle }) => {
     const ref = useRef(null);
     const disColumnRef = useRef([]);
     const [y, setY] = useState('100%');
@@ -72,7 +73,7 @@ const TablePro = memo(({ className, header, buttonArea, filterArea, searchInputA
     }, [header, loading, innerColumns]);
     return (React.createElement("div", { style: flexColumnStyle, className: className || '' },
         header ? header : null,
-        React.createElement("div", { style: operationWrap },
+        horizontalArea ? (React.createElement("div", { style: operationWrap }, horizontalArea)) : (React.createElement("div", { style: operationWrap },
             buttonArea ? React.createElement("div", null, buttonArea) : null,
             React.createElement("div", null,
                 searchInputArea ? searchInputArea : null,
@@ -83,9 +84,22 @@ const TablePro = memo(({ className, header, buttonArea, filterArea, searchInputA
                 innerColumns ? (React.createElement(Popover, { placement: "leftBottom", title: React.createElement(Typography.Title, { level: 5 }, columnsTitle), content: React.createElement(TableProColumns, { disColumnRef: disColumnRef, columns: innerColumns, setColumns: setColumns }), trigger: "click", open: openColumnFilter, onOpenChange: (newOpen) => {
                         setOpenColumnFilter(newOpen);
                     } },
-                    React.createElement(Button, { type: "text", icon: React.createElement(MenuOutlined, null) }, columnsTitle))) : null)),
+                    React.createElement(Button, { type: "text", icon: React.createElement(MenuOutlined, null) }, columnsTitle))) : null))),
         dataSource ? (React.createElement("div", { style: { height: '100%', overflow: 'hidden' }, ref: ref },
-            React.createElement(Table, { rowSelection: selectType ? rowSelection : undefined, bordered: bordered, rowKey: rowKey, columns: showColumns, dataSource: dataSource, scroll: { y }, loading: loading, pagination: pagination || false, onChange: onChange || undefined }))) : null));
+            React.createElement(Table, { rowSelection: selectType ? rowSelection : undefined, onRow: (record, index) => {
+                    return {
+                        onClick: (e) => {
+                            const parent = getDelateTargetByClassName(e.target, "ant-table-tbody");
+                            if (parent) {
+                                const list = parent.querySelectorAll(".ant-table-row");
+                                list.forEach(elem => {
+                                    elem.style = "";
+                                });
+                                list[index].style = "background: #e6f4ff";
+                            }
+                        }, // 点击行
+                    };
+                }, expandable: expandable || undefined, bordered: bordered, rowKey: rowKey, columns: showColumns, dataSource: dataSource, scroll: { y }, loading: loading, pagination: pagination || false, onChange: onChange || undefined }))) : null));
 });
 TablePro.defaultProps = {
     filterTitle: "筛选",

package/lib/helpers/dom.d.ts

@@ -0,0 +1 @@
+export declare const getDelateTargetByClassName: (elem: any, str: string) => any;

package/lib/helpers/dom.js

@@ -0,0 +1,61 @@
+export const getDelateTargetByClassName = (elem, str) => {
+    if (!elem) {
+        return null;
+    }
+    const re = new RegExp("(\\s|^)" + str + "(\\s|$)", "i");
+    let parent = elem;
+    while (parent && !re.test(parent.className)) {
+        parent = parent.parentNode;
+    }
+    return parent ? parent : null;
+};
+// export const addClass = (elem, className: string) => {
+//     if (!className) {
+//         return this;
+//     }
+//     let arr;
+//     if (elem!.className) {
+//         // 解析当前 className 转换为数组
+//         arr = elem!.className.split(/\s/);
+//         arr = arr.filter((item) => {
+//             return !!item.trim();
+//         });
+//         // 添加 class
+//         if (arr.indexOf(className) < 0) {
+//             arr.push(className);
+//         }
+//         // 修改 elem.class
+//         elem!.className = arr.join(" ");
+//     } else {
+//         elem!.className = className;
+//     }
+//     return this;
+// }
+// // 删除 class
+// export const removeClass = (elem, className: string) => {
+//     if (!className) {
+//         return this;
+//     }
+//     let arr;
+//     if (elem!.className) {
+//         // 解析当前 className 转换为数组
+//         arr = elem!.className.split(/\s/);
+//         arr = arr.filter((item) => {
+//             item = item.trim();
+//             // 删除 class
+//             if (!item || item === className) {
+//                 return false;
+//             }
+//             return true;
+//         });
+//         // 修改 elem.class
+//         elem!.className = arr.join(" ");
+//     }
+//     return this;
+// }
+// export const hasClass = (elem, className) => {
+//     if (!className) {
+//         return false;
+//     }
+//     return elem.className.match(new RegExp(`(\\s|^)${className}(\\s|$)`));
+// }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.3.33",
+    "version": "0.3.35",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -43,5 +43,5 @@
         "antd": "^5.8.4",
         "axios": "^1.1.2"
     },
-    "gitHead": "51ec61416c94404bff5dc0fbe8ed011a5b33466f"
+    "gitHead": "53f4c3862f7e2fd57e3a94ac2ad8d2f6f78a3233"
 }