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

Merge pull request #3827 from dataease/pr@dev@dataset

Browse Source 
Merge branch 'dev' of github.com:dataease/dataease into dev
This commit is contained in:
xuwei-fit2cloud 2022-11-23 09:07:59 +08:00 committed by GitHub
commit b4fb395dca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
View File

@ -335,6 +335,9 @@ public class DataSetTableTaskService {
public void execTask(DatasetTableTask datasetTableTask) throws Exception {
execNow(datasetTableTask);
if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
scheduleService.addSchedule(datasetTableTask);
}
if (!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
scheduleService.fireNow(datasetTableTask);
}

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

@ -162,7 +162,7 @@
class="de-card-dropdown"
>
<template
v-if="!['Stopped', 'Exec'].includes(scope.row.status)"
v-if="!['Exec'].includes(scope.row.status)"
>
<el-dropdown-item
:disabled="disableExec(scope.row)"
@ -858,9 +858,7 @@ export default {
},
disableExec(task) {
return (
task.status === 'Stopped' ||
task.status === 'Pending' ||
task.rate === 'SIMPLE' ||
!hasDataPermission('manage', task.privileges)
)
},

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

@ -268,7 +268,7 @@
class="de-card-dropdown"
>
<template
v-if="!['Stopped', 'Exec'].includes(scope.row.status)"
v-if="!['Exec'].includes(scope.row.status)"
>
<el-dropdown-item
:disabled="disableExec(scope.row)"
@ -624,10 +624,7 @@ export default {
)
},
disableExec(task) {
return (
task.status === 'Stopped' ||
task.status === 'Pending' ||
task.rate === 'SIMPLE' ||
return (task.status === 'Pending' ||
!hasDataPermission('manage', task.privileges)
)
},