@ecoding/components.antd 0.2.15 → 0.2.16

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

@@ -6,6 +6,7 @@ interface IProps {
     filterArea?: React.ReactElement;
     loading?: boolean;
     rowKey: string;
+    bordered?: boolean;
     dataSource: any;
     columns: any[];
     operationColumn?: any[];

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

@@ -2,7 +2,7 @@ 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, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, columnsTitle, filterTitle }) => {
+const TablePro = memo(({ className, header, buttonArea, filterArea, loading, rowKey, dataSource, pagination, offsetY, columns, operationColumn, bordered, columnsTitle, filterTitle }) => {
     const ref = useRef(null);
     const disColumnRef = useRef([]);
     const [y, setY] = useState('100%');
@@ -24,10 +24,7 @@ const TablePro = memo(({ className, header, buttonArea, filterArea, loading, row
         setOpenFilter(false);
     };
     const showColumns = useMemo(() => {
-        if (dataSource && dataSource.length > 0) {
-            return innerColumns.filter((c) => c.checked !== false).concat(operationColumn || []);
-        }
-        return [];
+        return innerColumns.filter((c) => c.checked !== false).concat(operationColumn || []);
     }, [innerColumns, dataSource]);
     useEffect(() => {
         if (disColumnRef.current && disColumnRef.current.length > 0 && columns.length > 0) {
@@ -70,10 +67,11 @@ const TablePro = memo(({ className, header, buttonArea, filterArea, loading, row
                     } },
                     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, { bordered: true, rowKey: rowKey, columns: showColumns, dataSource: dataSource, scroll: { y }, loading: loading, pagination: pagination || false }))) : null));
+            React.createElement(Table, { bordered: bordered, rowKey: rowKey, columns: showColumns, dataSource: dataSource, scroll: { y }, loading: loading, pagination: pagination || false }))) : null));
 });
 TablePro.defaultProps = {
     filterTitle: "筛选",
-    columnsTitle: "显示列"
+    columnsTitle: "显示列",
+    bordered: false
 };
 export default TablePro;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.2.15",
+    "version": "0.2.16",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -44,5 +44,5 @@
     "dependencies": {
         "react-quill": "^2.0.0"
     },
-    "gitHead": "cf08f1f36056c20b5e1aa37d8568c21a4a20bcf2"
+    "gitHead": "d43fb93777143fd7818502a8cee5b53b9f6ba88d"
 }