From a39b32a6fe961d0de17317b44948a4e584b477e5 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sat, 11 May 2024 18:30:01 +0800
Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E4=BC=98=E5=8C=96=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/drawer-filter/src/DrawerEnumFilter.vue   | 3 ++-
 .../src/components/drawer-filter/src/DrawerFilter.vue       | 1 +
 .../src/components/drawer-filter/src/DrawerTimeFilter.vue   | 3 ++-
 .../src/components/drawer-filter/src/DrawerTreeFilter.vue   | 1 +
 de-xpack                                                    | 2 +-
 .../src/main/java/io/dataease/api/report/ReportApi.java     | 6 +++++-
 .../dataease/api/report/dto/ReportInstanceDelRequest.java   | 2 ++
 .../io/dataease/api/report/dto/ReportInstanceRequest.java   | 2 ++
 .../java/io/dataease/api/report/vo/ReportInstanceVO.java    | 3 +++
 .../java/io/dataease/api/permissions/user/api/UserApi.java  | 4 ++++
 10 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue
index ce21719bde..faed0b30cb 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerEnumFilter.vue
+++ b/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,
diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
index 07d807af03..dffd945720 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
+++ b/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) {
diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue
index 1cfbd21d06..93e5ca707e 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue
+++ b/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 {
diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
index 74eb572e37..6b0e336dd7 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerTreeFilter.vue
+++ b/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) {
diff --git a/de-xpack b/de-xpack
index b61bcfc732..1873d99322 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit b61bcfc7325c5d9a1f30564d27dab3f098ac228c
+Subproject commit 1873d99322c5d78bd08b3b13588c32f92407df3f
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java
index 7f404c01fe..724b1a65d8 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/report/ReportApi.java
+++ b/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);
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceDelRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceDelRequest.java
index 9ce461b76b..08e0800022 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceDelRequest.java
+++ b/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;
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceRequest.java
index 26bc814ad6..df87b3df93 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/report/dto/ReportInstanceRequest.java
+++ b/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;
 }
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInstanceVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInstanceVO.java
index 8f7bb8554a..dd85adaad8 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/report/vo/ReportInstanceVO.java
+++ b/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;
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
index 027a5ae182..46c5c40513 100644
--- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java
+++ b/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();
 }