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

Merge pull request #8966 from dataease/dev

Browse Source 
merge bug fix
This commit is contained in:
fit2cloudrd 2024-04-07 07:46:16 +08:00 committed by GitHub
commit 1c72d2b547
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -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);

12
core/frontend/src/views/dataFilling/myTask/index.vue
View File

@ -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) {