From 1308aa1d73d16405f987a3f765b161b80e8e8e8f Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 25 Nov 2022 16:31:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=9B=B4=E8=BF=9E=E5=88=86=E9=A1=B5=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java | 1 +
 .../main/java/io/dataease/service/chart/ChartViewService.java | 1 +
 frontend/src/views/chart/chart/chart.js                       | 2 ++
 frontend/src/views/chart/components/ChartComponentS2.vue      | 4 ++--
 frontend/src/views/chart/components/table/TableNormal.vue     | 4 ++--
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
index 1b7f75132f..cee2bb0bf8 100644
--- a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
+++ b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
@@ -45,4 +45,5 @@ public class ChartViewDTO extends ChartViewWithBLOBs {
     private long totalPage;
     private long totalItems;
     private int datasetMode;
+    private String datasetType;
 }
diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 28899c9d2e..94cf5c9cfb 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -302,6 +302,7 @@ public class ChartViewService {
             DatasetTable datasetTable = dataSetTableService.get(view.getTableId());
             if (ObjectUtils.isNotEmpty(datasetTable)) {
                 view.setDatasetMode(datasetTable.getMode());
+                view.setDatasetType(datasetTable.getType());
             }
             // 如果是从仪表板获取视图数据，则仪表板的查询模式，查询结果的数量，覆盖视图对应的属性
             if (CommonConstants.VIEW_RESULT_MODE.CUSTOM.equals(request.getResultMode())) {
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 1ec2129aa4..9fd766a019 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -1107,3 +1107,5 @@ export const CHART_FONT_LETTER_SPACE = [
   { name: '9px', value: '9' },
   { name: '10px', value: '10' }
 ]
+
+export const NOT_SUPPORT_PAGE_DATASET = ['kylin', 'sqlServer', 'es', 'presto']
diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue
index d8e0a556c2..a10365bb4f 100644
--- a/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -92,7 +92,7 @@ import ViewTrackBar from '@/components/canvas/components/editor/ViewTrackBar'
 import { getRemark, hexColorToRGBA } from '@/views/chart/chart/util'
 import { baseTableInfo, baseTableNormal, baseTablePivot } from '@/views/chart/chart/table/table-info'
 import TitleRemark from '@/views/chart/view/TitleRemark'
-import { DEFAULT_TITLE_STYLE } from '@/views/chart/chart/chart'
+import { DEFAULT_TITLE_STYLE, NOT_SUPPORT_PAGE_DATASET } from '@/views/chart/chart/chart'
 import ChartTitleUpdate from './ChartTitleUpdate.vue'
 import { mapState } from 'vuex'
 
@@ -234,7 +234,7 @@ export default {
         const attr = JSON.parse(this.chart.customAttr)
         this.currentPage.pageSize = parseInt(attr.size.tablePageSize ? attr.size.tablePageSize : 20)
         data = JSON.parse(JSON.stringify(this.chart.data.tableRow))
-        if (this.chart.datasetMode === 0) {
+        if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasetType)) {
           if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && this.chart.totalItems > this.currentPage.pageSize) {
             this.currentPage.show = this.chart.totalItems
             this.showPage = true
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index c67a5b74ac..1a53ced39d 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/frontend/src/views/chart/components/table/TableNormal.vue
@@ -79,7 +79,7 @@
 <script>
 import { hexColorToRGBA } from '../../chart/util'
 import eventBus from '@/components/canvas/utils/eventBus'
-import { DEFAULT_COLOR_CASE, DEFAULT_SIZE } from '@/views/chart/chart/chart'
+import { DEFAULT_COLOR_CASE, DEFAULT_SIZE, NOT_SUPPORT_PAGE_DATASET } from '@/views/chart/chart/chart'
 import { mapState } from 'vuex'
 
 export default {
@@ -238,7 +238,7 @@ export default {
         }
 
         data = JSON.parse(JSON.stringify(this.chart.data.tableRow))
-        if (this.chart.datasetMode === 0) {
+        if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasetType)) {
           if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && this.chart.totalItems > this.currentPage.pageSize) {
             this.currentPage.show = this.chart.totalItems
             this.showPage = true

From a4b2ec825019014cb122fa54e462b1798784a99a Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 25 Nov 2022 16:50:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=9B=B4=E8=BF=9E=E5=88=86=E9=A1=B5=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java  | 2 +-
 .../main/java/io/dataease/service/chart/ChartViewService.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
index cee2bb0bf8..635da3b188 100644
--- a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
+++ b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
@@ -45,5 +45,5 @@ public class ChartViewDTO extends ChartViewWithBLOBs {
     private long totalPage;
     private long totalItems;
     private int datasetMode;
-    private String datasetType;
+    private String datasourceType;
 }
diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 94cf5c9cfb..884566c6eb 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -302,7 +302,8 @@ public class ChartViewService {
             DatasetTable datasetTable = dataSetTableService.get(view.getTableId());
             if (ObjectUtils.isNotEmpty(datasetTable)) {
                 view.setDatasetMode(datasetTable.getMode());
-                view.setDatasetType(datasetTable.getType());
+                Datasource datasource = datasourceService.get(datasetTable.getDataSourceId());
+                view.setDatasourceType(datasource != null ? datasource.getType() : null);
             }
             // 如果是从仪表板获取视图数据，则仪表板的查询模式，查询结果的数量，覆盖视图对应的属性
             if (CommonConstants.VIEW_RESULT_MODE.CUSTOM.equals(request.getResultMode())) {

From 82bd68eb4eae505a90fa0f60820797402f284097 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 25 Nov 2022 16:53:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E6=95=B0=E6=8D=AE=E6=BA=90=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=9B=B4=E8=BF=9E=E5=88=86=E9=A1=B5=EF=BC=8C=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/ChartComponentS2.vue  | 2 +-
 frontend/src/views/chart/components/table/TableNormal.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue
index a10365bb4f..53c6e7be64 100644
--- a/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -234,7 +234,7 @@ export default {
         const attr = JSON.parse(this.chart.customAttr)
         this.currentPage.pageSize = parseInt(attr.size.tablePageSize ? attr.size.tablePageSize : 20)
         data = JSON.parse(JSON.stringify(this.chart.data.tableRow))
-        if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasetType)) {
+        if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) {
           if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && this.chart.totalItems > this.currentPage.pageSize) {
             this.currentPage.show = this.chart.totalItems
             this.showPage = true
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index 1a53ced39d..7a5af2efaf 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/frontend/src/views/chart/components/table/TableNormal.vue
@@ -238,7 +238,7 @@ export default {
         }
 
         data = JSON.parse(JSON.stringify(this.chart.data.tableRow))
-        if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasetType)) {
+        if (this.chart.datasetMode === 0 && !NOT_SUPPORT_PAGE_DATASET.includes(this.chart.datasourceType)) {
           if (this.chart.type === 'table-info' && (attr.size.tablePageMode === 'page' || !attr.size.tablePageMode) && this.chart.totalItems > this.currentPage.pageSize) {
             this.currentPage.show = this.chart.totalItems
             this.showPage = true