center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'v1.7' of github.com:dataease/dataease into v1.7

Browse Source
This commit is contained in:
taojinlong 2022-01-25 17:37:51 +08:00
commit a02c565c17
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/views/chart/components/table/TableNormal.vue
View File

@ -116,7 +116,7 @@ export default {
borderRadius: '0px', borderRadius: '0px',
currentPage: { currentPage: {
page: 1, page: 1,
pageSize: 10, pageSize: 20,
show: 0 show: 0
} }
} }
@ -165,7 +165,7 @@ export default {
if (this.chart.data) { if (this.chart.data) {
this.fields = JSON.parse(JSON.stringify(this.chart.data.fields)) this.fields = JSON.parse(JSON.stringify(this.chart.data.fields))
const attr = JSON.parse(this.chart.customAttr) const attr = JSON.parse(this.chart.customAttr)
this.currentPage.pageSize = parseInt(attr.size.tablePageSize ? attr.size.tablePageSize : 10) this.currentPage.pageSize = parseInt(attr.size.tablePageSize ? attr.size.tablePageSize : 20)
datas = JSON.parse(JSON.stringify(this.chart.data.tableRow)) datas = JSON.parse(JSON.stringify(this.chart.data.tableRow))
if (this.chart.type === 'table-info') { if (this.chart.type === 'table-info') {
// 计算分页 // 计算分页
@ -341,7 +341,7 @@ export default {
resetPage() { resetPage() {
this.currentPage = { this.currentPage = {
page: 1, page: 1,
pageSize: 10, pageSize: 20,
show: 0 show: 0
} }
} }