@kep-platform/basic-component 0.0.18 → 0.0.20

package/dist/Columns/Columns.js

@@ -124,6 +124,6 @@ export default function Columns(_ref) {
     return /*#__PURE__*/React.createElement(Column, _extends({}, listItemRestProps, {
       key: key,
       isFlex: isFlex
-    }), (render === null || render === void 0 ? void 0 : render(rowData[dataIndex], rowData, rowIndex)) || rowData[dataIndex] || '-');
+    }), (render === null || render === void 0 ? void 0 : render(rowData[dataIndex], rowData, rowIndex)) || rowData[dataIndex]);
   }));
 }

package/dist/Table/Table.d.ts

@@ -14,7 +14,7 @@ export type TableProps = {
     onChange?: (pagination?: Pagination, sorter?: SorterDesc, fitler?: FilterDesc) => void;
     headerRender?: (column: ColumnType) => ReactNode;
     groupBy?: string;
-    pagination?: Pagination;
+    pagination?: Pagination | false;
 };
-export default function Table({ columns, dataSource, rowKey, actions, title, scroll, onChange, headerRender, pagination, }: TableProps): React.JSX.Element;
+export default function Table({ columns, dataSource, rowKey, actions, title, scroll, onChange, headerRender, pagination: outerPagination, }: TableProps): React.JSX.Element;
 export {};

package/dist/Table/Table.js

@@ -14,7 +14,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CaretDownOutlined from '@ant-design/icons/CaretDownOutlined';
 import CaretUpOutlined from '@ant-design/icons/CaretUpOutlined';
-import React, { useCallback, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import styled, { css } from 'styled-components';
 import { BoxShadowBox } from "../BoxShadowBox";
 import { Column, Columns } from "../Columns";
@@ -137,11 +137,21 @@ export default function Table(_ref3) {
     scroll = _ref3.scroll,
     _onChange2 = _ref3.onChange,
     headerRender = _ref3.headerRender,
-    pagination = _ref3.pagination;
+    outerPagination = _ref3.pagination;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     sorterController = _useState2[0],
     setSorterController = _useState2[1];
+  var _useState3 = useState(outerPagination === false ? false : outerPagination || {
+      current: 1,
+      pageSize: 10
+    }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    pagination = _useState4[0],
+    setPagination = _useState4[1];
+  useEffect(function () {
+    if (outerPagination !== undefined) setPagination(outerPagination);
+  }, [outerPagination]);
   var titleRowData = useMemo(function () {
     var data = {};
     columns.forEach(function (column) {
@@ -178,16 +188,17 @@ export default function Table(_ref3) {
     }, 0);
   }, [columns]);
   var formatedDataSource = useMemo(function () {
-    var formatedDataSource;
-    /* 分页过滤 */
-    if (pagination && dataSource.length > (pagination.pageSize || 10)) {
+    var formatedDataSource = dataSource;
+    if (pagination !== false) {
       var startIndex = ((pagination.current || 1) - 1) * (pagination.pageSize || 10);
       var endIndex = startIndex + (pagination.pageSize || 10) - 1;
-      formatedDataSource = dataSource.filter(function (_, index) {
-        return index >= startIndex && index <= endIndex;
+      formatedDataSource = dataSource.map(function (rowData, index) {
+        if (index >= startIndex && index <= endIndex) {
+          return rowData;
+        } else {
+          return undefined;
+        }
       });
-    } else {
-      formatedDataSource = dataSource;
     }
     /* 排序 */
     if (sorterController && sorterController.sorterType !== undefined) {
@@ -200,7 +211,7 @@ export default function Table(_ref3) {
     /* 条件过滤 */
     return formatedDataSource;
   }, [sorterController, dataSource, columns, pagination]);
-  return /*#__PURE__*/React.createElement(TableContainer, null, /*#__PURE__*/React.createElement(Row, null, /*#__PURE__*/React.createElement(Col, {
+  return /*#__PURE__*/React.createElement(TableContainer, null, (title || actions) && /*#__PURE__*/React.createElement(Row, null, /*#__PURE__*/React.createElement(Col, {
     span: 8
   }, /*#__PURE__*/React.createElement(TableTitle, null, title)), /*#__PURE__*/React.createElement(Col, {
     span: 16
@@ -239,22 +250,26 @@ export default function Table(_ref3) {
   }), /*#__PURE__*/React.createElement(TableBody, {
     direction: "column"
   }, formatedDataSource.map(function (rowData, index) {
-    return /*#__PURE__*/React.createElement(TableBodyRow, {
+    if (rowData) return /*#__PURE__*/React.createElement(TableBodyRow, {
       key: rowData[rowKey]
     }, /*#__PURE__*/React.createElement(Columns, {
       rowIndex: index,
       rowData: rowData,
       columns: columns,
       isFlex: !scroll
-    }));
-  }))), /*#__PURE__*/React.createElement("br", null), pagination && /*#__PURE__*/React.createElement(Pagination, _extends({}, pagination, {
-    total: pagination.total || dataSource.length,
+    }));else return undefined;
+  }))), /*#__PURE__*/React.createElement("br", null), pagination !== false && /*#__PURE__*/React.createElement(Pagination, _extends({}, pagination, {
+    total: (pagination === null || pagination === void 0 ? void 0 : pagination.total) || dataSource.length,
     justifyContent: "right",
     onChange: function onChange(current, pageSize) {
       _onChange2 === null || _onChange2 === void 0 || _onChange2({
         current: current,
         pageSize: pageSize
       });
+      setPagination({
+        current: current,
+        pageSize: pageSize
+      });
     }
   })));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kep-platform/basic-component",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "A react library developed with dumi",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -74,10 +74,10 @@
     "react-dom": "^18.0.0",
     "stylelint": "^14.9.1"
   },
-  "gitHead": "87aa5fd0616b79fc6cad62d3f57b6599325afd85",
+  "gitHead": "d4f36d49811bbff1291bc103c104a2f9c947fc4b",
   "dependencies": {
     "@ant-design/icons": "^5.3.7",
-    "@kep-platform/hooks": "^0.0.18",
+    "@kep-platform/hooks": "^0.0.20",
     "color": "^4.2.3",
     "rc-pagination": "^4.1.0",
     "styled-components": "^6.1.11"