7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #603 from veops/dev_ui_240826 

fix(ui): define value filter error
This commit is contained in:
Leo Song 2024-08-26 21:40:03 +08:00 committed by GitHub
parent c0d55b2126 611ee40dca
commit ae77852d5f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue
View File

@ -366,7 +366,7 @@ export default {
} }
return { return {
choice_value: this.valueList.filter((item) => item?.[0]), choice_value: this.valueList.filter((item) => !['', null, undefined].includes(item?.[0])),
choice_web_hook: null, choice_web_hook: null,
choice_other: null choice_other: null
} }
@ -398,8 +398,10 @@ export default {
}, },
validateDefine() { validateDefine() {
const valueList = this.valueList.filter((item) => item?.[0]) const valueList = this.valueList.filter((item) => {
const isRepeat = _.uniq(valueList.map(item => item?.[0] || '')).length !== valueList.length return !['', null, undefined].includes(item?.[0])
})
const isRepeat = _.uniq(valueList.map(item => item?.[0])).length !== valueList.length
if (isRepeat) { if (isRepeat) {
this.$message.warning(this.$t('cmdb.ciType.enumValueTip2')) this.$message.warning(this.$t('cmdb.ciType.enumValueTip2'))
return true return true