From 3169c7997182cb1994bec258aa9e05a88c656932 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 23 Jan 2024 17:43:41 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=8F=8A=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawer-filter/src/DrawerFilter.vue        |  2 +-
 .../src/components/filter-text/index.ts       |  9 ++++++++
 de-xpack                                      |  2 +-
 .../dataease/api/log/dto/LogGridRequest.java  |  8 ++++---
 .../api/permissions/user/api/UserApi.java     |  4 ++++
 .../java/io/dataease/utils/DateUtils.java     | 22 +++++++++++++++++++
 6 files changed, 42 insertions(+), 5 deletions(-)
 create mode 100644 sdk/common/src/main/java/io/dataease/utils/DateUtils.java

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 7fff929a74..06de4f472f 100644
--- a/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
+++ b/core/core-frontend/src/components/drawer-filter/src/DrawerFilter.vue
@@ -21,7 +21,7 @@ const emits = defineEmits(['filter-change'])
 const selectStatus = ids => {
   emits(
     'filter-change',
-    ids.map(item => item.label)
+    ids.map(item => item.id || item.value)
   )
 }
 
diff --git a/core/core-frontend/src/components/filter-text/index.ts b/core/core-frontend/src/components/filter-text/index.ts
index 02122436cb..bcc75da1f9 100644
--- a/core/core-frontend/src/components/filter-text/index.ts
+++ b/core/core-frontend/src/components/filter-text/index.ts
@@ -25,6 +25,12 @@ const valueTextFormTree = (val, options) => {
   }
   return result || val
 }
+const timestampFormatDate = value => {
+  if (!value) {
+    return '-'
+  }
+  return new Date(value)['format']()
+}
 const valueText = (field, val, options) => {
   for (let index = 0; index < options.length; index++) {
     const element = options[index]
@@ -41,6 +47,9 @@ const valueText = (field, val, options) => {
           return item.name || item.label
         }
       }
+      if (element.type === 'time') {
+        return timestampFormatDate(val)
+      }
       if (isTree) {
         return valueTextFormTree(val, selectOption)
       }
diff --git a/de-xpack b/de-xpack
index a30164b304..217f54b5a7 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit a30164b304688249585d2d9af53502a3a67211d2
+Subproject commit 217f54b5a74178cb1de0b9daed983ea78bf48578
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java b/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java
index 9035722cb5..6c62ec7d50 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/log/dto/LogGridRequest.java
@@ -11,11 +11,13 @@ import java.util.List;
 @Data
 public class LogGridRequest extends KeywordRequest implements Serializable {
 
-    private String op;
+    private List<String> op;
 
-    private Long uid;
+    private List<Long> uid;
 
-    private Long oid;
+    private List<Long> oid;
 
     private List<Long> time;
+
+    private Boolean timeDesc = true;
 }
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 f20610d75d..41b0dde891 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
@@ -156,4 +156,8 @@ public interface UserApi {
     @Hidden
     @GetMapping("/queryByAccount")
     CurUserVO queryByAccount(String account);
+
+    @Hidden
+    @PostMapping("/all")
+    List<UserItem> allUser(@RequestBody KeywordRequest request);
 }
diff --git a/sdk/common/src/main/java/io/dataease/utils/DateUtils.java b/sdk/common/src/main/java/io/dataease/utils/DateUtils.java
new file mode 100644
index 0000000000..34da49d7d1
--- /dev/null
+++ b/sdk/common/src/main/java/io/dataease/utils/DateUtils.java
@@ -0,0 +1,22 @@
+package io.dataease.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+
+public class DateUtils {
+
+    public static String time2String(Long time, String pattern) {
+        if (StringUtils.isBlank(pattern)) pattern = "yyyy-MM-dd HH:mm:ss";
+        DateTimeFormatter format = DateTimeFormatter.ofPattern(pattern);
+        LocalDateTime timeByMilli = Instant.ofEpochMilli(time).atZone(ZoneId.of("Asia/Shanghai")).toLocalDateTime();
+        return format.format(timeByMilli);
+    }
+    public static String time2String(Long time) {
+        String pattern = "yyyy-MM-dd HH:mm:ss";
+        return time2String(time, pattern);
+    }
+}