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

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

Browse Source
This commit is contained in:
zhangyu
2023-03-24 14:09:25 +08:00
parent c24c6a892b cdaa47e84c
commit fc43c5bdb7
6 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/assets/css/components/common/rightBox/ipam.scss
View File

@@ -38,3 +38,6 @@
.ip-detail-available { .ip-detail-available {
color:$--color-success !important; color:$--color-success !important;
} }
.right-box-select-top.right-box-select-width {
width: 640px !important;
}

8
nezha-fronted/src/assets/css/components/page/tool/trace.scss
View File

@@ -164,6 +164,14 @@
} }
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
&>span{
display: block;
font-size: 14px;
color: $--color-text-regular;
letter-spacing: 0;
font-weight: 400;
margin: 30px 0 11px 0;
}
.data-top{ .data-top{
width: 100%; width: 100%;
padding-left: 15px; padding-left: 15px;

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

@@ -33,7 +33,7 @@
class="element-item form-row-item thresholds-from-item" class="element-item form-row-item thresholds-from-item"
style="margin-bottom: 10px !important" style="margin-bottom: 10px !important"
v-for="index of chartConfig.elements.length" v-for="index of chartConfig.elements.length"
:key="index" :key="expressionName[index-1] + index"
> >
<div class="chart-title chart-title-config"> <div class="chart-title chart-title-config">
<span class="chart-title-content el-form-item" :class="{ <span class="chart-title-content el-form-item" :class="{

32
nezha-fronted/src/components/common/rightBox/chart/publicConfig.js
View File

@@ -434,15 +434,17 @@ export default {
if (this.expressions.length) { if (this.expressions.length) {
this.chartConfig.elements = [] this.chartConfig.elements = []
this.expressions.forEach((expr, i) => { this.expressions.forEach((expr, i) => {
this.chartConfig.elements.push({ if (this.expressionsShow[i]) {
id: this.expressionsShow[i].elementId, this.chartConfig.elements.push({
expression: expr, id: this.expressionsShow[i].elementId,
type: 'expert', expression: expr,
legend: this.expressionsShow[i].legend, type: 'expert',
name: this.expressionName[i], legend: this.expressionsShow[i].legend,
state: this.expressionsShow[i].state, name: this.expressionName[i],
orderNum: i state: this.expressionsShow[i].state,
}) orderNum: i
})
}
}) })
} else { } else {
this.chartConfig.elements = [] this.chartConfig.elements = []
@@ -551,12 +553,6 @@ export default {
elementId: '' elementId: ''
} }
) )
this.$nextTick(() => {
this.expressions.forEach((ex, index) => {
this.$refs[`promql-${index}`][0].metricChange(ex)
this.$refs[`promql-${index}`][0].promqlInputChange(ex)
})
})
this.expressionChange() this.expressionChange()
}, },
removeExpression (index) { removeExpression (index) {
@@ -573,12 +569,6 @@ export default {
this.chartConfig.elements.forEach((item, index) => { this.chartConfig.elements.forEach((item, index) => {
this.$refs.chartForm.validateField('elements.' + index + '.expression') this.$refs.chartForm.validateField('elements.' + index + '.expression')
}) })
this.$nextTick(() => {
this.expressions.forEach((ex, index) => {
this.$refs[`promql-${index}`][0].metricChange(ex)
this.$refs[`promql-${index}`][0].promqlInputChange(ex)
})
})
this.expressionChange() this.expressionChange()
} }
}, },

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

@@ -25,7 +25,7 @@
<el-select <el-select
v-model="editipDetails.state" v-model="editipDetails.state"
class="right-box__select" class="right-box__select"
popper-class="right-box-select-top prevent-clickoutside" popper-class="right-box-select-top prevent-clickoutside right-box-select-width"
size="small" size="small"
:placeholder="$t('el.select.placeholder')" :placeholder="$t('el.select.placeholder')"
value-key="id"> value-key="id">

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

@@ -50,7 +50,7 @@
</div> </div>
<el-form-item :label="$t('overall.dc')" prop="dc.name"> <el-form-item :label="$t('overall.dc')" prop="dc.name">
<div class="right-box-form-content"> <div class="right-box-form-content">
<el-select id="prom-box-input-dc" v-model="editipam.dc" placeholder="" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside" size="small" value-key="id"> <el-select id="prom-box-input-dc" v-model="editipam.dc" placeholder="" class="right-box__select" popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside right-box-select-width" size="small" value-key="id">
<el-option v-for="item in dcData" :id="'prom-edit-dc-op-'+item.id" :key="item.id" :label="item.name" :value="item"> <el-option v-for="item in dcData" :id="'prom-edit-dc-op-'+item.id" :key="item.id" :label="item.name" :value="item">
<span class="config-dropdown-label-txt">{{item.name}}</span> <span class="config-dropdown-label-txt">{{item.name}}</span>
</el-option> </el-option>