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

fix： NEZ-3016 endpoint log Pipelines regex source配置非必填项

Browse Source
This commit is contained in:
zhangyu
2023-07-25 18:09:15 +08:00
parent d4e8378273
commit b467b44925
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/assets/css/common.scss
View File

@@ -724,3 +724,8 @@ i.nz-icon-override{
} }
} }
} }
.required-content:before{
content: '*';
color: #EC7F66;
margin-right: 4px;
}

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

@@ -560,20 +560,20 @@
<el-form-item <el-form-item
:label="'Expression'" :label="'Expression'"
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.expression'" :prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.expression'"
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[{ required: false, message: $t('validate.required'), trigger: 'blur' }]"
> >
<el-input v-model="item2.expression" placeholder="" size="mini"></el-input> <el-input v-model="item2.expression" placeholder="" size="mini"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="'Source'" :label="'Source'"
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.source'" :prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.source'"
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[{ required: false, message: $t('validate.required'), trigger: 'blur' }]"
> >
<el-input v-model="item2.source" placeholder="" size="mini"></el-input> <el-input v-model="item2.source" placeholder="" size="mini"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div v-if="item2.type === 'json'"> <div v-if="item2.type === 'json'">
<label style="padding-bottom: 6px;font-size: 14px;line-height: 16px;color: #666;">Expressions</label> <label style="padding-bottom: 6px;font-size: 14px;line-height: 16px;color: #666;" class="required-content">Expressions</label>
<div v-for="(expressions, eindex) in item2.expressions" :key="eindex" style="display: flex;justify-content: space-around;align-items: center;margin-bottom: 16px"> <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 <el-form-item
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.expressions.'+eindex+'.key'" :prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.expressions.'+eindex+'.key'"
@@ -637,7 +637,7 @@
</el-form-item> </el-form-item>
</div> </div>
<div v-if="item2.type === 'labels'"> <div v-if="item2.type === 'labels'">
<label style="padding-bottom: 6px;font-size: 14px;line-height: 16px;color: #666;">Key/value</label> <label style="padding-bottom: 6px;font-size: 14px;line-height: 16px;color: #666;" class="required-content">Key/value</label>
<div v-for="(expressions, eindex) in item2.labels" :key="eindex" style="display: flex;justify-content: space-around;align-items: center;margin-bottom: 16px"> <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 <el-form-item
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.labels.'+eindex+'.key'" :prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.labels.'+eindex+'.key'"

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

@@ -541,20 +541,20 @@
<el-form-item <el-form-item
:label="'Expression'" :label="'Expression'"
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.expression'" :prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.expression'"
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[{ required: false, message: $t('validate.required'), trigger: 'blur' }]"
> >
<el-input v-model="item2.expression" placeholder="" size="mini"></el-input> <el-input v-model="item2.expression" placeholder="" size="mini"></el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="'Source'" :label="'Source'"
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.source'" :prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.source'"
:rules="[{ required: true, message: $t('validate.required'), trigger: 'blur' }]" :rules="[{ required: false, message: $t('validate.required'), trigger: 'blur' }]"
> >
<el-input v-model="item2.source" placeholder="" size="mini"></el-input> <el-input v-model="item2.source" placeholder="" size="mini"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div v-if="item2.type === 'json'"> <div v-if="item2.type === 'json'">
<label class="module-form__label">Expressions</label> <label class="module-form__label required-content">Expressions</label>
<div v-for="(expressions, eindex) in item2.expressions" :key="eindex" style="display: flex;justify-content: space-around;align-items: center;margin-bottom: 16px"> <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 <el-form-item
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.expressions.'+eindex+'.key'" :prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.expressions.'+eindex+'.key'"
@@ -617,7 +617,7 @@
</el-form-item> </el-form-item>
</div> </div>
<div v-if="item2.type === 'labels'"> <div v-if="item2.type === 'labels'">
<label class="module-form__label" style="padding-bottom: 6px;font-size: 14px;line-height: 16px;color: #666;">Key/value</label> <label class="module-form__label required-content" style="padding-bottom: 6px;font-size: 14px;line-height: 16px;color: #666;">Key/value</label>
<div v-for="(expressions, eindex) in item2.labels" :key="eindex" style="display: flex;justify-content: space-around;align-items: center;margin-bottom: 16px"> <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 <el-form-item
:prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.labels.'+eindex+'.key'" :prop="'configs.1.config.'+ index +'.pipeline.' + index2 + '.labels.'+eindex+'.key'"