fix: duplicate variable names and job audit perms issue

This commit is contained in:
wangruidong
2024-11-14 15:42:55 +08:00
committed by Bryan
parent c9f62ae5d3
commit ec78370ecc
5 changed files with 9 additions and 4 deletions

View File

@@ -64,7 +64,7 @@ export default {
meta: {
title: i18n.t('JobsAudit'),
icon: 'job',
permissions: []
permissions: ['audits.view_joblog']
},
children: JobRoutes
}

View File

@@ -12,7 +12,7 @@ export default [
meta: {
title: i18n.t('JobList'),
icon: 'task',
permissions: []
permissions: ['audits.view_joblog']
},
children: [
{

View File

@@ -155,6 +155,7 @@ export default {
job: row.id,
parameters: parameters
}).then((resp) => {
this.showVariableDialog = false
openTaskPage(resp.task_id)
})
},

View File

@@ -52,7 +52,7 @@ export default {
},
methods: {
addVariable(variable) {
const i = this.variables.findIndex(item => item.var_name === variable.var_name)
const i = this.variables.findIndex(item => item.name === variable.name || item.var_name === variable.var_name)
if (i !== -1) {
this.variables.splice(i, 1)
}
@@ -62,6 +62,11 @@ export default {
editVariable(form) {
const i = this.variables.findIndex(item => item.var_name === this.variable.var_name)
this.variables.splice(i, 1, form)
const count = this.variables.filter(value => value.var_name === form.var_name || value.name === form.name).length
// 不允许有相同的变量名
if (count > 1) {
this.variables.splice(i, 1)
}
this.iVisible = false
}
}

View File

@@ -56,7 +56,6 @@ export default {
methods: {
handleConfirm(variable) {
this.$emit('submit', variable)
this.visible = false
}
}
}