From d29e379ca55bdcca52ef1ace05fc513547f2a245 Mon Sep 17 00:00:00 2001 From: ulleo Date: Sat, 6 Apr 2024 14:32:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(X-Pack):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=A1=AB=E6=8A=A5=E6=88=91=E7=9A=84=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=A0=E6=B3=95=E7=BF=BB=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/frontend/src/views/dataFilling/myTask/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/frontend/src/views/dataFilling/myTask/index.vue b/core/frontend/src/views/dataFilling/myTask/index.vue index 9fb3fda732..22922741a6 100644 --- a/core/frontend/src/views/dataFilling/myTask/index.vue +++ b/core/frontend/src/views/dataFilling/myTask/index.vue @@ -120,29 +120,29 @@ export default { myTaskHandleSizeChange(pageSize) { this.myTaskPaginationConfig.currentPage = 1 this.myTaskPaginationConfig.pageSize = pageSize - this.searchTableData() + this.searchTableMyTaskData() }, myTaskHandleCurrentChange(currentPage) { this.myTaskPaginationConfig.currentPage = currentPage - this.searchTableData() + this.searchTableMyTaskData() }, finishedTaskHandleSizeChange(pageSize) { this.finishedTaskPaginationConfig.currentPage = 1 this.finishedTaskPaginationConfig.pageSize = pageSize - this.searchTableData() + this.searchTableFinishedTaskData() }, finishedTaskHandleCurrentChange(currentPage) { this.finishedTaskPaginationConfig.currentPage = currentPage - this.searchTableData() + this.searchTableFinishedTaskData() }, expiredTaskHandleSizeChange(pageSize) { this.expiredTaskPaginationConfig.currentPage = 1 this.expiredTaskPaginationConfig.pageSize = pageSize - this.searchTableData() + this.searchTableExpiredTaskData() }, expiredTaskHandleCurrentChange(currentPage) { this.expiredTaskPaginationConfig.currentPage = currentPage - this.searchTableData() + this.searchTableExpiredTaskData() }, getRestTime(time) { if (!time) { From 53d6946d02e8414ea7d5b6f6ebd62a99a7ee604d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Sat, 6 Apr 2024 20:31:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dpg=20sql=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/ExtractDataService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index bf8180936c..ca08b805c6 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -1022,6 +1022,7 @@ public class ExtractDataService { case pg: PgConfiguration pgConfiguration = new Gson().fromJson(datasource.getConfiguration(), PgConfiguration.class); dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfiguration.getHost().trim(), pgConfiguration.getDataBase(), pgConfiguration.getPort().toString(), pgConfiguration.getUsername(), pgConfiguration.getPassword()); + dataMeta.setPreferredSchemaName(pgConfiguration.getSchema()); transMeta.addDatabase(dataMeta); inputSteps = inputStep(transMeta, selectSQL, pgConfiguration); udjcStep = udjc(datasetTableFields, DatasourceTypes.pg, pgConfiguration, isSetKey);