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

fix(ui): ci - number type attr default value display error

This commit is contained in:
songlh 2024-12-17 15:12:44 +08:00
parent d1e40b4e5e
commit c3aab86844
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue
View File

@ -95,7 +95,7 @@
attr.name,
{
rules: [{ required: attr.is_required, message: $t('placeholder1') + `${attr.alias || attr.name}` }],
initialValue: attr.default && attr.default.default ? attr.default.default : null,
initialValue: attr.default && attr.default.default !== undefined && attr.default.default !== null ? attr.default.default : null,
},
]"
style="width: 100%"
@ -148,6 +148,7 @@
</template>
<script>
import _ from 'lodash'
import moment from 'moment'
import JsonEditor from '../../../components/JsonEditor/jsonEditor.vue'
import CIReferenceAttr from '@/components/ciReferenceAttr/index.vue'
@ -210,7 +211,7 @@ export default {
},
getChoiceDefault(attr) {
if (!attr?.default?.default) {
if (_.isNil(attr?.default?.default)) {
return attr.is_list ? [] : null
}

2
cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
View File

@ -659,7 +659,7 @@ export default {
} else {
this.$nextTick(() => {
this.form.setFieldsValue({
default_value: _record.default && _record.default.default ? _record.default.default : null,
default_value: _record?.default?.default ?? null,
})
})
}