diff --git a/cmdb-ui/src/modules/cmdb/lang/en.js b/cmdb-ui/src/modules/cmdb/lang/en.js
index 3b087f8..cb2c082 100644
--- a/cmdb-ui/src/modules/cmdb/lang/en.js
+++ b/cmdb-ui/src/modules/cmdb/lang/en.js
@@ -230,6 +230,7 @@ const cmdb_en = {
attributeAssociationTip6: 'Cannot be deleted again.',
attributeAssociationTip7: '1. The attribute value types of the source model and target model must be consistent.',
attributeAssociationTip8: '2. One To Many: Source model can select multiple value attributes',
+ attributeAssociationTip9: '3. Many To Many: Either the source model or the target model can be a multi-valued attribute.',
show: 'show attribute',
setAsShow: 'Set as show attribute',
cancelSetAsShow: 'Cancel show attribute',
diff --git a/cmdb-ui/src/modules/cmdb/lang/zh.js b/cmdb-ui/src/modules/cmdb/lang/zh.js
index 70845e1..d8a11ff 100644
--- a/cmdb-ui/src/modules/cmdb/lang/zh.js
+++ b/cmdb-ui/src/modules/cmdb/lang/zh.js
@@ -230,6 +230,7 @@ const cmdb_zh = {
attributeAssociationTip6: '不可再删除',
attributeAssociationTip7: '1. 源模型和目标模型的属性值类型必须保持一致',
attributeAssociationTip8: '2. 一对多:源模型可选多值属性',
+ attributeAssociationTip9: '3. 多对多:源模型和目标模型其中任何一个可为多值属性',
show: '展示属性',
setAsShow: '设置为展示属性',
cancelSetAsShow: '取消设置为展示属性',
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 eb86f07..c19e06b 100644
--- a/cmdb-ui/src/modules/cmdb/views/ci_types/relationTable.vue
+++ b/cmdb-ui/src/modules/cmdb/views/ci_types/relationTable.vue
@@ -55,6 +55,7 @@
{{ $t('cmdb.ciType.attributeAssociationTip1') }}
{{ $t('cmdb.ciType.attributeAssociationTip7') }}
{{ $t('cmdb.ciType.attributeAssociationTip8') }}
+ {{ $t('cmdb.ciType.attributeAssociationTip9') }}
@@ -228,6 +229,7 @@
{{ $t('cmdb.ciType.attributeAssociationTip7') }}
{{ $t('cmdb.ciType.attributeAssociationTip8') }}
+ {{ $t('cmdb.ciType.attributeAssociationTip9') }}
!attr.is_list)
}
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 2b8d5fb..31fbac3 100644
--- a/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue
+++ b/cmdb-ui/src/modules/cmdb/views/model_relation/index.vue
@@ -67,6 +67,7 @@
{{ $t('cmdb.ciType.attributeAssociationTip7') }}
{{ $t('cmdb.ciType.attributeAssociationTip8') }}
+ {{ $t('cmdb.ciType.attributeAssociationTip9') }}
!attr.is_list)
}
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 79cdbee..afabbd2 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
@@ -43,6 +43,7 @@
{{ $t('cmdb.ciType.attributeAssociationTip1') }}
{{ $t('cmdb.ciType.attributeAssociationTip7') }}
{{ $t('cmdb.ciType.attributeAssociationTip8') }}
+ {{ $t('cmdb.ciType.attributeAssociationTip9') }}
@@ -327,7 +328,8 @@ export default {
const constraintValue = Number(constraint)
if (
(constraintValue === 0 && type === 'child') ||
- constraintValue === 1
+ constraintValue === 1 ||
+ (constraintValue === 2 && relationAttr?.is_list)
) {
return filterAttrs.filter((attr) => !attr.is_list)
}