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

Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue
This commit is contained in:
chenjinsong
2021-11-11 11:28:19 +08:00
parent e7273d0be0 6abf76db08
commit a0dcb8d877
10076 changed files with 1357 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
</el-form-item>
<!--Enpoint template-->
<div class="right-box-sub-title">{{ $t("overall.endpointTemplate") }}
<el-tooltip effect="light" placement="top">
<el-tooltip effect="light" placement="top" popper-class="prevent-clickoutside">
<div slot="content">
{{$t('project.module.tip.defaultEndpointSet')}}
<div></div>
@@ -185,7 +185,7 @@
<vue-tags-input
v-model="item.tags"
:maxlength="32"
:placeholder="'add parameter'"
:placeholder="$t('overall.addParameter')"
:tags="item.value"
@tags-changed="(newTags)=>{tagsChange(newTags, index)}"
/>
@@ -222,7 +222,7 @@
<div id="module-box-relabel" ref="labelBoxScrollbar" style="height: 100%; overflow: hidden;">
<div v-for="(item, index) in this.editModule.configs[0].config.relabel_config" :key="index" class="">
<div class="pipeline-box">
<span class="pipeline-title">{{'item' + index}}</span>
<span class="pipeline-title">{{$t('project.endpoint.item') + index}}</span>
<span class="pipeline-option">
<i class="nz-icon nz-icon-shanchu1" @click="removeRelabel(index)"></i>
</span>
@@ -238,14 +238,14 @@
class="half-form-item" :label="'Source labels'"
:rules="[
{ required: item.action === 'replace' || item.action === 'keep' || item.action === 'drop', message: $t('validate.required'), trigger: 'change' },
{ validator: item.action === 'replace' || item.action === 'keep' || item.action === 'drop'? arrLength : '', trigger: 'change' }
{ validator: item.action === 'replace' || item.action === 'keep' || item.action === 'drop'? arrLength : requirdRelabel, trigger: 'change' }
]">
<vue-tags-input
v-model="item.tags"
:maxlength="32"
ref="relabelTag"
tabindex="9999"
:placeholder="'add parameter'"
:placeholder="$t('overall.addParameter')"
:tags="item.source_labels"
@before-adding-tag="beforeAddingTag"
@blur="relabelTabBlur"
@@ -582,6 +582,9 @@ export default {
data () {
return {
walkData: [],
requirdRelabel (rule, value, callback) {
callback()
},
chartTempList: [],
activeName: 'Basic',
activeNameLogs: ['Basic'],
@@ -615,7 +618,6 @@ export default {
}
}
],
language: localStorage.getItem('nz-language'),
showAllBasicOption: false,
rules: {
name: [
@@ -1304,7 +1306,8 @@ export default {
return (value) => {
return this.getMibName(this.walkData, value)
}
}
},
language () { return this.$store.getters.getLanguage }
},
watch: {
module: {