Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme
# Conflicts: # nezha-fronted/src/components/common/alert/alertLabel.vue # nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue # nezha-fronted/src/components/common/i18n.js # nezha-fronted/src/components/common/labelFilter/clickSearch.vue # nezha-fronted/src/components/common/login.vue # nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
This commit is contained in:
chenjinsong
@@ -196,7 +196,7 @@
|
||||
<el-tab-pane :label="$t('project.endpoint.parameter')" name="Parameter">
|
||||
<div id="module-box-params" ref="labelBoxScrollbar" style="height: 100%; overflow: auto;">
|
||||
<div v-for="(item, index) in editEndpoint.paramObj" :key="index" class="param-box-row">
|
||||
<el-form-item :prop="'paramObj.' + index + '.key'" class="param-box-row-key">
|
||||
<el-form-item :prop="'paramObj.' + index + '.key'" class="param-box-row-key" :rules="[{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('validate.key') ,trigger: 'blur'}]">
|
||||
<el-input v-model="item.key" placeholder="key" size="mini" ></el-input>
|
||||
</el-form-item>
|
||||
<span class="param-box-row-eq">=</span>
|
||||
@@ -221,7 +221,7 @@
|
||||
<el-tab-pane :label="$t('project.endpoint.labels2')" name="Labels">
|
||||
<div id="module-box-labels" ref="labelBoxScrollbar" style="height: 100%; overflow: auto;">
|
||||
<div v-for="(item, index) in editEndpoint.labelModule" :key="index" class="param-box-row">
|
||||
<el-form-item :prop="'labelModule.' + index + '.key'" :rules="[{ pattern: /[a-zA-Z_:][a-zA-Z0-9_:]*/, message: $t('validate.key') ,trigger: 'blur'}]" class="param-box-row-key">
|
||||
<el-form-item :prop="'labelModule.' + index + '.key'" :rules="[{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('validate.key') ,trigger: 'blur'}]" class="param-box-row-key">
|
||||
<el-input v-model="item.key" placeholder="key" size="mini"></el-input>
|
||||
</el-form-item>
|
||||
<span class="param-box-row-eq">=</span>
|
||||
@@ -257,7 +257,7 @@
|
||||
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"
|
||||
@@ -276,7 +276,7 @@
|
||||
class="half-form-item" :label="'Target label'"
|
||||
:rules="[
|
||||
{ required: item.action === 'replace', message: $t('validate.required'), trigger: 'blur' },
|
||||
{ pattern: /[a-zA-Z_:][a-zA-Z0-9_:]*/, message: $t('validate.key') ,trigger: 'blur'}]"
|
||||
{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('validate.key') ,trigger: 'blur'}]"
|
||||
>
|
||||
<el-input id="module-box-input-target_label" v-model="item.target_label" placeholder='' size="small"></el-input>
|
||||
</el-form-item>
|
||||
@@ -396,12 +396,12 @@
|
||||
<el-tab-pane :label="$t('project.endpoint.labels2')" name="Labels">
|
||||
<div id="module-box-logs-labels" ref="labelBoxScrollbar" style="height: 100%; overflow: auto;">
|
||||
<div v-for="(item1, i) in item.labelModule" :key="i" class="param-box-row">
|
||||
<el-form-item :prop="'configs.1.config.'+ index +'.labelModule.' + i + '.key'" :rules="[{ pattern: /[a-zA-Z_:][a-zA-Z0-9_:]*/, message: $t('validate.key') ,trigger: 'blur'}]" class="param-box-row-key">
|
||||
<el-input v-model="item1.key" placeholder="key" size="mini"></el-input>
|
||||
<el-form-item :prop="'configs.1.config.'+ index +'.labelModule.' + i + '.key'" :rules="[{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('validate.key') ,trigger: 'blur'}]" class="param-box-row-key">
|
||||
<el-input v-model="item1.key" placeholder="key" size="mini" @input="$forceUpdate()"></el-input>
|
||||
</el-form-item>
|
||||
<span class="param-box-row-eq">=</span>
|
||||
<el-form-item class="param-box-row-value">
|
||||
<el-input v-model="item1.value" placeholder="value" size="mini"></el-input>
|
||||
<el-input v-model="item1.value" placeholder="value" size="mini" @input="$forceUpdate()"></el-input>
|
||||
</el-form-item>
|
||||
<span :id="'moduel-remove-label-'+i" class="param-box-row-symbol" @click="removeLogsLabel(index, i)"><i class="nz-icon nz-icon-shanchu1" style="color:#666;"></i></span>
|
||||
</div>
|
||||
@@ -442,7 +442,7 @@
|
||||
<div v-for="(expressions, eindex) in item2.expressions" :key="eindex" style="display: flex;justify-content: space-around;align-items: center;margin-bottom: 16px">
|
||||
<el-form-item
|
||||
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.expressions.'+eindex+'.key'"
|
||||
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"
|
||||
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' },{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('validate.key') ,trigger: 'blur'}]"
|
||||
style="width: 45%;margin: 0"
|
||||
>
|
||||
<el-input v-model="item2.expressions[eindex].key" placeholder="key" size="mini" ></el-input>
|
||||
@@ -506,7 +506,7 @@
|
||||
<div v-for="(expressions, eindex) in item2.labels" :key="eindex" style="display: flex;justify-content: space-around;align-items: center;margin-bottom: 16px">
|
||||
<el-form-item
|
||||
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.labels.'+eindex+'.key'"
|
||||
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]"
|
||||
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' },{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('validate.key') ,trigger: 'blur'}]"
|
||||
style="width: 45%;margin: 0"
|
||||
>
|
||||
<el-input v-model="item2.labels[eindex].key" placeholder="key" size="mini" ></el-input>
|
||||
@@ -587,6 +587,7 @@ import pipelineSelect from './pipelineSelect'
|
||||
import selectWalk from '../popBox/selectWalk'
|
||||
import editRigthBox from '../mixin/editRigthBox'
|
||||
import VueTagsInput from '@johmun/vue-tags-input'
|
||||
import vm from "@/main";
|
||||
|
||||
export default {
|
||||
name: 'editEndpointBoxNew',
|
||||
@@ -816,6 +817,9 @@ export default {
|
||||
methods: {
|
||||
arrLength: arrLength,
|
||||
port: port,
|
||||
requirdRelabel (rule, value, callback) {
|
||||
callback()
|
||||
},
|
||||
selectWalk (walk) {
|
||||
if (this.editEndpoint.configs[0].config.walk.indexOf(walk) != -1) {
|
||||
this.editEndpoint.configs[0].config.walk.splice(this.editEndpoint.configs[0].config.walk.indexOf(walk), 1)
|
||||
@@ -1160,7 +1164,7 @@ export default {
|
||||
this.editEndpoint.paramObj[index].value = newTags.map(item => item.text)
|
||||
},
|
||||
beforeAddingTag (tag) {
|
||||
const regx = /[a-zA-Z_:][a-zA-Z0-9_:]*/
|
||||
const regx = /[a-zA-Z_][a-zA-Z0-9_]*/
|
||||
if (regx.test(tag.tag.text)) {
|
||||
tag.addTag()
|
||||
} else {
|
||||
@@ -1296,6 +1300,7 @@ export default {
|
||||
},
|
||||
addLogsLabel (index) {
|
||||
this.editEndpoint.configs[1].config[index].labelModule.push({ key: '', value: '' })
|
||||
this.$forceUpdate()
|
||||
},
|
||||
removeLogsLabel (logsIndex, i) {
|
||||
if (this.editEndpoint.configs[1].config[logsIndex].labelModule.length === 1) {
|
||||
|
||||
Reference in New Issue
Block a user