From 831f5b5cc506d9124e95442b66556af5fd30903d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 26 Apr 2024 16:10:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(X-Pack):=20=E5=AE=9A=E6=97=B6=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A-=E9=9A=90=E8=97=8F=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack                                        |  2 +-
 .../api/permissions/user/api/UserApi.java       |  5 +++++
 .../permissions/user/dto/UserReciRequest.java   | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserReciRequest.java

diff --git a/de-xpack b/de-xpack
index 8b61800322..2cd69cc8e4 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 8b61800322d6a6ca5114bebc3b5cbabc17653d3d
+Subproject commit 2cd69cc8e4e6cf2cec8f247f5544bb38872aa4b3
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 27b379bef3..027a5ae182 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
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
+import java.util.Map;
 
 import static io.dataease.constant.AuthResourceEnum.USER;
 
@@ -176,4 +177,8 @@ public interface UserApi {
     @Operation(summary = "绑定状态")
     @GetMapping("/bindStatus")
     List<Integer> bindStatus();
+
+    @Hidden
+    @GetMapping("/getRecipient")
+    List<Map<String, Object>> getRecipient(@RequestBody UserReciRequest request);
 }
diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserReciRequest.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserReciRequest.java
new file mode 100644
index 0000000000..a65111372a
--- /dev/null
+++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/dto/UserReciRequest.java
@@ -0,0 +1,17 @@
+package io.dataease.api.permissions.user.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class UserReciRequest implements Serializable {
+    @Serial
+    private static final long serialVersionUID = -2165057126540959376L;
+
+    private List<Long> uidList;
+
+    private List<Long> ridList;
+}

From b547bbf579bee19581db94427565cd54c70142db Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 26 Apr 2024 16:18:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=BA=90=E6=A0=91-div?=
 =?UTF-8?q?=E5=B5=8C=E5=85=A5=EF=BC=8C=E8=AE=BE=E7=BD=AEdiv=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E5=92=8C=E9=AB=98=E5=BA=A6=EF=BC=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=B7=A6=E4=BE=A7=E9=83=A8=E5=88=86=E7=9A=84=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E5=8F=98=E4=BA=86=EF=BC=8C=E6=95=B4=E4=BD=93=E5=92=8C?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E9=83=A8=E5=88=86=E6=B2=A1=E5=8F=98=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/visualized/data/dataset/index.vue             | 2 +-
 .../src/views/visualized/data/datasource/index.vue          | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index 10b5d50db2..08d42c6066 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -670,7 +670,7 @@ const getMenuList = (val: boolean) => {
     <div
       class="dataset-content"
       :class="{
-        auto: isIframe
+        auto: isIframe || isDataEaseBi
       }"
     >
       <template v-if="!state.datasetTree.length && mounted">
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 9e32c34fdd..5fae8e9740 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -309,7 +309,9 @@ const tabList = shallowRef([])
 
 const initSearch = () => {
   handleCurrentChange(1)
-  state.filterTable = tableData.value.filter(ele => ele.tableName.includes(nickName.value))
+  state.filterTable = tableData.value.filter(ele =>
+    ele.tableName.toLowerCase().includes(nickName.value.toLowerCase())
+  )
   state.paginationConfig.total = state.filterTable.length
 }
 
@@ -872,7 +874,7 @@ const getMenuList = (val: boolean) => {
     <div
       class="datasource-content"
       :class="{
-        auto: isIframe,
+        auto: isIframe || isDataEaseBi,
         h100: isDataEaseBi || isIframe
       }"
     >