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

Merge branch 'main' of github.com:dataease/dataease into main

Browse Source
This commit is contained in:
taojinlong 2021-05-19 15:46:50 +08:00
commit 1d2e5d846d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -59,7 +59,7 @@ public class ChartViewService {
chartView.setCreateBy(AuthUtils.getUser().getUsername());
chartView.setCreateTime(timestamp);
chartView.setUpdateTime(timestamp);
chartViewMapper.insert(chartView);
chartViewMapper.insertSelective(chartView);
}
return chartView;
}

8
frontend/src/views/chart/view/ChartEdit.vue
View File

@ -89,7 +89,7 @@
</el-form-item>
</el-form>
</div>
<div style="height: 25%;overflow:auto" class="padding-lr">
<div style="height: 25vh;overflow:auto" class="padding-lr">
<span>{{ $t('chart.chart_type') }}</span>
<el-row>
<div class="chart-type">
@ -138,7 +138,7 @@
</span>
</span>
</el-row>
<div style="height: 40%;overflow:hidden;border-top: 1px solid #e6e6e6">
<div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style">
<el-row class="padding-lr">
<span>{{ $t('chart.style_priority') }}</span>
<el-row>
@ -882,6 +882,10 @@ export default {
padding-left: 0;
}
.attr-style{
height: calc(100vh - 56px - 25vh - 40px - 62px - 10px);
}
.attr-selector{
width:100%;
height: 32px;