dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7991 from dataease/pr@dev@feat_page

Browse Source 
feat: 定时同步和Excel支持分页
This commit is contained in:
Junjun 2024-02-04 18:00:29 +08:00 committed by GitHub
commit 8935500529
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/frontend/src/views/chart/components/ChartComponentS2.vue
View File

@ -494,7 +494,7 @@ export default {
},
pageChange(val) {
this.currentPage.pageSize = val
if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) {
if ((this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) || this.chart.datasetMode === 1) {
this.$emit('onPageChange', this.currentPage)
} else {
this.initData()
@ -504,7 +504,7 @@ export default {
pageClick(val) {
this.currentPage.page = val
if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) {
if ((this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) || this.chart.datasetMode === 1) {
this.$emit('onPageChange', this.currentPage)
} else {
this.initData()

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

@ -566,7 +566,7 @@ export default {
pageChange(val) {
this.currentPage.pageSize = val
if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) {
if ((this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) || this.chart.datasetMode === 1) {
this.$emit('onPageChange', this.currentPage)
} else {
this.init()
@ -575,7 +575,7 @@ export default {
pageClick(val) {
this.currentPage.page = val
if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) {
if ((this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) || this.chart.datasetMode === 1) {
this.$emit('onPageChange', this.currentPage)
} else {
this.init()