gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-3.1' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.1

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/page/dashboard/chartBox.vue
This commit is contained in:
zhangyu
2021-10-28 16:59:05 +08:00
parent 90346ba198 9acb8c0b5d
commit af5bfc6d47
14 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/components/page/dashboard/chartBox.vue
View File

@@ -406,7 +406,7 @@
<el-row style="margin-top: 18px">
<el-col class="legend-title">
{{$t('dashboard.panel.chartForm.legend')}}&nbsp;
<el-popover placement="top" trigger="click" width="211">
<el-popover placement="top" trigger="hover" width="211">
<div :style="{'word-break':language!=='cn'?'keep-all':'break-all'}">{{$t('dashboard.panel.chartForm.legendTip')}}</div>
<i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</el-popover>
@@ -429,7 +429,7 @@
<div v-if="editChart.type == 'singleStat'||editChart.type == 'table'" class="form__sub-title">
<span>
{{$t('dashboard.panel.chartForm.valMapping.name')}}
<el-popover placement="top" trigger="click" width="275">
<el-popover placement="top" trigger="hover" width="275">
<div style="white-space: pre-wrap;">{{$t('dashboard.panel.chartForm.valueMappingTip')}}</div>
<i @mouseover="rz" class="nz-icon nz-icon-info-normal" slot="reference" style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</el-popover>