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
This commit is contained in:
zhangyu
2021-11-01 09:57:54 +08:00
parent 709f60062a d52f671261
commit 0b99acc067
7 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
nezha-fronted/src/assets/css/common/rightBoxCommon.scss
View File

@@ -93,20 +93,6 @@
}
}
}
.form-row-item {
.input-box {
.el-textarea {
.el-textarea__inner {
width: 466px;
height: 32px;
padding: 5px 70px 4px 10px;
}
.el-input__count {
right: 0;
}
}
}
}
.el-form-item {
.el-input__count {
line-height: 29px;
@@ -115,10 +101,8 @@
}
.el-form-item {
.el-input--small.not-fixed-height {
height: 32px;
.el-input__count {
line-height: 29px;
height: 25px;
.el-textarea__inner {
min-height: 32px !important;
}
}
}

21
nezha-fronted/src/components/common/alert/alertLabel.vue
View File

@@ -94,7 +94,7 @@
</div>
<div class="alert-label-box">
<div class="alert-label-title">{{$t('overall.remark')}}</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}</div>
<div class="alert-label-value alert-label-remark">{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}</div>
</div>
</div>
@@ -135,7 +135,7 @@
</div>
<div class="alert-label-box">
<div class="alert-label-title">{{$t('overall.remark')}}</div>
<div class="alert-label-value">{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}</div>
<div class="alert-label-value alert-label-remark">{{alertLabelData && alertLabelData.remark ? alertLabelData.remark : '--'}}</div>
</div>
</div>
@@ -441,7 +441,7 @@ export default {
position: fixed;
background-color: white;
z-index: 3000;
padding: 10px;
padding: 10px 23px 10px 10px;
border-radius: 4px;
box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77);
}
@@ -503,26 +503,25 @@ export default {
/*border-bottom: 1px solid #ebeef5;*/
}
.alert-label-title{
font-family: Roboto-Regular;
font-size: 14px;
color: #666666;
letter-spacing: 0;
line-height: 23px;
font-weight: 400;
min-width: 100px;
min-width: 110px;
padding: 0 3px 0 13px;
min-width: 100px;
}
.alert-label-value{
height: 26px;
ont-family: Roboto-Regular;
font-size: 14px;
color: #333333;
letter-spacing: 0;
line-height: 23px;
font-weight: 400;
padding: 0 3px 0 13px;
word-break: break-all;
}
.alert-label-remark {
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
max-width: 210px;
}
.danger{
background-color: #d64f40;

4
nezha-fronted/src/components/common/alert/alertRuleInfo.vue
View File

@@ -161,7 +161,7 @@ export default {
position: fixed;
background-color: white;
z-index: 3000;
padding: 10px;
padding: 10px 23px 10px 10px;
border-radius: 4px;
box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77);
}
@@ -230,7 +230,7 @@ export default {
}
.alert-rule-title{
text-align: left;
width: 110px;
min-width: 110px;
color: #666;
padding: 0 3px 0 13px;
}

1
nezha-fronted/src/components/common/language/cn.js
View File

@@ -284,6 +284,7 @@ const cn = {
chartName: '图表名称',
type: '类型',
url: 'URL',
name: '名称',
statistics: '统计数据',
sync: '同步到设备',
last: '最后的',

1
nezha-fronted/src/components/common/language/en.js
View File

@@ -295,6 +295,7 @@ const en = {
type: 'Type',
unit: 'Unit',
url: 'URL',
name: 'Name',
legend: 'Legend',
statistics: 'Statistics',
legendTip: 'Controls the name of the time series, using name or pattern. For example {{hostname}} will be replaced with label value for the label hostname.',

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

@@ -185,7 +185,7 @@
<div class="right-box__container">
<div class="container__form">
<el-form ref="chartForm" :model="editChart" :rules="rules" label-position= "top" label-width="120px">
<el-form-item :label='$t("dashboard.panel.chartForm.chartName")' prop="title">
<el-form-item :label='$t("dashboard.panel.chartForm.name")' prop="title">
<el-input maxlength="64" show-word-limit size="small" v-model="editChart.name" id="chart-box-title"></el-input>
</el-form-item>
<el-form-item v-if="showPanel.type !== fromRoute.project && showPanel.type !== fromRoute.asset && showPanel.type !== fromRoute.endpoint && showPanel.type !== fromRoute.model && from!=='chartTemp'" :label="$t('dashboard.panel.title')" prop="panelName">

9
nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
View File

@@ -38,7 +38,7 @@
<div v-if="errorMsg" class="append-msg error"><span>{{errorMsg}}</span></div>
<div v-if="appendMsg" class="append-msg error"><span>{{appendMsg}}</span></div>
</div>
<div class="top-tool-btn-group">
<div class="top-tool-btn-group" style="margin-left: 10px">
<button v-if="plugins.indexOf('add') > -1" class="top-tool-btn"
@click="addExpression"><i class="nz-icon nz-icon-plus"></i></button>
<button v-if="plugins.indexOf('copy') > -1" class="top-tool-btn"
@@ -706,7 +706,6 @@ export default {
.query-row .input-box {
flex: auto;
margin-right: 10px;
}
.metric-btn {
@@ -842,7 +841,7 @@ export default {
.nz-temp-box .nz-btn-style-normal-new{
margin-left: 10px;
}
.right-box__container .form-row-item .input-box .el-textarea.no-resize .el-textarea__inner {
width: 476px;
}
/*.right-box__container .form-row-item .input-box .el-textarea.no-resize .el-textarea__inner {*/
/* width: 476px;*/
/*}*/
</style>