perf(X-Pack): 优化定时报告

core/core-frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue

@@ -53,6 +53,7 @@ defineExpose({
 <style lang="less" scope>
 .filter {
   display: flex;
+  align-items: center;
   min-height: 46px;
 
   > :nth-child(1) {
@@ -84,7 +85,7 @@ defineExpose({
       border-radius: 2px;
       cursor: pointer;
       display: inline-block;
-      margin-bottom: 12px;
+      // margin-bottom: 12px;
     }
 
     .active,

core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue

@@ -70,6 +70,7 @@ defineExpose({
 <style lang="less" scope>
 .filter {
   display: flex;
+  align-items: center;
   min-height: 46px;
 
   > :nth-child(1) {

core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue

@@ -84,6 +84,7 @@ defineExpose({
 <style lang="less" scope>
 .filter {
   display: flex;
+  align-items: center;
   min-height: 32px;
 
   > :nth-child(1) {
@@ -94,7 +95,7 @@ defineExpose({
     line-height: 24px;
     white-space: nowrap;
     width: 116px;
-    margin-top: 5px;
+    // margin-top: 5px;
   }
 
   .filter-item {

core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue

@@ -99,6 +99,7 @@ defineExpose({
 <style lang="less" scope>
 .filter {
   display: flex;
+  align-items: center;
   min-height: 46px;
 
   > :nth-child(1) {

de-xpack

@@ -1 +1 @@
-Subproject commit b61bcfc7325c5d9a1f30564d27dab3f098ac228c
+Subproject commit 1873d99322c5d78bd08b3b13588c32f92407df3f

sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java

@@ -46,6 +46,10 @@ public interface ReportApi {
     @PostMapping("/stop/{taskId}")
     void stopNow(@PathVariable("taskId") Long taskId);
 
+    @Operation(summary = "启用")
+    @PostMapping("/start/{taskId}")
+    void start(@PathVariable("taskId") Long taskId);
+
     @Operation(summary = "删除")
     @PostMapping("/delete")
     void delete(@RequestBody List<Long> taskIdList);
@@ -68,6 +72,6 @@ public interface ReportApi {
     @PostMapping("/deleteLog")
     void deleteInstance(@RequestBody ReportInstanceDelRequest request);
 
-    @GetMapping("/logMsg")
+    @PostMapping("/logMsg")
     String logMsg(@RequestBody ReportInstanceMsgRequest request);
 }

sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceDelRequest.java

@@ -13,4 +13,6 @@ public class ReportInstanceDelRequest implements Serializable {
     private Long instanceId;
 
     private Integer timeFlag;
+
+    private Long taskId;
 }

sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceRequest.java

@@ -18,4 +18,6 @@ public class ReportInstanceRequest implements Serializable {
     private List<Long> timeList;
 
     private String keyword;
+
+    private Boolean timeDesc;
 }

sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInstanceVO.java

@@ -1,5 +1,7 @@
 package io.dataease.api.report.vo;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
 
 import java.io.Serial;
@@ -10,6 +12,7 @@ public class ReportInstanceVO implements Serializable {
     @Serial
     private static final long serialVersionUID = -7845204306008848053L;
 
+    @JsonSerialize(using= ToStringSerializer.class)
     private Long id;
 
     private String name;

sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java

@@ -181,4 +181,8 @@ public interface UserApi {
     @Hidden
     @GetMapping("/getRecipient")
     List<Map<String, Object>> getRecipient(@RequestBody UserReciRequest request);
+
+    @Hidden
+    @GetMapping("/orgAdmin")
+    boolean orgAdmin();
 }