@ecoding/components.antd 0.3.41 → 0.3.43

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { FilterValue, SorterResult, TableCurrentDataSource, TablePaginationConfig } from 'antd/lib/table/interface';
+import type { FilterValue, SorterResult, TableCurrentDataSource, TablePaginationConfig, TableLocale } from 'antd/lib/table/interface';
 import type { ColProps } from 'antd/lib/col';
 interface IProps {
     className?: string;
@@ -28,6 +28,7 @@ interface IProps {
     columnsTitle?: string;
     selectType?: "checkbox" | "radio";
     selectChangeHandler?: any;
+    locale?: TableLocale;
 }
 declare const TablePro: React.FC<IProps>;
 export default TablePro;

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

@@ -4,7 +4,7 @@ import { FilterOutlined, MenuOutlined } from '@ant-design/icons';
 import TableProColumns from "./columns";
 import { getDelateTargetByClassName } from "../../helpers/dom";
 import FilterHorizontal from "./filters.horizontal";
-const TablePro = memo(({ className, header, buttonArea, filterArea, filters, searchInputArea, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, bordered, selectChangeHandler, selectType, onChange, expandable, columnsTitle, filterTitle }) => {
+const TablePro = memo(({ className, header, buttonArea, filterArea, filters, searchInputArea, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, bordered, selectChangeHandler, selectType, onChange, expandable, columnsTitle, filterTitle, locale }) => {
     const ref = useRef(null);
     const disColumnRef = useRef([]);
     const [y, setY] = useState('100%');
@@ -32,14 +32,44 @@ const TablePro = memo(({ className, header, buttonArea, filterArea, filters, sea
         }
         return [];
     }, [innerColumns, dataSource]);
-    const onSelectChange = (newSelectedRowKeys) => {
-        setSelectedRowKeys(newSelectedRowKeys);
-        selectChangeHandler && selectChangeHandler(newSelectedRowKeys);
+    const onSelect = (record, selected, selectedRows, nativeEvent) => {
+        const key = record[rowKey];
+        let tempKeys = selectedRowKeys.concat([]);
+        if (selected) {
+            if (!tempKeys.includes(key)) {
+                tempKeys.push(key);
+            }
+        }
+        else {
+            const index = tempKeys.findIndex(item => item == key);
+            tempKeys.splice(index, 1);
+        }
+        setSelectedRowKeys(tempKeys);
+        selectChangeHandler && selectChangeHandler(tempKeys);
+    };
+    const onSelectAll = (selected, selectedRows, changeRows) => {
+        let tempKeys = selectedRowKeys.concat([]);
+        changeRows && changeRows.forEach(rows => {
+            const key = rows[rowKey];
+            if (selected) {
+                if (!tempKeys.includes(key)) {
+                    tempKeys.push(key);
+                }
+            }
+            else {
+                const index = tempKeys.findIndex(item => item == key);
+                tempKeys.splice(index, 1);
+            }
+        });
+        setSelectedRowKeys(tempKeys);
+        selectChangeHandler && selectChangeHandler(tempKeys);
     };
     const rowSelection = {
         type: selectType,
         selectedRowKeys,
-        onChange: onSelectChange,
+        onSelect: onSelect,
+        onSelectAll: onSelectAll
+        // onChange: onSelectChange
     };
     useEffect(() => {
         if (disColumnRef.current && disColumnRef.current.length > 0 && columns.length > 0) {
@@ -66,6 +96,7 @@ const TablePro = memo(({ className, header, buttonArea, filterArea, filters, sea
                 }
                 else {
                     if (ref.current && thead) {
+                        console.log(ref.current.clientHeight);
                         setY(ref.current.clientHeight - (thead.clientHeight && thead.clientHeight + (pagination ? 64 : 20)));
                     }
                 }
@@ -88,7 +119,7 @@ const TablePro = memo(({ className, header, buttonArea, filterArea, filters, sea
                     } },
                     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, onRow: (record, index) => {
+            React.createElement(Table, { rowSelection: selectType ? rowSelection : undefined, locale: locale ? locale : undefined, onRow: (record, index) => {
                     return {
                         onClick: (e) => {
                             const parent = getDelateTargetByClassName(e.target, "ant-table-tbody");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.3.41",
+    "version": "0.3.43",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -43,5 +43,5 @@
         "antd": "^5.8.4",
         "axios": "^1.1.2"
     },
-    "gitHead": "579781847632dbd4b54cb6a401c12df15d05893b"
+    "gitHead": "3dbaf40b36e4ef1547381e52dd45eb5a66d51745"
 }