From 2abcc4502791fc1ba0937103cbe49d3256059865 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 12 Jan 2023 10:55:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E8=A1=80=E6=BA=90=E5=85=B3=E7=B3=BB):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=90=8D=E7=A7=B0=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A0=91=E5=BD=A2=E7=BB=84=E4=BB=B6=E5=8F=AF=E9=80=89=E9=A1=B9?=
 =?UTF-8?q?=E8=BF=87=E5=A4=9A=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/relationship/index.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/views/system/relationship/index.vue b/frontend/src/views/system/relationship/index.vue
index 2394ecf622..18e3431270 100644
--- a/frontend/src/views/system/relationship/index.vue
+++ b/frontend/src/views/system/relationship/index.vue
@@ -39,6 +39,7 @@
             placement="bottom"
             trigger="manual"
             :width="popoverSize"
+            popper-class="relation-popover"
           >
             <el-tree
               v-show="showTree"
@@ -618,4 +619,8 @@ export default {
   /*display: inline;*/
   visibility: visible;
 }
+.relation-popover {
+  max-height: 100%;
+  overflow-y: scroll;
+}
 </style>

From 1df6e4b3e259cfaf15bb1296a9406ef99c735094 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 12 Jan 2023 10:56:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E8=A1=80=E7=BC=98=E5=85=B3-=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=88=97=E8=A1=A8):=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=BA=90=E5=88=97=E8=A1=A8=E6=8C=89=E7=85=A7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=92=8C=E5=90=8D=E7=A7=B0=E5=8D=87=E5=BA=8F=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/ext/ExtDataSourceMapper.xml   | 2 +-
 .../io/dataease/service/datasource/DatasourceService.java   | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
index 2e572d0578..f78b38b852 100644
--- a/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
@@ -124,7 +124,7 @@
                 and configuration = #{configuration,jdbcType=LONGVARCHAR}
             </if>
         </where>
-        <if test="sort == null">
+        <if test="sort != null">
             order by ${sort}
         </if>
     </select>
diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index b867ebed3c..c575345cf7 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -158,11 +158,9 @@ public class DatasourceService {
     }
 
     public List<DatasourceDTO> getDatasourceList(DatasourceUnionRequest request) throws Exception {
-        request.setSort("update_time desc");
+        request.setSort("type,name");
         List<DatasourceDTO> datasourceDTOS = extDataSourceMapper.queryUnion(request);
-        datasourceDTOS.forEach(datasourceDTO -> {
-            datasourceTrans(datasourceDTO);
-        });
+        datasourceDTOS.forEach(this::datasourceTrans);
         return datasourceDTOS;
     }