diff --git a/backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java b/backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java index 0ce78d354e..ff6337037f 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java @@ -33,6 +33,7 @@ public class DatasetFunctionService { if (StringUtils.isNotEmpty(datasetTableFunction.getDbType())) { criteria.andDbTypeEqualTo(datasetTableFunction.getDbType()); } + datasetTableFunctionExample.setOrderByClause("name asc"); return datasetTableFunctionMapper.selectByExampleWithBLOBs(datasetTableFunctionExample); } diff --git a/frontend/src/views/dataset/data/CalcFieldEdit.vue b/frontend/src/views/dataset/data/CalcFieldEdit.vue index 003ede5ea2..99b2eb0427 100644 --- a/frontend/src/views/dataset/data/CalcFieldEdit.vue +++ b/frontend/src/views/dataset/data/CalcFieldEdit.vue @@ -151,7 +151,7 @@

{{ item.name }}

{{ item.func }}

{{ item.desc }}

- {{ item.func }} + {{ item.func }} @@ -468,9 +468,13 @@ export default { padding: 2px 4px; cursor: pointer; margin: 4px 0; - overflow-x: hidden; - white-space: nowrap; - text-overflow: ellipsis; + word-break: break-word; + border: solid 1px #eee; + } + .function-style:hover { + background: #e8f4ff; + border-color: #a3d3ff; + cursor: pointer; } .function-height{ height: calc(100% - 50px);