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

fix：修改log pipeline labels 删除无效的问题

Browse Source
This commit is contained in:
zhangyu
2022-10-19 10:02:12 +08:00
parent 25e9c9866b
commit 3d50bd6caa
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -590,7 +590,7 @@
<el-input v-model="item2.expressions[eindex].value" placeholder="value" size="mini" ></el-input> <el-input v-model="item2.expressions[eindex].value" placeholder="value" size="mini" ></el-input>
</el-form-item> </el-form-item>
<i class="nz-icon nz-icon-plus" @click="addPipelineItem(index, index2)" :title="$t('tip.add')"></i> <i class="nz-icon nz-icon-plus" @click="addPipelineItem(index, index2)" :title="$t('tip.add')"></i>
<i class="nz-icon nz-icon-shanchu1" @click="delPipelineItem((index, index2, eindex))" :title="$t('overall.delete')"></i> <i class="nz-icon nz-icon-shanchu1" @click="delPipelineItem(index, index2, eindex)" :title="$t('overall.delete')"></i>
</div> </div>
<el-form-item <el-form-item
:label="'Source'" :label="'Source'"
@@ -654,7 +654,7 @@
<el-input v-model="item2.labels[eindex].value" placeholder="value" size="mini" ></el-input> <el-input v-model="item2.labels[eindex].value" placeholder="value" size="mini" ></el-input>
</el-form-item> </el-form-item>
<i class="nz-icon nz-icon-plus" @click="addPipelineItem(index, index2)" :title="$t('tip.add')"></i> <i class="nz-icon nz-icon-plus" @click="addPipelineItem(index, index2)" :title="$t('tip.add')"></i>
<i class="nz-icon nz-icon-shanchu1" @click="delPipelineItem((index, index2, eindex))" :title="$t('overall.delete')"></i> <i class="nz-icon nz-icon-shanchu1" @click="delPipelineItem(index, index2, eindex)" :title="$t('overall.delete')"></i>
</div> </div>
</div> </div>
<div v-if="item2.type === 'output'"> <div v-if="item2.type === 'output'">
@@ -1572,9 +1572,9 @@ export default {
}, },
delPipelineItem (logsIndex, pipelineIndex, itemIndex) { delPipelineItem (logsIndex, pipelineIndex, itemIndex) {
const val = this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].type const val = this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].type
if (val === 'json') { if (val === 'json' && this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].expressions.length > 1) {
this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].expressions.splice(itemIndex, 1) this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].expressions.splice(itemIndex, 1)
} else if (val === 'labels') { } else if (val === 'labels' && this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.length > 1) {
this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.splice(itemIndex, 1) this.editEndpoint.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.splice(itemIndex, 1)
} }
this.$refs.moduleForm.clearValidate() this.$refs.moduleForm.clearValidate()

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

@@ -572,7 +572,7 @@
<el-input v-model="item2.expressions[eindex].value" placeholder="value" size="mini" ></el-input> <el-input v-model="item2.expressions[eindex].value" placeholder="value" size="mini" ></el-input>
</el-form-item> </el-form-item>
<i class="nz-icon nz-icon-plus" @click="addPipelineItem(index, index2)" :title="$t('tip.add')"></i> <i class="nz-icon nz-icon-plus" @click="addPipelineItem(index, index2)" :title="$t('tip.add')"></i>
<i class="nz-icon nz-icon-shanchu1" @click="delPipelineItem((index, index2, eindex))" :title="$t('overall.delete')"></i> <i class="nz-icon nz-icon-shanchu1" @click="delPipelineItem(index, index2, eindex)" :title="$t('overall.delete')"></i>
</div> </div>
<el-form-item <el-form-item
:label="'Source'" :label="'Source'"
@@ -635,7 +635,7 @@
<el-input v-model="item2.labels[eindex].value" placeholder="value" size="mini" ></el-input> <el-input v-model="item2.labels[eindex].value" placeholder="value" size="mini" ></el-input>
</el-form-item> </el-form-item>
<i class="nz-icon nz-icon-plus" @click="addPipelineItem(index, index2)" :title="$t('tip.add')"></i> <i class="nz-icon nz-icon-plus" @click="addPipelineItem(index, index2)" :title="$t('tip.add')"></i>
<i class="nz-icon nz-icon-shanchu1" @click="delPipelineItem((index, index2, eindex))" :title="$t('overall.delete')"></i> <i class="nz-icon nz-icon-shanchu1" @click="delPipelineItem(index, index2, eindex)" :title="$t('overall.delete')"></i>
</div> </div>
</div> </div>
<div v-if="item2.type === 'output'"> <div v-if="item2.type === 'output'">
@@ -1554,9 +1554,9 @@ export default {
}, },
delPipelineItem (logsIndex, pipelineIndex, itemIndex) { delPipelineItem (logsIndex, pipelineIndex, itemIndex) {
const val = this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].type const val = this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].type
if (val === 'json') { if (val === 'json' && this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].expressions.length > 1) {
this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].expressions.splice(itemIndex, 1) this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].expressions.splice(itemIndex, 1)
} else if (val === 'labels') { } else if (val === 'labels' && this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.length > 1) {
this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.splice(itemIndex, 1) this.editModule.configs[1].config[logsIndex].pipeline[pipelineIndex].labels.splice(itemIndex, 1)
} }
this.$refs.moduleForm.clearValidate() this.$refs.moduleForm.clearValidate()