github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 12:03:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3883 from dataease/pr@dev@feat_table_page

Browse Source 
feat(视图): 部分数据源不支持直连分页，使用前端分页
This commit is contained in:
王嘉豪 2022-11-25 18:06:51 +08:00 committed by GitHub
commit 164939cd90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/views/chart/chart/chart.js
View File

@ -1108,4 +1108,4 @@ export const CHART_FONT_LETTER_SPACE = [
{ name: '10px', value: '10' } { name: '10px', value: '10' }
] ]
export const NOT_SUPPORT_PAGE_DATASET = ['kylin', 'sqlServer', 'es', 'presto'] export const NOT_SUPPORT_PAGE_DATASET = ['kylin', 'sqlServer', 'es', 'presto', 'ds_doris', 'StarRocks']

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

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

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

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