Commit a2d66cfc by ethanlamzs

分页问题

1 parent add383eb
...@@ -32,12 +32,16 @@ export function getSchoolLists(req, res, u) { ...@@ -32,12 +32,16 @@ export function getSchoolLists(req, res, u) {
console.log(url); console.log(url);
console.log(params); console.log(params);
const count = (params.pageSize * 1) || 40; const pageSize = (params.pageSize * 1) || 10;
const result = schoolList(count,params.name); const result = schoolList(100,params.name);
if (res && res.json) { if (res && res.json) {
res.json({'list':result,'pagination':1}); res.json({'list':result,'pagination': {
'total': result.length,
'pageSize':pageSize,
'current': parseInt(params.currentPage, 10) || 1,
},});
} else { } else {
return result; return result;
} }
......
...@@ -36,10 +36,7 @@ class StandardTable extends PureComponent { ...@@ -36,10 +36,7 @@ class StandardTable extends PureComponent {
render() { render() {
const { selectedRowKeys } = this.state; const { selectedRowKeys } = this.state;
const { data,loading,columns } = this.props; const { data: { list, pagination },loading,columns } = this.props;
const pagination = 1;
const paginationProps = { const paginationProps = {
showSizeChanger: true, showSizeChanger: true,
...@@ -73,7 +70,7 @@ class StandardTable extends PureComponent { ...@@ -73,7 +70,7 @@ class StandardTable extends PureComponent {
loading={loading} loading={loading}
rowKey={record => record.key} rowKey={record => record.key}
rowSelection={rowSelection} rowSelection={rowSelection}
dataSource={data} dataSource={list}
columns={columns} columns={columns}
pagination={paginationProps} pagination={paginationProps}
onChange={this.handleTableChange} onChange={this.handleTableChange}
......
...@@ -36,6 +36,29 @@ export default class linkmanadm extends PureComponent { ...@@ -36,6 +36,29 @@ export default class linkmanadm extends PureComponent {
} }
handleStandardTableChange = (pagination, filtersArg, sorter) => { handleStandardTableChange = (pagination, filtersArg, sorter) => {
const { dispatch } = this.props;
const { formValues } = this.state;
const filters = Object.keys(filtersArg).reduce((obj, key) => {
const newObj = { ...obj };
newObj[key] = getValue(filtersArg[key]);
return newObj;
}, {});
const params = {
currentPage: pagination.current,
pageSize: pagination.pageSize,
...formValues,
...filters,
};
if (sorter.field) {
params.sorter = `${sorter.field}_${sorter.order}`;
}
dispatch({
type: 'schools/fetch',
payload: params,
});
} }
...@@ -125,7 +148,7 @@ export default class linkmanadm extends PureComponent { ...@@ -125,7 +148,7 @@ export default class linkmanadm extends PureComponent {
render() { render() {
const { schools: {data:{list}}, loading } = this.props; const { schools: {data}, loading } = this.props;
const { selectedRows, modalVisible, addInputValue } = this.state; const { selectedRows, modalVisible, addInputValue } = this.state;
const columns = [ const columns = [
...@@ -187,7 +210,7 @@ export default class linkmanadm extends PureComponent { ...@@ -187,7 +210,7 @@ export default class linkmanadm extends PureComponent {
<StandardTable <StandardTable
selectedRows={selectedRows} selectedRows={selectedRows}
loading={loading} loading={loading}
data={list} data={data}
columns={columns} columns={columns}
onSelectRow={this.handleSelectRows} onSelectRow={this.handleSelectRows}
onChange={this.handleStandardTableChange} onChange={this.handleStandardTableChange}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!