diff --git a/cmdb-ui/src/components/CMDBFilterComp/expression.vue b/cmdb-ui/src/components/CMDBFilterComp/expression.vue index cfc3b9e..2520604 100644 --- a/cmdb-ui/src/components/CMDBFilterComp/expression.vue +++ b/cmdb-ui/src/components/CMDBFilterComp/expression.vue @@ -139,9 +139,9 @@ :normalizer=" (node) => { return { - id: String(node[0]), - label: node[1].label || node[0], - children: node.children, + id: String(node[0] || ''), + label: node[1] ? node[1].label || node[0] : node[0], + children: node.children && node.children.length ? node.children : undefined, } } " diff --git a/cmdb-ui/src/components/tools/UserMenu.vue b/cmdb-ui/src/components/tools/UserMenu.vue index 678b2ca..f028f72 100644 --- a/cmdb-ui/src/components/tools/UserMenu.vue +++ b/cmdb-ui/src/components/tools/UserMenu.vue @@ -118,6 +118,8 @@ export default { .locale { cursor: pointer; + padding: 0 8px; + &:hover { color: @primary-color; } @@ -135,6 +137,7 @@ export default { display: flex; align-items: center; justify-content: center; + margin: 0 8px; &-icon { font-size: 12px; diff --git a/cmdb-ui/src/modules/cmdb/router/index.js b/cmdb-ui/src/modules/cmdb/router/index.js index 97dd766..47765f6 100644 --- a/cmdb-ui/src/modules/cmdb/router/index.js +++ b/cmdb-ui/src/modules/cmdb/router/index.js @@ -102,7 +102,7 @@ const genCmdbRoutes = async () => { name: 'cmdb_ci_type', component: RouteView, redirect: '/cmdb/ci_type', - meta: { title: 'cmdb.menu.backendManage', icon: 'veops-setting2', permission: ['cmdb_admin', 'OneOPS_Application_Admin', 'admin'], }, + meta: { title: 'cmdb.menu.backendManage', icon: 'veops-setting2', selectedIcon: 'veops-setting2', permission: ['cmdb_admin', 'OneOPS_Application_Admin', 'admin'], }, children: [ { path: '/cmdb/customdashboard', 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 8aee21f..621675f 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci/modules/createInstanceFormByGroup.vue @@ -45,14 +45,7 @@ attr.name, { rules: [{ required: attr.is_required, message: $t('placeholder2') + `${attr.alias || attr.name}` }], - initialValue: - attr.default && attr.default.default - ? attr.is_list - ? Array.isArray(attr.default.default) - ? attr.default.default - : attr.default.default.split(',') - : attr.default.default - : attr.is_list ? [] : null, + initialValue: getChoiceDefault(attr), }, ]" :placeholder="$t('placeholder2')" @@ -216,6 +209,35 @@ export default { jsonEditorOk(jsonData) { this.form.setFieldsValue({ [this.editAttr.name]: JSON.stringify(jsonData) }) }, + + getChoiceDefault(attr) { + if (!attr?.default?.default) { + return attr.is_list ? [] : null + } + + if (attr.is_list) { + let defaultValue = [] + if (Array.isArray(attr.default.default)) { + defaultValue = attr.default.default + } else { + defaultValue = String(attr.default.default).split(',') + } + if (['0', '1', '11'].includes(attr.value_type)) { + defaultValue = defaultValue?.map((item) => { + const numberValue = Number(item) + return Number.isNaN(numberValue) ? item : numberValue + }) + } + return defaultValue + } + + let defaultValue = attr.default.default + if (['0', '1', '11'].includes(attr.value_type)) { + const numberValue = Number(defaultValue) + defaultValue = Number.isNaN(numberValue) ? attr.default.default : numberValue + } + return defaultValue + } }, } diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue index 67de7a1..18a2c21 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/ciTypedetail.vue @@ -62,11 +62,8 @@ export default { mounted() { this.$nextTick(() => { switch (this.activeKey) { - case '6': - this.$refs.triggerTable.getTableData() - break case '5': - this.$refs.reconciliationTable.getTableData() + this.$refs.triggerTable.getTableData() break default: break @@ -87,11 +84,8 @@ export default { case '1': this.$refs.attributesTable.getCITypeGroupData() break - case '6': - this.$refs.triggerTable.getTableData() - break case '5': - this.$refs.reconciliationTable.getTableData() + this.$refs.triggerTable.getTableData() break default: break diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueAttr/attrFilter/valueControls.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueAttr/attrFilter/valueControls.vue index e8bb410..481d8be 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueAttr/attrFilter/valueControls.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueAttr/attrFilter/valueControls.vue @@ -87,9 +87,9 @@ :normalizer=" (node) => { return { - id: node[0], - label: node[1].label || node[0], - children: node.children, + id: String(node[0] || ''), + label: node[1] ? node[1].label || node[0] : node[0], + children: node.children && node.children.length ? node.children : undefined, } } " diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueAttr/builtin/userFilterComp/index.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueAttr/builtin/userFilterComp/index.vue index 2cab506..b77c3a6 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueAttr/builtin/userFilterComp/index.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueAttr/builtin/userFilterComp/index.vue @@ -166,7 +166,6 @@