Merge pull request #502 from kne-union/release

Release

Author: zhipenglin

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kne-components/components-core",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "files": [
     "build"
   ],

src/components/Table/Table.js

@@ -10,6 +10,8 @@ import useColumnTypeProps from "@components/Table/useColumnTypeProps";
 import useGroupHeader from "./useGroupHeader";
 import useSort from "./useSort";
 import useRefCallback from "@kne/use-ref-callback";
+import useSelectedRow from "./useSelectedRow";
+import TablePage from './TablePage';
 
 const Table = ({
                    columns,
@@ -132,4 +134,7 @@ const Table = ({
     </div>);
 };
 
+Table.useSelectedRow = useSelectedRow;
+Table.TablePage = TablePage;
+
 export default Table;

src/components/Table/TablePage.js

@@ -77,17 +77,23 @@ const TablePageInner = withFetch(({
                 />
             </>),
             current: get(requestParams, [pagination.paramsType, pagination.currentName], 1),
-            pageSize: pagination.pageSize,
-            onChange: pagination.onChange ? pagination.onChange : (page, size) => {
-                if (page !== get(requestParams, [pagination.paramsType, pagination.currentName], 1)) {
-                    (pagination.requestType === "refresh" ? refresh : reload)({
-                        [pagination.paramsType]: {
-                            [pagination.currentName]: page, [pagination.pageSizeName]: size,
-                        },
-                    });
-                } else {
-                    pagination.onShowSizeChange && pagination.onShowSizeChange(page, size);
-                }
+            pageSize: get(requestParams, [pagination.paramsType, pagination.pageSizeName], 20),
+            onChange: (page, size) => {
+                (() => {
+                    if (typeof pagination.onChange === 'function') {
+                        pagination.onChange(page, size);
+                        return;
+                    }
+                    if (page !== get(requestParams, [pagination.paramsType, pagination.currentName], 1)) {
+                        (pagination.requestType === "refresh" ? refresh : reload)({
+                            [pagination.paramsType]: {
+                                [pagination.currentName]: page, [pagination.pageSizeName]: size,
+                            },
+                        });
+                    } else {
+                        pagination.onShowSizeChange && pagination.onShowSizeChange(page, size);
+                    }
+                })();
                 getScrollEl().scrollTop = 0;
             },
             size: pagination.size,
@@ -98,7 +104,7 @@ const TablePageInner = withFetch(({
     };
 
     return (<IntlProvider importMessages={importMessages} moduleName="Table">
-        <FeaturesColumnsConfig id={featureId} columns={columns}>
+        <FeaturesColumnsConfig id={featureId} columns={typeof columns === 'function' ? columns(data) : columns}>
             {({columns}) => (<Table
                 {...Object.assign({}, props, tableProps)}
                 sticky={sticky}
@@ -111,15 +117,7 @@ const TablePageInner = withFetch(({
                 }}
                 summary={typeof summary === "function" ? (...args) => {
                     return summary(Object.assign({}, {
-                        data,
-                        fetchProps,
-                        requestParams,
-                        refresh,
-                        reload,
-                        loadMore,
-                        send,
-                        dataFormat,
-                        pagination,
+                        data, fetchProps, requestParams, refresh, reload, loadMore, send, dataFormat, pagination,
                     }, ...args));
                 } : null}
             />)}
@@ -136,7 +134,6 @@ const TablePage = forwardRef(({pagination, ...props}, ref) => {
         requestType: "reload",
         currentName: "currentPage",
         pageSizeName: "perPage",
-        pageSize: 20, //size: "small",
     }, pagination);
     const pageSizeKey = `${(props.name || "common").toUpperCase()}_TABLE_PAGE_SIZE`;
     const [pageSize, setPageSize] = useState(localStorage.getItem(pageSizeKey) || pagination.pageSize);

src/components/Table/useSelectedRow.js

@@ -0,0 +1,42 @@
+import {useState} from 'react';
+import uniq from "lodash/uniq";
+
+const useSelectedRow = (options) => {
+    const {rowKey} = Object.assign({}, {rowKey: 'id'}, options);
+    const [selectedRowKeys, setSelectedRowKeys] = useState([]);
+
+    const getRowId = (item) => typeof rowKey === 'function' ? rowKey(item) : item[rowKey];
+
+    return {
+        type: 'checkbox', selectedRowKeys, onSelectAll: (type, selected, items) => {
+            const ids = items.map(getRowId);
+            if (type) {
+                setSelectedRowKeys(value => {
+                    return uniq([...value, ...ids]);
+                });
+            } else {
+                setSelectedRowKeys(value => {
+                    return value.filter(item => {
+                        return ids.indexOf(item) === -1;
+                    });
+                });
+            }
+        }, onSelect: (item, type) => {
+            if (type) {
+                setSelectedRowKeys(value => {
+                    const newValue = value.slice(0);
+                    newValue.push(getRowId(item));
+                    return newValue;
+                });
+            } else {
+                setSelectedRowKeys(value => {
+                    const newValue = value.slice(0);
+                    newValue.splice(newValue.indexOf(getRowId(item)), 1);
+                    return newValue;
+                });
+            }
+        }, setSelectedRowKeys
+    };
+};
+
+export default useSelectedRow;