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

fix(数据集): 数据集时间格式化问题

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

@@ -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;
+    }
 }

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

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

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

@@ -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;
+    }
 }

frontend/src/views/dataset/data/UpdateInfo.vue

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

frontend/src/views/system/task/DatasetTaskList.vue

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