fix:字段组合模板因用模型的内置字段(bk_)提交报错 --bug=159428564

Author: elizabevil

resources/errors/common/default/common.json

@@ -90,6 +90,7 @@
     "1199090": "非法的正则表达式",
     "1199091": "至少设置[%s]和[%s]中的一个值",
     "1199092": "当前字段类型状态为单选，请设置合理数据",
+    "1199093": "'%s' 不能以bk_开头，该前缀为系统字段保留",
 
     "1109001": "保存操作审计日志失败",
     "1109002": "创建操作审计快照失败",

resources/errors/english/en/common.json

@@ -89,6 +89,7 @@
     "1199090": "Regular expression's type assertion failed",
     "1199091": "at least one of %s and %s must be set",
     "1199092": "current field type status is single choice, please set reasonable data",
+    "1199093": "'%s' cannot start with bk_, this prefix is reserved for system fields",
 
     "1109001": "save audit log failed",
     "1109002": "take audit log snapshot failed",

src/common/errInfo.go

@@ -243,6 +243,9 @@ const (
 	// 该状态码只提供给支持可多选字段校验报错时使用，目前用户类型，枚举多选，枚举引用，组织类型校验可多选报错时可以使用
 	CCErrCommParamsNeedSingleChoice = 1199092
 
+	// CCErrCommParamsReservedFieldPrefix the field id starts with reserved prefix bk_ or _bk
+	CCErrCommParamsReservedFieldPrefix = 1199093
+
 	// too many requests
 	CCErrTooManyRequestErr = 1199997
 

src/common/metadata/field_template.go

@@ -163,7 +163,7 @@ func (f *FieldTemplateAttr) validatePropertyID() ccErr.RawErrorInfo {
 	}
 
 	if strings.HasPrefix(f.PropertyID, "bk_") || strings.HasPrefix(f.PropertyID, "_bk") {
-		return ccErr.RawErrorInfo{ErrCode: common.CCErrCommParamsIsInvalid,
+		return ccErr.RawErrorInfo{ErrCode: common.CCErrCommParamsReservedFieldPrefix,
 			Args: []interface{}{common.BKPropertyIDField}}
 	}
 

src/ui/src/i18n/lang/cn.json

@@ -1800,6 +1800,7 @@
     "在实例中可编辑": "在实例中可编辑",
     "设置为必填项": "设置为必填项",
     "字段已在模板中存在，无法添加": "字段已在模板中存在，无法添加",
+    "内置字段，无法添加": "前缀bk_为内置字段，无法添加",
     "与已有字段的唯一标识或名称重复，请修改": "与已有字段的唯一标识或名称重复，请修改",
     "立即绑定": "立即绑定",
     "模型信息确认": "模型信息确认",

src/ui/src/i18n/lang/en.json

@@ -1793,6 +1793,7 @@
     "在实例中可编辑": "Editable in instance",
     "设置为必填项": "Required",
     "字段已在模板中存在，无法添加": "Field already exists in the template and cannot be added",
+    "内置字段，无法添加": "The bk_ prefix indicates a built-in field and cannot be added",
     "与已有字段的唯一标识或名称重复，请修改": "Duplicate with ID or Name of the existing field, please modify",
     "立即绑定": "Bind now",
     "模型信息确认": "Model information confirmation",

src/ui/src/views/field-template/children/model-field-selector.vue

@@ -59,6 +59,7 @@
       status.selected[prop.id] = selected.value.some(item => item.id === prop.id)
       status.disabled[prop.id] = props.templateFieldList.some(item => item.bk_property_id === prop.bk_property_id
         || item.bk_property_name === prop.bk_property_name)
+        || prop.bk_property_id.startsWith('bk_') || prop.bk_property_id.startsWith('_bk')
     })
     return status
   })
@@ -132,7 +133,9 @@
             :deletable="false"
             v-bk-tooltips="{
               disabled: !selectedStatus.disabled[field.id],
-              content: $t('字段已在模板中存在，无法添加')
+              content: field.bk_property_id.startsWith('bk_') || field.bk_property_id.startsWith('_bk')
+                ? $t('内置字段，无法添加')
+                : $t('字段已在模板中存在，无法添加')
             }"
             @click-field="handleSelect">
             <template #action-append>