🍰 DataTable fix inner pagination

LANIF-UI · Jun 19, 2019 · 90f5b78 · 90f5b78
1 parent 3ba7c62
commit 90f5b78
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/__mocks__/crud.js b/src/__mocks__/crud.js
@@ -11,6 +11,16 @@ export default ({fetchMock, delay, mock, toSuccess, toError}) => {
  const paramMap = body.paramMap;
  const deptName = paramMap.deptName;
 
+ if (deptName == 'abcd') {
+ return toSuccess(mock({
+ 'currentPage': currentPage,
+ 'showCount': body.showCount,
+ 'totalResult': 0,
+ 'totalPage': 0,
+ dataList: [],
+ }), 400)
+ }
+
  return toSuccess(mock({
  'currentPage': currentPage,
  'showCount': body.showCount,

diff --git a/src/components/DataTable/DataTable.js b/src/components/DataTable/DataTable.js
@@ -250,14 +250,14 @@ class DataTable extends Component {
  // 分页
  const paging = objectAssign(
  {
+ total: dataItems.total,
+ pageSize: dataItems.pageSize,
  showSizeChanger: true,
  showQuickJumper: true,
  showTotal: total => `共 ${total} 条`,
  onShowSizeChange: this.onShowSizeChange
  },
- dataItems.pageSize && { pageSize: dataItems.pageSize },
  dataItems.pageNum && { current: dataItems.pageNum },
- dataItems.total && { total: dataItems.total },
  pagination
  );