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

NEZ-670 fix: 修改prominput错位问题

Browse Source
This commit is contained in:
chenjinsong
2021-05-26 16:56:45 +08:00
parent a0da6a2cd5
commit ef3dd84bf7
4 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/rightBox/alertRuleBox.vue
View File

@@ -18,6 +18,7 @@
<el-input id="alert-box-input-name" v-model="editAlertRule.name" maxlength="64" placeholder="" show-word-limit size="small"></el-input> <el-input id="alert-box-input-name" v-model="editAlertRule.name" maxlength="64" placeholder="" show-word-limit size="small"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label='$t("alert.config.expr")' prop="expr" > <el-form-item :label='$t("alert.config.expr")' prop="expr" >
<el-row style="height: 32px; line-height: 32px;">
<promql-input <promql-input
id="alert-box-input-promql" id="alert-box-input-promql"
ref="promql" ref="promql"
@@ -28,6 +29,7 @@
:styleType="2" :styleType="2"
@change="metricChange" @change="metricChange"
></promql-input> ></promql-input>
</el-row>
</el-form-item> </el-form-item>
<!--threshold--> <!--threshold-->
<el-form-item :label="$t('alert.config.threshold')" prop="threshold" style="display: inline-block;"> <el-form-item :label="$t('alert.config.threshold')" prop="threshold" style="display: inline-block;">

3
nezha-fronted/src/components/common/rightBox/exprTmplBox.vue
View File

@@ -28,7 +28,7 @@
></el-autocomplete> ></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.exprTemp.expression')" prop="expression"> <el-form-item :label="$t('config.exprTemp.expression')" prop="expression">
<!--<el-input v-model="editExprTemp.expression" size="small" :placeholder="$t('overall.placeHolder')"></el-input>--> <el-row style="height: 32px; line-height: 32px;">
<promql-input <promql-input
:id="'promqlKeys0'" :id="'promqlKeys0'"
:key="'promqlKeys0'" :key="'promqlKeys0'"
@@ -40,6 +40,7 @@
:styleType="2" :styleType="2"
@change="expressionChange" @change="expressionChange"
></promql-input> ></promql-input>
</el-row>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.exprTemp.remark')" prop="remark"> <el-form-item :label="$t('config.exprTemp.remark')" prop="remark">
<el-input <el-input

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

@@ -61,7 +61,6 @@
margin-right: 10px; margin-right: 10px;
text-align: left; text-align: left;
padding-left:10px; padding-left:10px;
margin-left: 10px;
height: 32px; height: 32px;
border-radius: $--primary-border-radius; border-radius: $--primary-border-radius;
line-height: 32px; line-height: 32px;

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

@@ -629,7 +629,6 @@ export default {
/*'text-align':'left', 'color': '#666',*/ /*'text-align':'left', 'color': '#666',*/
/*'font-weight':plugins.indexOf('metric-selector') > -1 ?'400':'bold',*/ /*'font-weight':plugins.indexOf('metric-selector') > -1 ?'400':'bold',*/
width:100px; width:100px;
margin-left: 10px;
margin-right: 10px; margin-right: 10px;
height: 32px; height: 32px;
text-align: left; text-align: left;