center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

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

Browse Source 
fix(血缘关-数据源列表): 数据源列表按照类型和名称升序排序
This commit is contained in:
wisonic-s 2023-01-12 10:58:23 +08:00 committed by GitHub
commit 91d6284b7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml
View File

@ -124,7 +124,7 @@
and configuration = #{configuration,jdbcType=LONGVARCHAR} and configuration = #{configuration,jdbcType=LONGVARCHAR}
</if> </if>
</where> </where>
<if test="sort == null"> <if test="sort != null">
order by ${sort} order by ${sort}
</if> </if>
</select> </select>

6
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -158,11 +158,9 @@ public class DatasourceService {
} }
public List<DatasourceDTO> getDatasourceList(DatasourceUnionRequest request) throws Exception { public List<DatasourceDTO> getDatasourceList(DatasourceUnionRequest request) throws Exception {
request.setSort("update_time desc"); request.setSort("type,name");
List<DatasourceDTO> datasourceDTOS = extDataSourceMapper.queryUnion(request); List<DatasourceDTO> datasourceDTOS = extDataSourceMapper.queryUnion(request);
datasourceDTOS.forEach(datasourceDTO -> { datasourceDTOS.forEach(this::datasourceTrans);
datasourceTrans(datasourceDTO);
});
return datasourceDTOS; return datasourceDTOS;
} }

5
frontend/src/views/system/relationship/index.vue
View File

@ -39,6 +39,7 @@
placement="bottom" placement="bottom"
trigger="manual" trigger="manual"
:width="popoverSize" :width="popoverSize"
popper-class="relation-popover"
> >
<el-tree <el-tree
v-show="showTree" v-show="showTree"
@ -630,4 +631,8 @@ export default {
/*display: inline;*/ /*display: inline;*/
visibility: visible; visibility: visible;
} }
.relation-popover {
max-height: 100%;
overflow-y: scroll;
}
</style> </style>