Skip to content

Commit

Permalink
merge: branch 'master' of github.com:hyperf-admin/hyperf-admin-frontend
Browse files Browse the repository at this point in the history
  • Loading branch information
daodao97 committed Sep 18, 2020
2 parents 5ee5e08 + 16a0f34 commit 4e74389
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/components/Common/BaseTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ export default {
showTableHeader: [],
sourceTableHeader: [],
page: {
pageSize: 20,
sizes: [20, 100, 200, 300, 400],
pageSize: this.$props.options.pageSize !== undefined ? this.$props.options.pageSize : 1,
sizes: this.$props.options.page.sizes !== undefined ? this.$props.options.page.sizes : [20, 100, 200, 300, 400],
currentPage: 1,
total: 200
},
Expand Down

0 comments on commit 4e74389

Please sign in to comment.