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

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

Browse Source
This commit is contained in:
zhangyu
2022-08-30 15:06:30 +08:00
parent 44ba4c4734 c63fa7bf99
commit 1a29f0d43e
24 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/.gitignore vendored
View File

@@ -1,7 +1,7 @@
.DS_Store
node_modules/
/dist/
/static/
npm-debug.log*
yarn-debug.log*
yarn-error.log*

7
nezha-fronted/src/assets/css/components/chart/chart.scss
View File

@@ -313,13 +313,18 @@
.basic-info-table-list {
display: flex;
.basic-info-table-title,.basic-info-table-value {
display: inline-block;
display: inline-flex;
flex-wrap: wrap;
width: 50%;
line-height: 30px;
padding-left: 10px;
border-bottom: 1px solid $--border-color-light;
border-right: 1px solid $--border-color-light;
.alert-days-info{
div {
vertical-align: middle;
}
}
}
.basic-info-table-value {
border-right: none;

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

@@ -20,6 +20,7 @@
}
.chart-unit .el-input__inner {
border-top-left-radius: 0 !important;
border-color: $--border-color-base;
border-color: $--explore-border-color-bottom;
// border-color: $--button-icon-border-color;
border-bottom-left-radius: 0 !important;
}

7
nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss
View File

@@ -139,6 +139,7 @@
}
.mib-browser-detail-row>div {
padding-left: 5px;
box-sizing: border-box;
}
.mib-browser-detail-description {
padding: 0 14px 0 0;
@@ -230,3 +231,9 @@
border-color: unset;
background-color: unset;
}
.plTableBox.mib-browser-table{
.el-table:not(.chart-table) .gutter{
right: 53px !important;
height: 40px !important;
}
}

5
nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss
View File

@@ -209,6 +209,11 @@
}
}
}
.top-tools {
.chart-unit .el-input__inner {
border-color: $--button-icon-border-color;
}
}
}
/*外部引用 样式start*/
.doc-content {

8
nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
View File

@@ -169,3 +169,11 @@
}
}
.topo-page {
.promqlInput {
.el-cascader-menu {
width: 200px;
height: 100%;
}
}
}

2
nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue
View File

@@ -36,7 +36,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'ipDetails'"

2
nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
View File

@@ -54,7 +54,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'cabinetTab'"

13
nezha-fronted/src/components/common/deleteButton.vue
View File

@@ -1,9 +1,12 @@
<template>
<div :class="['delete-button',(deleteObjs.length<1?'':'delete-button-light')]">
<button v-if="this.type === 'button'" :id="id" :class="{'nz-btn-disabled' : deleteObjs.length<1}" class="top-tool-btn top-tool-btn--delete" @click="batchDelete" :title="$t('overall.delete')">
<span><i class="nz-icon nz-icon-delete" ></i></span>
</button>
<div v-if="this.type === 'link'" :id="id" :class="{'nz-btn-disabled' : deleteObjs.length<1}" @click="batchDelete" :title="$t('overall.delete')">
<div>
<div :class="['delete-button',(deleteObjs.length<1?'':'delete-button-light')]">
<button v-if="this.type === 'button'" :id="id" :class="{'nz-btn-disabled' : deleteObjs.length<1}" class="top-tool-btn top-tool-btn--delete" @click="batchDelete" :title="$t('overall.delete')">
<span><i class="nz-icon nz-icon-delete" ></i></span>
</button>
</div>
<div v-if="this.type === 'link'" :id="id" @click="batchDelete" :title="$t('overall.delete')">
<span><i class="nz-icon nz-icon-delete" ></i>{{title}}</span>
</div>
<el-dialog

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

@@ -1246,6 +1246,9 @@ export default {
return
}
this.chartConfig.param.thresholds.splice(index, 1)
this.chartConfig.param.thresholds.forEach((item, index) => {
this.$refs.chartForm.validateField('param.thresholds.' + index + '.value')
})
this.change()
},
move () {

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

@@ -507,11 +507,14 @@ export default {
this.expressions.splice(index, 1)
this.expressionName.splice(index, 1)
this.expressionsShow.splice(index, 1)
this.chartConfig.elements.forEach((item, index) => {
this.$refs.chartForm.validateField('elements.' + index + '.expression')
})
this.$nextTick(() => {
this.expressions.forEach((ex, index) => {
if (ex) {
this.$refs[`promql-${index}`][0].metricChange(ex)
this.$refs[`promql-${index}`][0].promqlInputChange(ex)
this.$refs[`promql-${index}`][0].promqlInputCahnge(ex)
}
})
})
@@ -552,6 +555,14 @@ export default {
},
removeMapping (index) {
this.chartConfig.param.valueMapping.splice(index, 1)
this.chartConfig.param.valueMapping.forEach((item, index) => {
this.$refs.chartForm.validateField('param.valueMapping.' + index + '.value')
this.$refs.chartForm.validateField('param.valueMapping.' + index + '.from')
this.$refs.chartForm.validateField('param.valueMapping.' + index + '.to')
this.$refs.chartForm.validateField('param.valueMapping.' + index + '.regx')
this.$refs.chartForm.validateField('param.valueMapping.' + index + '.column')
this.$refs.chartForm.validateField('param.valueMapping.' + index + '.display')
})
this.change()
},
showMapping (index) {

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

@@ -1311,6 +1311,7 @@ export default {
// 删除pipeline
delPipeline (logsIndex, pipeLineIndex) {
this.editEndpoint.configs[1].config[logsIndex].pipeline.splice(pipeLineIndex, 1)
this.$refs.moduleForm.clearValidate()
},
// 添加pipelineItem
addPipelineItem (logsIndex, pipelineIndex) {
@@ -1354,6 +1355,7 @@ export default {
} else if (val === 'labels') {
this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.splice(itemIndex, 1)
}
this.$refs.moduleForm.clearValidate()
},
resultFormat (resp) {
if (resp && resp.data) {
@@ -1457,6 +1459,7 @@ export default {
// return
// }
this.editEndpoint.configs[0].config.relabel_config.splice(index, 1)
this.$refs.moduleForm.clearValidate()
},
tagsChangeRelabel (newTags, index) {
this.editEndpoint.configs[0].config.relabel_config[index].source_labels = newTags.map(item => item.text)

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

@@ -1064,6 +1064,7 @@ export default {
// return
// }
this.editModule.configs[0].config.relabel_config.splice(index, 1)
this.$refs.moduleForm.clearValidate()
},
tagsChange (newTags, index) {
this.editModule.paramObj[index].value = newTags.map(item => item.text)
@@ -1259,6 +1260,7 @@ export default {
// 删除pipeline
delPipeline (logsIndex, pipeLineIndex) {
this.editModule.configs[1].config[logsIndex].pipeline.splice(pipeLineIndex, 1)
this.$refs.moduleForm.clearValidate()
},
// 添加pipelineItem
addPipelineItem (logsIndex, pipelineIndex) {
@@ -1292,6 +1294,7 @@ export default {
} else if (val === 'labels') {
this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.splice(itemIndex, 1)
}
this.$refs.moduleForm.clearValidate()
}
},
mounted () {

2
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -35,7 +35,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'alertMessage'"

2
nezha-fronted/src/components/page/alert/alertRule.vue
View File

@@ -99,7 +99,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'alertRule'"

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

@@ -114,7 +114,7 @@
<el-dropdown-item>
<div id="asset-batch-asset" v-has="'asset_edit'" @click="batchEdit"><i class="nz-icon nz-icon-batch-edit"></i>{{$t('overall.batchEdit')}}</div>
</el-dropdown-item>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'asset'"

2
nezha-fronted/src/components/page/config/dc.vue
View File

@@ -105,7 +105,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'datacenter'"

2
nezha-fronted/src/components/page/config/ipam.vue
View File

@@ -31,7 +31,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'ipam'"

9
nezha-fronted/src/components/page/config/mibBrowser.vue
View File

@@ -578,3 +578,12 @@ export default {
}
}
</script>
<style scoped>
.document-copy-text{
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
</style>

2
nezha-fronted/src/components/page/config/model.vue
View File

@@ -31,7 +31,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'model'"

2
nezha-fronted/src/components/page/config/template/chartTemp.vue
View File

@@ -35,7 +35,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'chartTemp'"

2
nezha-fronted/src/components/page/config/template/exprTemp.vue
View File

@@ -28,7 +28,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'exprTemp'"

2
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -111,7 +111,7 @@
<el-dropdown-item>
<div id="asset-batch-asset" v-has="'asset_edit'" @click="batchEdit"><i class="nz-icon nz-icon-batch-edit"></i>{{$t('overall.batchEdit')}}</div>
</el-dropdown-item>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'endpoint'"

2
nezha-fronted/src/components/page/monitor/module/moduleList.vue
View File

@@ -101,7 +101,7 @@
>
<template v-slot:before>
<div>
<el-dropdown-item>
<el-dropdown-item :disabled="batchDeleteObjs.length==0">
<delete-button
ref="deleteButton"
:from="'module'"