Merge pull request #4360 from dataease/pr@dev@fix_relationship

fix(血缘关-数据源列表): 数据源列表按照类型和名称升序排序

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>

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;
     }
 

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"
@@ -630,4 +631,8 @@ export default {
   /*display: inline;*/
   visibility: visible;
 }
+.relation-popover {
+  max-height: 100%;
+  overflow-y: scroll;
+}
 </style>