public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-19 10:18:11 +08:00
Code Issues Packages Projects Releases Wiki 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
parent a378126e13 ab923a29c2
commit 2ea1bbe6f6
5 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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