diff --git a/cmdb-ui/src/modules/cmdb/lang/en.js b/cmdb-ui/src/modules/cmdb/lang/en.js index e5fbb69..20d882e 100644 --- a/cmdb-ui/src/modules/cmdb/lang/en.js +++ b/cmdb-ui/src/modules/cmdb/lang/en.js @@ -130,6 +130,7 @@ const cmdb_en = { selectAttribute: 'Select Attribute', groupExisted: 'Group name already exists', attributeSortedTips: 'Attributes in other groups cannot be sorted. If you need to sort, please drag them to a custom group first!', + attributeSortedTips2: 'Non-inherited attributes cannot be inserted before inherited attributes!', buildinAttribute: 'built-in attributes', expr: 'Expression', code: 'Code', diff --git a/cmdb-ui/src/modules/cmdb/lang/zh.js b/cmdb-ui/src/modules/cmdb/lang/zh.js index 40fdc00..60f44f8 100644 --- a/cmdb-ui/src/modules/cmdb/lang/zh.js +++ b/cmdb-ui/src/modules/cmdb/lang/zh.js @@ -130,6 +130,7 @@ const cmdb_zh = { selectAttribute: '添加属性', groupExisted: '分组名称已存在', attributeSortedTips: '其他分组中的属性不能进行排序,如需排序请先拖至自定义的分组!', + attributeSortedTips2: '非继承属性不能插入到继承属性前!', buildinAttribute: '内置字段', expr: '表达式', code: '代码', diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/attributesTable.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/attributesTable.vue index 6e28ac1..f9fa995 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/attributesTable.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attributesTable.vue @@ -1,5 +1,6 @@