From e843e3eac95b2e6a8426bbd7872faf1eb493adc7 Mon Sep 17 00:00:00 2001 From: songlh Date: Fri, 20 Sep 2024 15:36:19 +0800 Subject: [PATCH] feat: update computed attr tip --- cmdb-ui/src/modules/cmdb/lang/en.js | 1 + cmdb-ui/src/modules/cmdb/lang/zh.js | 1 + cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue | 1 + cmdb-ui/src/modules/cmdb/views/ci_types/ceateNewAttribute.vue | 1 + cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue | 1 + 5 files changed, 5 insertions(+) diff --git a/cmdb-ui/src/modules/cmdb/lang/en.js b/cmdb-ui/src/modules/cmdb/lang/en.js index 5f57c32..a6900ea 100644 --- a/cmdb-ui/src/modules/cmdb/lang/en.js +++ b/cmdb-ui/src/modules/cmdb/lang/en.js @@ -286,6 +286,7 @@ const cmdb_en = { attrCode: 'Attr Code', computedAttrTip1: 'Reference attributes follow jinja2 syntax', computedAttrTip2: `Multi-valued attributes (lists) are rendered with [ ] included by default, if you want to remove it, the reference method is: """{{ attr_name | join(',') }}""" where commas are separators`, + computedAttrTip3: `Cannot refer to other computed attributes`, example: 'Example', attrFilterTip: `The third column of values allows you to select attributes of this model to cascade attributes`, rule: 'Rule', diff --git a/cmdb-ui/src/modules/cmdb/lang/zh.js b/cmdb-ui/src/modules/cmdb/lang/zh.js index d1617f3..09fda24 100644 --- a/cmdb-ui/src/modules/cmdb/lang/zh.js +++ b/cmdb-ui/src/modules/cmdb/lang/zh.js @@ -286,6 +286,7 @@ const cmdb_zh = { attrCode: '属性代码', computedAttrTip1: '引用属性遵循jinja2语法', computedAttrTip2: `多值属性(列表)默认呈现包括[ ], 如果要去掉, 引用方法为: """{{ attr_name | join(',') }}""" 其中逗号为分隔符`, + computedAttrTip3: `不能引用其他计算属性`, example: '例如', attrFilterTip: '第三列值可选择本模型的属性,来实现级联属性的功能', rule: '规则', 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 90cca7f..3da1a64 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/attributeEditForm.vue @@ -398,6 +398,7 @@
1. {{ $t('cmdb.ciType.computedAttrTip1') }}
2. {{ $t('cmdb.ciType.computedAttrTip2') }}
+
3. {{ $t('cmdb.ciType.computedAttrTip3') }}
1. {{ $t('cmdb.ciType.computedAttrTip1') }}
2. {{ $t('cmdb.ciType.computedAttrTip2') }}
+
3. {{ $t('cmdb.ciType.computedAttrTip3') }}
diff --git a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue index d184163..286be29 100644 --- a/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue +++ b/cmdb-ui/src/modules/cmdb/views/ci_types/preValueArea.vue @@ -198,6 +198,7 @@
1. {{ $t('cmdb.ciType.computedAttrTip1') }}
2. {{ $t('cmdb.ciType.computedAttrTip2') }}
+
3. {{ $t('cmdb.ciType.computedAttrTip3') }}