From c3aab868440020219fde28929f98f1cee2440c16 Mon Sep 17 00:00:00 2001
From: songlh <song.lhlh@gmail.com>
Date: Tue, 17 Dec 2024 15:12:44 +0800
Subject: [PATCH] fix(ui): ci - number type attr default value display error
---
.../cmdb/views/ci/modules/createInstanceFormByGroup.vue | 5 +++--
.../src/modules/cmdb/views/ci_types/attributeEditForm.vue | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue b/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue
index 8b0e8d2..bbed6e3 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue
@@ -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
}
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
index 3da1a64..6ecce96 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue
@@ -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,
})
})
}