center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #3943 from dataease/pr@dev@fix_dataset

Browse Source 
fix(数据集): 数据集时间格式化问题
This commit is contained in:
taojinlong 2022-11-30 00:05:19 +08:00 committed by GitHub
commit 2ea1bbe6f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
View File

@ -1324,4 +1324,8 @@ public class EsQueryProvider extends QueryProvider {
"{\"dateformat\": \"yyyy-MM-dd HH:mm:ss\"}\n" +
"]", Dateformat.class);
}
public String getResultCount(boolean isTable, String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
return null;
}
}

2
backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
View File

@ -457,7 +457,7 @@ public class PgQueryProvider extends QueryProvider {
.build();
if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
return sqlLimit(st.render(), view);
return st.render();
}
@Override

4
backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
View File

@ -1343,4 +1343,8 @@ public class SqlserverQueryProvider extends QueryProvider {
"{\"dateformat\": \"120\", \"desc\": \"yyyy-mm-dd hh:mi:ss\"}\n" +
"]", Dateformat.class);
}
public String getResultCount(boolean isTable, String sql, List<ChartViewFieldDTO> xAxis, List<ChartFieldCustomFilterDTO> fieldCustomFilter, List<DataSetRowPermissionsTreeDTO> rowPermissionsTree, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) {
return null;
}
}

2
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -861,7 +861,7 @@ export default {
},
disableExec(task) {
return (
task.status === 'Pending' || task.status ==='Exec' || !hasDataPermission('manage', task.privileges)
(task.status === 'Stopped' && task.rate !== 'SIMPLE') || task.status === 'Pending' || task.status ==='Exec' || !hasDataPermission('manage', task.privileges)
)
},
disableDelete(task) {

2
frontend/src/views/system/task/DatasetTaskList.vue
View File

@ -634,7 +634,7 @@ export default {
)
},
disableExec(task) {
return (task.status === 'Pending' || task.status ==='Exec' || !hasDataPermission('manage', task.privileges))
return ((task.status === 'Stopped' && task.rate !== 'SIMPLE') || task.status === 'Pending' || task.status ==='Exec' || !hasDataPermission('manage', task.privileges))
},
disableDelete(task) {
return false