From 4fbf4626cbb00b27b0b0fd1857b03a8f52da7c73 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 22 Nov 2022 16:04:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=8D=95=E6=AC=A1=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E7=9A=84=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=A7=A6=E5=8F=91=E6=89=A7=E8=A1=8C=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E7=9A=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/service/dataset/DataSetTableTaskService.java  | 4 ++++
 frontend/src/views/dataset/data/UpdateInfo.vue             | 4 +---
 frontend/src/views/system/task/DatasetTaskList.vue         | 7 ++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
index a0b34fe714..57cdbe57a7 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
@@ -335,6 +335,10 @@ public class DataSetTableTaskService {
 
     public void execTask(DatasetTableTask datasetTableTask) throws Exception {
         execNow(datasetTableTask);
+        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
+            //TODO add
+            scheduleService.addSchedule(datasetTableTask);
+        }
         if (!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
             scheduleService.fireNow(datasetTableTask);
         }
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index 981051a2e1..a44ebedf1f 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -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)
       )
     },
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index c25bf252e2..10997d1346 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -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)
       )
     },

From 0764e477bfd0ca4aeb105ad747df253a29fb7d6c Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 22 Nov 2022 18:56:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/dataset/DataSetTableTaskService.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
index 57cdbe57a7..9ea3d35167 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
@@ -336,7 +336,6 @@ public class DataSetTableTaskService {
     public void execTask(DatasetTableTask datasetTableTask) throws Exception {
         execNow(datasetTableTask);
         if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
-            //TODO add
             scheduleService.addSchedule(datasetTableTask);
         }
         if (!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {