@ecoding/components.antd 0.4.19 → 0.4.20

package/lib/core/modal/index.js

@@ -46,7 +46,7 @@ export class Modals extends React.Component {
     }
     render() {
         // if (!this.props.visible) return null;
-        return (React.createElement(Modal, { className: this.state.className, wrapClassName: this.state.wrapClassName, open: this.state.open, style: this.state.style, width: this.state.width, zIndex: this.state.zIndex, mask: this.state.mask, title: typeof this.state.title === "string" ? (React.createElement("div", { style: { boxShadow: "inset 0px -1px 0px #F0F0F0", marginBottom: "20px", paddingBottom: "12px" } }, this.state.title)) : (this.state.title), closable: this.state.closable, maskClosable: this.state.maskClosable, onCancel: this.cancel, destroyOnHidden: true, keyboard: false, footer: this.state.footer === null ? null : this.state.footer ? (this.state.footer) : (React.createElement(React.Fragment, null,
+        return (React.createElement(Modal, { className: this.state.className, wrapClassName: this.state.wrapClassName, open: this.state.open, style: this.state.style, width: this.state.width, height: this.state.height ? this.state.height : undefined, zIndex: this.state.zIndex, mask: this.state.mask, title: typeof this.state.title === "string" ? (React.createElement("div", { style: { boxShadow: "inset 0px -1px 0px #F0F0F0", marginBottom: "20px", paddingBottom: "12px" } }, this.state.title)) : (this.state.title), closable: this.state.closable, maskClosable: this.state.maskClosable, onCancel: this.cancel, destroyOnHidden: true, keyboard: false, footer: this.state.footer === null ? null : this.state.footer ? (this.state.footer) : (React.createElement(React.Fragment, null,
                 this.state.addonBefore ? this.state.addonBefore : null,
                 React.createElement(Button, Object.assign({}, this.state.cancelButtonProps, { key: "back", onClick: this.cancel }), this.state.cancelText),
                 React.createElement(Button, Object.assign({}, this.state.okButtonProps, { danger: this.state.okDanger, key: "submit", type: this.state.okType, loading: this.state.loading, onClick: this.ok }), this.state.okText),

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

@@ -3,7 +3,8 @@ import type { FilterValue, SorterResult, TableCurrentDataSource, TablePagination
 import type { ColProps } from 'antd/lib/col';
 interface TableProRef {
     clear: () => void;
-    setSelectedRowKeys: (key: string[]) => void;
+    setSelectedRowKeys: (key: React.Key[]) => void;
+    getSelectedRowKeys: () => React.Key[];
 }
 interface IProps {
     className?: string;
@@ -27,6 +28,7 @@ interface IProps {
     bordered?: boolean;
     dataSource: any;
     columns: any[];
+    selectKeys?: React.Key[];
     operationColumn?: any[];
     pagination?: any;
     offsetY?: number;
@@ -35,7 +37,7 @@ interface IProps {
     filterTitle?: string;
     columnsTitle?: string;
     selectType?: "checkbox" | "radio";
-    selectChangeHandler?: any;
+    selectChangeHandler?: (keys: React.Key[], selectedRows: any[]) => void;
     i18n?: any;
     locale?: TableLocale;
 }

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

@@ -1,15 +1,17 @@
 import React, { memo, useEffect, useMemo, useRef, useState, useImperativeHandle, forwardRef } from 'react';
 import { Popover, Button, Typography, Table } from 'antd';
 import { FilterOutlined, MenuOutlined } from '@ant-design/icons';
+import { isEqual } from "@ecoding/helper.is";
 import TableProColumns from "./columns";
 import { getDelateTargetByClassName } from "../../helpers/dom";
 import FilterHorizontal from "./filters.horizontal";
-const TablePro = ({ className, header, buttonArea, filterArea, filters, searchInputArea, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, bordered = false, selectChangeHandler, selectType, onChange, expandable, columnsTitle, filterTitle, locale, scrollY = '100%', scrollX, i18n, }, ref) => {
+const TablePro = ({ className, header, buttonArea, filterArea, filters, searchInputArea, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, bordered = false, selectChangeHandler, selectType, selectKeys, onChange, expandable, columnsTitle, filterTitle, locale, scrollY = '100%', scrollX, i18n, }, ref) => {
     const tableRef = useRef(null);
     const disColumnRef = useRef([]);
     const [y, setY] = useState(scrollY);
     const [innerColumns, setColumns] = useState(columns);
     const [selectedRowKeys, setSelectedRowKeys] = useState([]);
+    const [selectedRows, setSelectedRows] = useState([]);
     const flexColumnStyle = {
         display: 'flex',
         height: '100%',
@@ -51,7 +53,7 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
             tempKeys.splice(index, 1);
         }
         setSelectedRowKeys(tempKeys);
-        selectChangeHandler && selectChangeHandler(tempKeys);
+        selectChangeHandler && selectChangeHandler(tempKeys, selectedRows);
     };
     const onSelectAll = (selected, selectedRows, changeRows) => {
         let tempKeys = selectedRowKeys.concat([]);
@@ -68,15 +70,20 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
             }
         });
         setSelectedRowKeys(tempKeys);
-        selectChangeHandler && selectChangeHandler(tempKeys);
+        selectChangeHandler && selectChangeHandler(tempKeys, selectedRows);
     };
-    const rowSelection = {
+    const rowSelection = Object.assign({}, {
         type: selectType,
         selectedRowKeys,
+    }, selectType === 'checkbox' ? {
         onSelect: onSelect,
         onSelectAll: onSelectAll
-        // onChange: onSelectChange
-    };
+    } : {}, selectType === 'radio' ? {
+        onChange: (selectedRowKeys, selectedRows) => {
+            setSelectedRowKeys(selectedRowKeys);
+            selectChangeHandler && selectChangeHandler(selectedRowKeys, selectedRows);
+        }
+    } : {});
     useEffect(() => {
         if (disColumnRef.current && disColumnRef.current.length > 0 && columns.length > 0) {
             setColumns(columns.map((c) => {
@@ -108,12 +115,20 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
             }, 100);
         }
     }, [header, loading, innerColumns]);
+    useEffect(() => {
+        if (selectKeys && selectKeys.length > 0 && !isEqual(selectedRowKeys, selectKeys)) {
+            setSelectedRowKeys(selectKeys);
+        }
+    }, [selectKeys]);
     useImperativeHandle(ref, () => ({
         clear: () => {
             setSelectedRowKeys([]);
         },
         setSelectedRowKeys: (keys) => {
             setSelectedRowKeys(keys);
+        },
+        getSelectedRowKeys: () => {
+            return selectedRowKeys;
         }
     }));
     return (React.createElement("div", { style: flexColumnStyle, className: className || '' },
@@ -121,7 +136,7 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
         filters ? (React.createElement(FilterHorizontal, Object.assign({ y: y, setY: setY }, filters, { i18n: i18n }))) : null,
         React.createElement("div", { style: operationWrap },
             buttonArea ? React.createElement("div", null, buttonArea) : React.createElement("div", null),
-            React.createElement("div", null,
+            React.createElement("div", { style: { display: 'flex' } },
                 searchInputArea ? searchInputArea : null,
                 filterArea ? (React.createElement(Popover, { placement: "leftBottom", title: React.createElement(Typography.Title, { level: 5 }, filterTitleStr), content: React.cloneElement(filterArea, { hide: hideOpenFilter }), trigger: "click", open: openFilter, onOpenChange: (newOpen) => {
                         setOpenFilter(newOpen);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.4.19",
+    "version": "0.4.20",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -47,5 +47,5 @@
         "antd": "5.27.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "bef6ad3a5e418056475ddc6441da1071d38a1516"
+    "gitHead": "571168c21c039e8eed8da932957c8b567fa22abb"
 }