+
-
- {{ valueTypeMap[typeKey] }}
+
+ {{ item.value }}
@@ -200,7 +200,7 @@ import AttributeEditForm from './attributeEditForm.vue'
import NewCiTypeAttrModal from './newCiTypeAttrModal.vue'
import UniqueConstraint from './uniqueConstraint.vue'
import { valueTypeMap } from '../../utils/const'
-import { getPropertyIcon } from '../../utils/helper'
+import { getPropertyIcon, getPropertyType } from '../../utils/helper'
export default {
name: 'AttributesTable',
@@ -243,7 +243,12 @@ export default {
return this.$store.state.windowHeight
},
valueTypeMap() {
- return valueTypeMap()
+ const map = valueTypeMap()
+ const keys = ['0', '1', '2', '9', '3', '4', '5', '6', '7', '8', '10', '11']
+ return keys.map((key) => ({
+ key,
+ value: map[key]
+ }))
},
},
provide() {
@@ -585,23 +590,8 @@ export default {
if (!attrTypeFilter.length) {
return true
} else {
- if (attrTypeFilter.includes('7') && attr.is_password) {
- return true
- }
- if (attrTypeFilter.includes('8') && attr.is_link) {
- return true
- }
- if (
- attrTypeFilter.includes(attr.value_type) &&
- attr.value_type === '2' &&
- (attr.is_password || attr.is_link)
- ) {
- return false
- }
- if (attrTypeFilter.includes(attr.value_type)) {
- return true
- }
- return false
+ const valueType = getPropertyType(attr)
+ return attrTypeFilter.includes(valueType)
}
})
},
@@ -618,6 +608,12 @@ export default {
.ci-types-attributes {
padding: 0 20px;
overflow-y: auto;
+
+ &-flex {
+ display: flex;
+ flex-wrap: wrap;
+ }
+
.ci-types-attributes-filter {
color: @text-color_4;
cursor: pointer;
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue
index 0b5a66b..9b42f0d 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue
@@ -46,16 +46,21 @@
v-decorator="['value_type', { rules: [{ required: true }], initialValue: '2' }]"
@change="handleChangeValueType"
>
-
- {{ value }}
- yyyy-mm-dd HH:MM:SS
- yyyy-mm-dd
- HH:MM:SS
+
+
+ {{ item.value }}
+ {{ $t('cmdb.ciType.shortTextTip') }}
+ yyyy-mm-dd HH:MM:SS
+ yyyy-mm-dd
+ HH:MM:SS
-
+
+
@@ -148,9 +152,19 @@
+
+
+
+
-
+
@@ -199,7 +213,7 @@
@@ -212,7 +226,7 @@
@@ -221,8 +235,8 @@
>{{ $t('cmdb.ciType.defaultShow') }}
@@ -256,7 +270,7 @@
-
+
{{ $t('cmdb.ciType.list') }}
+ >
+ {{ $t('cmdb.ciType.list') }}
{{ $t('cmdb.ciType.isDynamic') }}
+ >
+ {{ $t('cmdb.ciType.isDynamic') }}
{{ $t('cmdb.ciType.advancedSettings') }}
-
+
-
+
-
+
-
+
-
+
{{ $t('cmdb.ciType.computedAttribute') }}
+ >
+ {{ $t('cmdb.ciType.computedAttribute') }}
({
+ key,
+ value: map[key]
+ }))
},
canDefineScript() {
return this.canDefineComputed
},
},
methods: {
+ getPropertyIcon,
handleSubmit(isCloseModal = true) {
this.form.validateFields(async (err, values) => {
if (!err) {
@@ -456,7 +487,9 @@ export default {
const data = { is_required, default_show, is_dynamic }
delete values.is_required
delete values.default_show
- if (values.value_type === '0' && default_value) {
+ if (values.value_type === '10') {
+ values.default = { default: values.is_list ? (default_value || null) : Boolean(default_value) }
+ } else if (values.value_type === '0' && default_value) {
if (values.is_list) {
values.default = { default: default_value || null }
} else {
@@ -489,39 +522,48 @@ export default {
values = { ...values, ...computedAreaData }
} else {
// If it is a non-computed attribute, check to see if there is a predefined value
- if (!['6', '7'].includes(values.value_type)) {
+ if (!['6', '7', '10', '11'].includes(values.value_type)) {
const preValueAreaData = this.$refs.preValueArea.getData()
values = { ...values, ...preValueAreaData }
}
}
const fontOptions = this.$refs.fontArea.getData()
- // is_index: except for text, the index is hidden, text index default is true
- // 5 types in the box, is_index=true
- // json, password, link is_index=false
- if (['6', '7', '8'].includes(values.value_type)) {
- values.is_index = false
- } else if (values.value_type !== '2') {
- values.is_index = true
- }
- if (values.value_type === '7') {
- values.value_type = '2'
- values.is_password = true
- }
- if (values.value_type === '8') {
- values.value_type = '2'
- values.is_link = true
- }
- if (values.value_type !== '6') {
- values.re_check = this.re_check?.value ?? null
+ // 索引
+ values.is_index = !['6', '7', '8', '9', '11'].includes(values.value_type)
+
+ // 重置数据类型
+ switch (values.value_type) {
+ case '7':
+ values.value_type = '2'
+ values.is_password = true
+ break
+ case '8':
+ values.value_type = '2'
+ values.is_link = true
+ break
+ case '9':
+ values.value_type = '2'
+ break
+ case '10':
+ values.value_type = '7'
+ values.is_bool = true
+ break
+ case '11':
+ values.value_type = '0'
+ values.is_reference = true
+ break
+ default:
+ break
}
+
const { attr_id } = await createAttribute({ ...values, option: { fontOptions } })
this.form.resetFields()
- this.currentValueType = '2'
- if (!['6'].includes(values.value_type) && !values.is_password) {
+ if (this?.$refs?.preValueArea) {
this.$refs.preValueArea.valueList = []
}
+ this.currentValueType = '2'
this.$emit('done', attr_id, data, isCloseModal)
} else {
throw new Error()
@@ -540,11 +582,12 @@ export default {
}
},
handleChangeValueType(value) {
- this.currentValueType = value
this.$nextTick(() => {
- this.form.setFieldsValue({
- default_value: this.form.getFieldValue('is_list') || value === '0' ? [] : null,
- })
+ this.currentValueType = value
+ if (['6', '10', '11'].includes(value)) {
+ this.re_check = {}
+ }
+ this.handleSwitchType({ valueType: value })
})
},
onChange(checked, property) {
@@ -560,9 +603,7 @@ export default {
}
}
if (property === 'is_list') {
- this.form.setFieldsValue({
- default_value: checked ? [] : '',
- })
+ this.handleSwitchType({ checked })
}
if (checked && property === 'is_sortable') {
this.$message.warning(this.$t('cmdb.ciType.addAttributeTips1'))
@@ -579,6 +620,33 @@ export default {
})
}
},
+
+ handleSwitchType({
+ checked,
+ valueType
+ }) {
+ checked = checked ?? this.form.getFieldValue('is_list')
+ valueType = valueType ?? this.currentValueType
+
+ let defaultValue = checked || valueType === '0' ? [] : ''
+
+ switch (valueType) {
+ case '2':
+ case '9':
+ defaultValue = ''
+ break
+ case '10':
+ defaultValue = checked ? '' : false
+ break
+ default:
+ break
+ }
+
+ this.form.setFieldsValue({
+ default_value: defaultValue,
+ })
+ },
+
onJsonChange(value) {
this.default_value_json_right = true
},
@@ -629,6 +697,9 @@ export default {
line-height: 22px;
color: #a5a9bc;
}
+.value-type-text {
+ margin: 0 4px;
+}
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/relationAD.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/relationAD.vue
index 2383f40..0353046 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/relationAD.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/relationAD.vue
@@ -137,6 +137,7 @@ import {
getCITypeChildren,
getCITypeParent
} from '../../api/CITypeRelation.js'
+import { getCITypeAttributesById } from '../../api/CITypeAttr'
export default {
name: 'RelationAutoDiscovery',
@@ -169,7 +170,18 @@ export default {
methods: {
async getCITypeAttributes() {
const res = await getCITypeAttributes(this.CITypeId)
- this.ciTypeADTAttributes = res.map((item) => {
+ const attr = await getCITypeAttributesById(this.CITypeId)
+
+ const filterAttr = res.filter((name) => {
+ const currentAttr = attr?.attributes?.find((item) => item?.name === name)
+ if (!currentAttr) {
+ return true
+ }
+
+ return this.filterAttributes(name)
+ })
+
+ this.ciTypeADTAttributes = filterAttr.map((item) => {
return {
id: item,
value: item,
@@ -239,7 +251,7 @@ export default {
const peer_type_id = item.peer_type_id
const attributes = this?.relationOptions?.find((option) => option?.value === peer_type_id)?.attributes
- item.attributes = attributes
+ item.attributes = attributes.filter((attr) => this.filterAttributes(attr))
item.peer_attr_id = undefined
})
},
@@ -288,6 +300,15 @@ export default {
this.getCITypeRelations()
}
},
+
+ filterAttributes(attr) {
+ // filter password/json/is_list/longText/bool/reference
+ if (attr?.value_type === '2' && !attr?.is_index) {
+ return false
+ }
+
+ return !attr?.is_password && !attr?.is_list && attr?.value_type !== '6' && !attr?.is_bool && !attr?.is_reference
+ },
},
}
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/relationTable.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/relationTable.vue
index 8346a22..2a19985 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/relationTable.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/relationTable.vue
@@ -598,8 +598,14 @@ export default {
})
},
filterAttributes(attributes) {
- // filter password/json/is_list
- return attributes.filter((attr) => !attr.is_password && !attr.is_list && attr.value_type !== '6')
+ // filter password/json/is_list/longText/bool/reference
+ return attributes.filter((attr) => {
+ if (attr.value_type === '2' && !attr.is_index) {
+ return false
+ }
+
+ return !attr.is_password && !attr.is_list && attr.value_type !== '6' && !attr.is_bool && !attr.is_reference
+ })
},
addTableAttr() {
this.tableAttrList.push({
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
index db6abf4..ad871e6 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/triggerForm.vue
@@ -471,10 +471,15 @@ export default {
this.dateForm = _.cloneDeep(this.defaultDateForm)
this.notifies = _.cloneDeep(this.defaultNotify)
this.category = 1
- this.triggerAction = '1'
this.filterExp = ''
this.selectedBot = undefined
- this.visible = false
+ if (this.$refs.noticeContent) {
+ this.$refs.noticeContent.destroy()
+ }
+
+ this.$nextTick(() => {
+ this.visible = false
+ })
},
filterChange(value) {
this.filterValue = value
diff --git a/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue b/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue
index d5a1d25..442da89 100644
--- a/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue
@@ -364,8 +364,14 @@ export default {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
},
filterAttributes(attributes) {
- // filter password/json/is_list
- return attributes.filter((attr) => !attr.is_password && !attr.is_list && attr.value_type !== '6')
+ // filter password/json/is_list/longText/bool/reference
+ return attributes.filter((attr) => {
+ if (attr.value_type === '2' && !attr.is_index) {
+ return false
+ }
+
+ return !attr.is_password && !attr.is_list && attr.value_type !== '6' && !attr.is_bool && !attr.is_reference
+ })
},
addModalAttr() {
diff --git a/cmdb-ui/src/modules/cmdb/views/model_relation/modules/modelRelationTable.vue b/cmdb-ui/src/modules/cmdb/views/model_relation/modules/modelRelationTable.vue
index 31134a7..40484b4 100644
--- a/cmdb-ui/src/modules/cmdb/views/model_relation/modules/modelRelationTable.vue
+++ b/cmdb-ui/src/modules/cmdb/views/model_relation/modules/modelRelationTable.vue
@@ -306,8 +306,14 @@ export default {
return _find?.alias ?? _find?.name ?? id
},
filterAttributes(attributes) {
- // filter password/json/is_list
- return attributes.filter((attr) => !attr.is_password && !attr.is_list && attr.value_type !== '6')
+ // filter password/json/is_list/longText/bool/reference
+ return attributes.filter((attr) => {
+ if (attr.value_type === '2' && !attr.is_index) {
+ return false
+ }
+
+ return !attr.is_password && !attr.is_list && attr.value_type !== '6' && !attr.is_bool && !attr.is_reference
+ })
},
addTableAttr() {
diff --git a/cmdb-ui/src/modules/cmdb/views/relation_views/modules/AddTableModal.vue b/cmdb-ui/src/modules/cmdb/views/relation_views/modules/AddTableModal.vue
index e1238b1..5f2236f 100644
--- a/cmdb-ui/src/modules/cmdb/views/relation_views/modules/AddTableModal.vue
+++ b/cmdb-ui/src/modules/cmdb/views/relation_views/modules/AddTableModal.vue
@@ -1,250 +1,260 @@
-
-
-
-
-
- 新增
-
-
-
-
-
- {{ JSON.stringify(row[col.field]) }}
-
-
-
-
-
-
+
+
+ 新增
+
+
+
+
+
+
+ {{ id }}
+
+
+
+ {{ JSON.stringify(row[col.field]) }}
+
+
+
+
+
+