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

feat: 字段编辑优化界面显示

Browse Source
This commit is contained in:
junjie 2021-08-18 14:01:56 +08:00
parent 4e37a64e19
commit 3b5bb9b17b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java
View File

@ -33,6 +33,7 @@ public class DatasetFunctionService {
if (StringUtils.isNotEmpty(datasetTableFunction.getDbType())) { if (StringUtils.isNotEmpty(datasetTableFunction.getDbType())) {
criteria.andDbTypeEqualTo(datasetTableFunction.getDbType()); criteria.andDbTypeEqualTo(datasetTableFunction.getDbType());
} }
datasetTableFunctionExample.setOrderByClause("name asc");
return datasetTableFunctionMapper.selectByExampleWithBLOBs(datasetTableFunctionExample); return datasetTableFunctionMapper.selectByExampleWithBLOBs(datasetTableFunctionExample);
} }

12
frontend/src/views/dataset/data/CalcFieldEdit.vue
View File

@ -151,7 +151,7 @@
<p class="pop-title">{{ item.name }}</p> <p class="pop-title">{{ item.name }}</p>
<p class="pop-info">{{ item.func }}</p> <p class="pop-info">{{ item.func }}</p>
<p class="pop-info">{{ item.desc }}</p> <p class="pop-info">{{ item.desc }}</p>
<span slot="reference" class="function-style" :title="item.func" @click="insertParamToCodeMirror(item.func)">{{ item.func }}</span> <span slot="reference" class="function-style" @click="insertParamToCodeMirror(item.func)">{{ item.func }}</span>
</el-popover> </el-popover>
</el-row> </el-row>
</el-col> </el-col>
@ -468,9 +468,13 @@ export default {
padding: 2px 4px; padding: 2px 4px;
cursor: pointer; cursor: pointer;
margin: 4px 0; margin: 4px 0;
overflow-x: hidden; word-break: break-word;
white-space: nowrap; border: solid 1px #eee;
text-overflow: ellipsis; }
.function-style:hover {
background: #e8f4ff;
border-color: #a3d3ff;
cursor: pointer;
} }
.function-height{ .function-height{
height: calc(100% - 50px); height: calc(100% - 50px);