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

NEZ-770 feat：chart类型添加

Browse Source
This commit is contained in:
zhangyu
2021-07-01 15:56:24 +08:00
parent 7ccba4402d
commit f2277d7014
7 changed files with 216 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/charts/line-chart-block.vue
View File

@@ -7,7 +7,7 @@
<div class="resize-box resize-box-echarts" ref="resizeBox"> <div class="resize-box resize-box-echarts" ref="resizeBox">
<div class="line-chart-block" :id="'lineChartDiv'+chartIndex" @mouseenter="mouseEnterChart" @mouseleave="mouseLeaveChart"> <div class="line-chart-block" :id="'lineChartDiv'+chartIndex" @mouseenter="mouseEnterChart" @mouseleave="mouseLeaveChart">
<loading :ref="'localLoading'+chartIndex"></loading> <loading :ref="'localLoading'+chartIndex"></loading>
<div v-show="from!=='project'" :class="{'drag-disabled': this.filter.from == $CONSTANTS.fromRoute.alertRule}" :id="'chartTitle'+chartIndex" class="clearfix chartTitle"> <div v-if="from!=='project'" :class="{'drag-disabled': this.filter.from == $CONSTANTS.fromRoute.alertRule}" :id="'chartTitle'+chartIndex" class="clearfix chartTitle">
<el-popover <el-popover
v-if="isError" v-if="isError"
placement="top-start" placement="top-start"

27
nezha-fronted/src/components/common/ChartDiagram/diagram.vue
View File

@@ -248,6 +248,8 @@
:title="title" :title="title"
:visible.sync="uploadPicShow" :visible.sync="uploadPicShow"
width="auto" width="auto"
class="no-style-class"
:append-to-body="true"
@close="uploadPicShow = false" @close="uploadPicShow = false"
destroy-on-close> destroy-on-close>
<el-row class="upload-pic-row"> <el-row class="upload-pic-row">
@@ -587,16 +589,19 @@ export default {
const step = bus.getStep(startTime, endTime) const step = bus.getStep(startTime, endTime)
data.pens && data.pens.forEach((item, index) => { data.pens && data.pens.forEach((item, index) => {
this.chartGetData.push({ id: item.id, res: [] }) this.chartGetData.push({ id: item.id, res: [] })
const arr = item.data.expressArr.map((ele) => { let arr = []
let query = ele if (item.data.valueMappingShow) {
if (!query) { arr = item.data.expressArr.map((ele) => {
return new Promise(resolve => { let query = ele
resolve({ data: '', status: 'no query' }) if (!query) {
}) return new Promise(resolve => {
} resolve({ data: '', status: 'no query' })
query += '&nullType=' + 'connected' })
return this.$get('/prom/api/v1/query_range?query=' + query + '&start=' + this.$stringTimeParseToUnix(startTime) + '&end=' + this.$stringTimeParseToUnix(endTime) + '&step=' + '10m') }
}) query += '&nullType=' + 'connected'
return this.$get('/prom/api/v1/query_range?query=' + query + '&start=' + this.$stringTimeParseToUnix(startTime) + '&end=' + this.$stringTimeParseToUnix(endTime) + '&step=' + step)
})
}
axiosArr.push({ item, arr }) axiosArr.push({ item, arr })
promiseArr.push(pensPromise(item, arr, index)) promiseArr.push(pensPromise(item, arr, index))
}) })
@@ -1068,6 +1073,7 @@ export default {
expressArr: [''], expressArr: [''],
legends: [''], legends: [''],
tooltipShow: true, tooltipShow: true,
valueMappingShow: true,
panelName: 'topologyName', panelName: 'topologyName',
unit: 2, unit: 2,
type: 'line', type: 'line',
@@ -1104,6 +1110,7 @@ export default {
expressArr: [''], expressArr: [''],
legends: [''], legends: [''],
tooltipShow: true, tooltipShow: true,
valueMappingShow: true,
panelName: 'topologyName', panelName: 'topologyName',
unit: 2, unit: 2,
type: 'line', type: 'line',

267
nezha-fronted/src/components/common/project/L5/CanvasProps.vue
View File

@@ -25,7 +25,7 @@
<el-form-item v-if="!selection.pen.type&&fromDiagram" :label="$t('project.topology.name')" class="full-form-item" prop="type"> <el-form-item v-if="!selection.pen.type&&fromDiagram" :label="$t('project.topology.name')" class="full-form-item" prop="type">
<el-input v-model="selection.pen.data.title" @change="changeTitle" class="input" size="small"></el-input> <el-input v-model="selection.pen.data.title" @change="changeTitle" class="input" size="small"></el-input>
</el-form-item> </el-form-item>
<!-- &lt;!&ndash;iconToolState&ndash;&gt;--> <!--iconToolState-->
<!-- <el-form-item :label="'Icon state'" class="half-form-item" prop="type" v-if="!selection.pen.type">--> <!-- <el-form-item :label="'Icon state'" class="half-form-item" prop="type" v-if="!selection.pen.type">-->
<!-- <el-switch--> <!-- <el-switch-->
<!-- v-model="selection.pen.data.iconToolState"--> <!-- v-model="selection.pen.data.iconToolState"-->
@@ -35,15 +35,21 @@
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!--value mapping-->
<el-row class="form-row-title">
{{$t('dashboard.panel.chartForm.thresholds')}}
<span v-if="selection.pen.data.valueMappingSort !=='desc'" style="font-size: 12px;color: #666666;letter-spacing: 0;font-weight: 400;margin-left: 10px">（0:Ok > … >{{selection.pen.data.valueMapping.length}}:Critical）</span>
<span v-if="selection.pen.data.valueMappingSort ==='desc'" style="font-size: 12px;color: #666666;letter-spacing: 0;font-weight: 400;margin-left: 10px">（{{selection.pen.data.valueMapping.length}}:Critical > … >0:Ok）</span>
<el-form-item class="float-right" prop="type" style="height: 100%;">
<el-switch
v-model="selection.pen.data.valueMappingShow"
:active-value="true"
:inactive-value="false"
active-color="#ee9d3f"
/>
</el-form-item>
</el-row>
<!--metric--> <!--metric-->
<div class="right-box-sub-title" style="margin-bottom: 10px">
<span>{{$t('alert.config.expr')}}</span>
<!-- <span @click="addExpression" class="float-right" style="height: 19px;display: inline-block;line-height: 1;">-->
<!-- <span class="create-square-box">-->
<!-- <i style="font-size: 17px; cursor: pointer;" class="nz-icon nz-icon-create-square"></i>-->
<!-- </span>-->
<!-- </span>-->
</div>
<el-row :key="index" class="element-item form-row-item" style="" <el-row :key="index" class="element-item form-row-item" style=""
v-for="(item,index) in selection.pen.data.expressArr"> v-for="(item,index) in selection.pen.data.expressArr">
<promql-input <promql-input
@@ -52,108 +58,33 @@
:index="index" :index="index"
:key="index" :key="index"
:plugins="['metric-selector', 'metric-input', 'remove']" :plugins="['metric-selector', 'metric-input', 'remove']"
:ref="'promql-'+index" :ref="'promql-'+'-1'"
:showRemove="false" :showRemove="false"
:styleType="2" :styleType="2"
:metricOptionsParent="metricOptions" :metricOptionsParent="metricOptions"
@change="expressionChange" @change="expressionChange"
:from-father-data="true" :from-father-data="true"
@removeExpression="removeExpression"
></promql-input> ></promql-input>
<el-row style="margin-top: 10px"> <el-row style="margin-top: 10px">
<template> <template>
<!--chart aggregation-->
<el-col class="legend-title"> <el-col class="legend-title">
{{$t('dashboard.panel.chartForm.legend')}}&nbsp; {{$t('dashboard.panel.chartForm.aggregation')}}&nbsp;
<el-popover placement="top" trigger="hover" width="211">
<div style="word-break:keep-all;">{{$t('dashboard.panel.chartForm.legendTip')}}</div>
<i class="nz-icon nz-icon-info-normal" slot="reference" @mouseover="rz"
style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</el-popover>
</el-col> </el-col>
<el-col style="width: calc(100% - 120px);"> <el-col style="width: calc(100% - 120px)">
<el-input size="small" type="text" v-model="selection.pen.data.legends[index]"></el-input> <el-select class="right-box-row-with-btn" :placeholder="$t('el.select.placeholder')" popper-class="chart-box-dropdown-small"
size="mini"
style="width: 100%"
v-model="selection.pen.data.aggregation" value-key="chartType">
<el-option :key="item.id" :label="item.name" :value="item.name" v-for="item in aggregationList">
<span class="panel-dropdown-label-txt">{{item.name}}</span>
</el-option>
</el-select>
</el-col> </el-col>
</template> </template>
</el-row> </el-row>
<div class="nz-icon-minus-position">
<span class="nz-icon-minus-medium">
<i @click="removeExpression(index)" class="nz-icon nz-icon-minus"></i>
</span>
<span class="nz-icon-copy">
<i @click="copyExpression(index)" class="nz-icon nz-icon-override"></i>
</span>
</div>
</el-row> </el-row>
<div style="width: 100%;margin-top: 10px;box-sizing: border-box;padding-left: 10px">
<!--tooltip-->
<el-row class="form-row-title">
{{$t('dashboard.panel.chartForm.tooltip')}}
<el-form-item class="float-right" prop="type" style="height: 100%;">
<el-switch
v-model="selection.pen.data.tooltipShow"
:active-value="true"
:inactive-value="false"
active-color="#ee9d3f"
/>
</el-form-item>
</el-row>
<div class="tooltip-box">
<!--title-->
<el-form-item :label="$t('project.topology.title')" class="full-form-item" prop="type">
<el-input v-model="selection.pen.data.chartTitle" @change="changeTitle" class="input" size="small"></el-input>
</el-form-item>
<!--chart aggregation-->
<el-form-item :label="$t('dashboard.panel.chartForm.aggregation')" class="half-form-item" prop="type">
<el-select class="right-box-row-with-btn" :placeholder="$t('el.select.placeholder')" popper-class="chart-box-dropdown-small"
size="mini"
v-model="selection.pen.data.aggregation" value-key="chartType">
<el-option :key="item.id" :label="item.name" :value="item.name" v-for="item in aggregationList">
<span class="panel-dropdown-label-txt">{{item.name}}</span>
</el-option>
</el-select>
</el-form-item>
<!--chart unit-->
<el-form-item :label="$t('dashboard.panel.chartForm.unit')" class="half-form-item" prop="unit"
v-show="selection.pen.data.type !='text'">
<el-cascader :options="unitOptions"
:props="{ expandTrigger: 'hover',emitPath:false }"
:show-all-levels="false"
filterable
:placeholder="$t('el.select.placeholder')"
popper-class="dc-dropdown"
size="mini"
v-model="selection.pen.data.unit"
>
</el-cascader>
</el-form-item>
<!--displayChart-->
<el-form-item :label="$t('dashboard.panel.chartForm.displayChart')" class="half-form-item" prop="type">
<el-switch
v-model="selection.pen.data.displayChart"
:active-value="true"
:inactive-value="false"
active-color="#ee9d3f"
/>
</el-form-item>
<!--chart type-->
<el-form-item :label="$t('dashboard.panel.chartForm.type')" class="half-form-item" prop="type">
<el-select class="right-box-row-with-btn" :placeholder="$t('el.select.placeholder')" popper-class="chart-box-dropdown-small"
size="mini"
v-model="selection.pen.data.type" value-key="chartType">
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in chartTypeList">
<span class="panel-dropdown-label-txt">{{item.name}}</span>
</el-option>
</el-select>
</el-form-item>
</div>
<!--value mapping-->
<el-row class="form-row-title">
{{$t('dashboard.panel.chartForm.thresholds')}}
<span v-if="selection.pen.data.valueMappingSort !=='desc'" style="font-size: 12px;color: #666666;letter-spacing: 0;font-weight: 400;margin-left: 10px">（0:Ok > … >{{selection.pen.data.valueMapping.length}}:Critical）</span>
<span v-if="selection.pen.data.valueMappingSort ==='desc'" style="font-size: 12px;color: #666666;letter-spacing: 0;font-weight: 400;margin-left: 10px">（{{selection.pen.data.valueMapping.length}}:Critical > … >0:Ok）</span>
</el-row>
<div style="width: 100%;margin-top: 10px">
<div class="thresholds-box"> <div class="thresholds-box">
<el-row class="thresholds-title"> <el-row class="thresholds-title">
<el-col class="thresholds-cell" :span="4">{{$t('project.topology.level')}} <el-col class="thresholds-cell" :span="4">{{$t('project.topology.level')}}
@@ -236,6 +167,103 @@
<i class="nz-icon nz-icon-plus"></i> <i class="nz-icon nz-icon-plus"></i>
</div> </div>
<!--tooltip-->
<el-row class="form-row-title">
{{$t('dashboard.panel.chartForm.tooltip')}}
<el-form-item class="float-right" prop="type" style="height: 100%;">
<el-switch
v-model="selection.pen.data.tooltipShow"
:active-value="true"
:inactive-value="false"
active-color="#ee9d3f"
/>
</el-form-item>
</el-row>
<div class="tooltip-box">
<!--title-->
<el-form-item :label="$t('project.topology.title')" class="full-form-item" prop="type">
<el-input v-model="selection.pen.data.chartTitle" @change="changeTitle" class="input" size="small"></el-input>
</el-form-item>
<!--chart unit-->
<el-form-item :label="$t('dashboard.panel.chartForm.unit')" class="half-form-item" prop="unit"
v-show="selection.pen.data.type !='text'">
<el-cascader :options="unitOptions"
:props="{ expandTrigger: 'hover',emitPath:false }"
:show-all-levels="false"
filterable
:placeholder="$t('el.select.placeholder')"
popper-class="dc-dropdown"
size="mini"
v-model="selection.pen.data.unit"
>
</el-cascader>
</el-form-item>
<!-- &lt;!&ndash;displayChart&ndash;&gt;-->
<!-- <el-form-item :label="$t('dashboard.panel.chartForm.displayChart')" class="half-form-item" prop="type">-->
<!-- <el-switch-->
<!-- v-model="selection.pen.data.displayChart"-->
<!-- :active-value="true"-->
<!-- :inactive-value="false"-->
<!-- active-color="#ee9d3f"-->
<!-- />-->
<!-- </el-form-item>-->
<!--chart type-->
<el-form-item :label="$t('dashboard.panel.chartForm.type')" class="half-form-item" prop="type">
<el-select class="right-box-row-with-btn" :placeholder="$t('el.select.placeholder')" popper-class="chart-box-dropdown-small"
size="mini"
v-model="selection.pen.data.type" value-key="chartType">
<el-option :key="item.id" :label="item.name" :value="item.id" v-for="item in chartTypeList">
<span class="panel-dropdown-label-txt">{{item.name}}</span>
</el-option>
</el-select>
</el-form-item>
<!--value mapping-->
<el-row :key="index" class="element-item form-row-item" style=""
v-for="(item,index) in selection.pen.data.expressAllArr">
<promql-input
:expression-list="selection.pen.data.expressAllArr"
:id="index"
:index="index"
:key="index"
:plugins="['metric-selector', 'metric-input', 'remove']"
:ref="'promql-'+index"
:showRemove="false"
:styleType="2"
:metricOptionsParent="metricOptions"
@change="expressionChange"
:from-father-data="true"
@removeExpression="removeExpression"
></promql-input>
<el-row style="margin-top: 10px">
<template>
<el-col class="legend-title">
{{$t('dashboard.panel.chartForm.legend')}}&nbsp;
<el-popover placement="top" trigger="hover" width="211">
<div style="word-break:keep-all;">{{$t('dashboard.panel.chartForm.legendTip')}}</div>
<i class="nz-icon nz-icon-info-normal" slot="reference" @mouseover="rz"
style="font-size: 14px; -webkit-transform:scale(0.75);display:inline-block;"></i>
</el-popover>
</el-col>
<el-col style="width: calc(100% - 120px);">
<el-input size="small" type="text" v-model="selection.pen.data.legendsAll[index]"></el-input>
</el-col>
</template>
</el-row>
<div class="nz-icon-minus-position">
<span class="nz-icon-minus-medium">
<i @click="removeExpression(index)" class="nz-icon nz-icon-minus"></i>
</span>
<span class="nz-icon-copy">
<i @click="copyExpression(index)" class="nz-icon nz-icon-override"></i>
</span>
</div>
</el-row>
<div @click="addExpression()" style="text-align: center" class="value-mapping-add">
<i class="nz-icon nz-icon-plus"></i>
</div>
</div>
<!-- &lt;!&ndash;link&ndash;&gt;--> <!-- &lt;!&ndash;link&ndash;&gt;-->
<!-- <el-row class="form-row-title">--> <!-- <el-row class="form-row-title">-->
<!-- {{$t('project.topology.link')}}--> <!-- {{$t('project.topology.link')}}-->
@@ -1235,6 +1263,10 @@ export default {
selection: { selection: {
handler () { handler () {
// this.loading = false // this.loading = false
if (this.selection.pen && this.selection.pen.data && !this.selection.pen.data.expressAllArr) {
this.selection.pen.data.expressAllArr = ['']
this.selection.pen.data.legendsAll = ['']
}
}, },
deep: true, deep: true,
immediate: true immediate: true
@@ -1559,16 +1591,16 @@ export default {
return this.metricOptions return this.metricOptions
}, },
addExpression () { addExpression () {
this.selection.pen.data.expressArr.push('') this.selection.pen.data.expressAllArr.push('')
this.selection.pen.data.legends.push('') this.selection.pen.data.legendsAll.push('')
}, },
expressionChange (item) { expressionChange (item) {
}, },
removeExpression (index) { removeExpression (index) {
if (this.selection.pen.data.expressArr.length > 1) { if (this.selection.pen.data.expressAllArr.length > 1) {
this.selection.pen.data.expressArr.splice(index, 1) this.selection.pen.data.expressAllArr.splice(index, 1)
this.selection.pen.data.legends.splice(index, 1) this.selection.pen.data.legendsAll.splice(index, 1)
this.$nextTick(() => { this.$nextTick(() => {
this.expressions.forEach((ex, index) => { this.expressions.forEach((ex, index) => {
if (ex) { if (ex) {
@@ -1579,8 +1611,8 @@ export default {
} }
}, },
copyExpression (index) { copyExpression (index) {
this.selection.pen.data.expressArr.push(this.selection.pen.data.expressArr[index]) this.selection.pen.data.expressAllArr.push(this.selection.pen.data.expressAllArr[index])
this.selection.pen.data.legends.push(this.selection.pen.data.legends[index]) this.selection.pen.data.legendsAll.push(this.selection.pen.data.legendsAll[index])
this.$nextTick(() => { this.$nextTick(() => {
this.expressions.forEach((ex, index) => { this.expressions.forEach((ex, index) => {
if (ex) { if (ex) {
@@ -1746,11 +1778,11 @@ export default {
width: 100px; width: 100px;
margin-right: 10px; margin-right: 10px;
text-align: left; text-align: left;
padding-left:10px; padding-left:0px;
margin-left: 10px; margin-left: 10px;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
background: #E7EAED; font-size: 14px;
color: #606266; color: #606266;
} }
.project-title { .project-title {
@@ -1866,10 +1898,9 @@ export default {
.element-item { .element-item {
padding: 10px 10px 10px 0; padding: 10px 10px 10px 0;
border: 1px dashed #dfe7f2; width: 100%;
width: calc(100% - 60px);
margin-bottom: 10px; margin-bottom: 10px;
margin-left: 10px; margin-top: 10px;
} }
.right-box-form .element-item.form-row-item { .right-box-form .element-item.form-row-item {
@@ -1986,6 +2017,8 @@ export default {
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
color: #FA901C; color: #FA901C;
box-sizing: border-box;
margin-left: 10px;
} }
.mb10 { .mb10 {
margin-bottom: 10px; margin-bottom: 10px;
@@ -2214,4 +2247,20 @@ export default {
/deep/ .query-row .input-box{ /deep/ .query-row .input-box{
margin-right: 0 !important; margin-right: 0 !important;
} }
/deep/ .el-cascader-node{
max-width: 200px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
/deep/ .nz-cascade-temp{
box-sizing: border-box;
max-width: 170px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
/deep/ .metric-selector-title{
background: #fff !important;
}
</style> </style>

3
nezha-fronted/src/components/common/project/L5/topoTooltip.vue
View File

@@ -9,7 +9,7 @@
:temp-dom="tempDom" :temp-dom="tempDom"
:panel-id="-1" :panel-id="-1"
:is-lock="true" :is-lock="true"
:chart-index="0" :chart-index="-2"
:fromTopo="true" :fromTopo="true"
:chartTitleShow="false" :chartTitleShow="false"
:chart-data="chartData"> :chart-data="chartData">
@@ -81,6 +81,7 @@ export default {
this.tempDom.width = 250 this.tempDom.width = 250
}, },
process (item) { process (item) {
console.log(item)
const chartData = { ...this.chartDataTemp, ...item, name: item.chartTitle } const chartData = { ...this.chartDataTemp, ...item, name: item.chartTitle }
chartData.elements = [] chartData.elements = []
chartData.expressArr.forEach((item1, index) => { chartData.expressArr.forEach((item1, index) => {

43
nezha-fronted/src/components/common/project/topologyL5.vue
View File

@@ -654,16 +654,20 @@ export default {
const step = bus.getStep(startTime, endTime) const step = bus.getStep(startTime, endTime)
data.pens && data.pens.forEach((item, index) => { data.pens && data.pens.forEach((item, index) => {
this.chartGetData.push({ id: item.id, res: [] }) this.chartGetData.push({ id: item.id, res: [] })
const arr = item.data.expressArr.map((ele) => { let arr = []
let query = ele console.log(item.data.valueMappingShow)
if (!query) { if (item.data.valueMappingShow) {
return new Promise(resolve => { arr = item.data.expressArr.map((ele) => {
resolve({ data: '', status: 'no query' }) let query = ele
}) if (!query) {
} return new Promise(resolve => {
query += '&nullType=' + 'connected' resolve({ data: '', status: 'no query' })
return this.$get('/prom/api/v1/query_range?query=' + query + '&start=' + this.$stringTimeParseToUnix(startTime) + '&end=' + this.$stringTimeParseToUnix(endTime) + '&step=' + step) })
}) }
query += '&nullType=' + 'connected'
return this.$get('/prom/api/v1/query_range?query=' + query + '&start=' + this.$stringTimeParseToUnix(startTime) + '&end=' + this.$stringTimeParseToUnix(endTime) + '&step=' + step)
})
}
axiosArr.push({ item, arr }) axiosArr.push({ item, arr })
promiseArr.push(pensPromise(item, arr, index)) promiseArr.push(pensPromise(item, arr, index))
}) })
@@ -1028,6 +1032,7 @@ export default {
show: false, show: false,
error: false, error: false,
expressArr: [], expressArr: [],
expressAllArr: [],
state: {} state: {}
} }
} }
@@ -1170,8 +1175,11 @@ export default {
}], }],
valueMappingSort: 'asc', valueMappingSort: 'asc',
expressArr: [''], expressArr: [''],
expressAllArr: [''],
legends: [''], legends: [''],
legendsAll: [''],
tooltipShow: true, tooltipShow: true,
valueMappingShow: true,
panelName: 'topologyName', panelName: 'topologyName',
unit: 2, unit: 2,
type: 'line', type: 'line',
@@ -1206,8 +1214,11 @@ export default {
}], }],
valueMappingSort: 'asc', /* desc */ valueMappingSort: 'asc', /* desc */
expressArr: [''], expressArr: [''],
expressAllArr: [''],
legends: [''], legends: [''],
legendsAll: [''],
tooltipShow: true, tooltipShow: true,
valueMappingShow: true,
panelName: 'topologyName', panelName: 'topologyName',
unit: 2, unit: 2,
type: 'line', type: 'line',
@@ -1766,6 +1777,10 @@ export default {
item.data.expressArr = [''] item.data.expressArr = ['']
item.data.legends = [''] item.data.legends = ['']
} }
if (!item.data.expressAllArr || !item.data.expressAllArr.length) {
item.data.expressAllArr = ['']
item.data.legendsAll = ['']
}
item.animateType = item.data.animateType item.animateType = item.data.animateType
if (item.type === 0) { if (item.type === 0) {
item.fillStyle = item.data.fillStyle item.fillStyle = item.data.fillStyle
@@ -1871,6 +1886,14 @@ export default {
return true return true
} }
}) })
item.data.expressAllArr = item.data.expressAllArr.filter((expression, i) => {
if (!expression) {
item.data.legendsAll.splice(i, 1)
return false
} else {
return true
}
})
}) })
if (this.penToolTipScale == getTopology(this.topologyIndex).data.scale) { if (this.penToolTipScale == getTopology(this.topologyIndex).data.scale) {
getTopology(this.topologyIndex).data.scale = this.oldScale getTopology(this.topologyIndex).data.scale = this.oldScale

6
nezha-fronted/src/components/page/config/system.vue
View File

@@ -106,8 +106,8 @@
<el-form-item :label="$t('config.system.email.smtpAccount')" prop="email_auth_account"> <el-form-item :label="$t('config.system.email.smtpAccount')" prop="email_auth_account">
<el-input v-model="email.email_auth_account" :disabled="email.email_enable == 'off'" id="system-email-email_smtp_account"> autocomplete="off"</el-input> <el-input v-model="email.email_auth_account" :disabled="email.email_enable == 'off'" id="system-email-email_smtp_account"> autocomplete="off"</el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.system.email.smtpPin')" class="has-tip" prop="email_auth_pin"> <el-form-item :label="$t('config.system.email.smtpPin')" class="has-tip" prop="email_auth_password">
<el-input v-model="email.email_auth_pin" type="password" :show-password="false" :disabled="email.email_enable == 'off'" autocomplete="off" id="system-email-email_smtp_password"></el-input> <el-input v-model="email.email_auth_password" type="password" :show-password="false" :disabled="email.email_enable == 'off'" autocomplete="off" id="system-email-email_smtp_password"></el-input>
<div class="el-form-item__tip">{{$t("config.system.email.pinTip")}}</div> <div class="el-form-item__tip">{{$t("config.system.email.pinTip")}}</div>
</el-form-item> </el-form-item>
<el-form-item :label="$t('config.system.email.sendAccount')" class="has-tip" prop="email_send_account"> <el-form-item :label="$t('config.system.email.sendAccount')" class="has-tip" prop="email_send_account">
@@ -295,7 +295,7 @@ export default {
email_port: 25, email_port: 25,
email_timeout: 10, email_timeout: 10,
email_auth_account: '', email_auth_account: '',
email_auth_pin: '', email_auth_password: '',
email_send_account: '', email_send_account: '',
email_test_account: '', email_test_account: '',
email_security_type: 'NONE' email_security_type: 'NONE'

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

@@ -13,7 +13,7 @@
:props="{emitPath:false,}" @change="metricChangeNew"> :props="{emitPath:false,}" @change="metricChangeNew">
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<div :class="['nz-cascade',data.temp&&!data.child?'nz-cascade-temp':'']" @click="()=>{lazyLoad(node,data)}"> <div :class="['nz-cascade',data.temp&&!data.child?'nz-cascade-temp':'']" @click="()=>{lazyLoad(node,data)}" :title="data.label">
<i class="nz-icon nz-icon-template2"></i> <i class="nz-icon nz-icon-template2"></i>
{{data.label}} {{data.label}}
</div> </div>
@@ -54,7 +54,7 @@
:props="{emitPath:false}" :options="metricOptions" @change="metricChangeNew"> :props="{emitPath:false}" :options="metricOptions" @change="metricChangeNew">
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<div :class="['nz-cascade',data.temp&&!data.child?'nz-cascade-temp':'']" @click="()=>{lazyLoad(node,data)}"> <div :class="['nz-cascade',data.temp&&!data.child?'nz-cascade-temp':'']" @click="()=>{lazyLoad(node,data)}" :title="data.label">
<i class="nz-icon nz-icon-template2"></i> <i class="nz-icon nz-icon-template2"></i>
{{data.label}} {{data.label}}
</div> </div>