From 60650c79582c44b1e11a4ce523e21b8db25f3a03 Mon Sep 17 00:00:00 2001 From: song-cc-rock Date: Tue, 28 May 2024 16:03:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1041272 --user=宋昌昌 【系统设置】组织-模板-创建zentao缺陷模板时字段设置错误的提示信息优化 https://www.tapd.cn/55049933/s/1522220 --- .../framework/sdk/src/main/resources/i18n/commons.properties | 1 + .../sdk/src/main/resources/i18n/commons_en_US.properties | 1 + .../sdk/src/main/resources/i18n/commons_zh_CN.properties | 1 + .../sdk/src/main/resources/i18n/commons_zh_TW.properties | 1 + .../system/controller/handler/result/CommonResultCode.java | 2 +- 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/framework/sdk/src/main/resources/i18n/commons.properties b/backend/framework/sdk/src/main/resources/i18n/commons.properties index 558b2ba5ab..5bcadfd747 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons.properties @@ -418,6 +418,7 @@ internal_custom_field_permission_error=系统字段或模板无法删除！ internal_template_permission_error=系统模板无法删除！ default_template_permission_error=默认模板无法删除！ field_validate_error={0}字段参数值不合法 +simple_field_validate_error_tips=字段参数值不合法, 请检查必填项或默认值! status_definition_required_error=该状态无法取消 #result message diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties index 46f89fab17..60add6a40c 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_en_US.properties @@ -427,6 +427,7 @@ internal_custom_field_permission_error=System fields cannot be deleted！ internal_template_permission_error=System template cannot be deleted！ default_template_permission_error=Default templates cannot be deleted！ field_validate_error=The field {0} value is invalid +simple_field_validate_error_tips=The field parameter value is invalid, please check the required field or the default value! status_definition_required_error=This status cannot be canceled #result message diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties index a45b2e2d31..7c9e7eb9ba 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_CN.properties @@ -425,6 +425,7 @@ internal_custom_field_permission_error=系统字段或模板无法删除！ internal_template_permission_error=系统模板无法删除！ default_template_permission_error=默认模板无法删除！ field_validate_error={0}字段参数值不合法 +simple_field_validate_error_tips=字段参数值不合法, 请检查必填项或默认值! status_definition_required_error=该状态无法取消 #result message diff --git a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties index 0d8ca83080..2852fc1006 100644 --- a/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/commons_zh_TW.properties @@ -424,6 +424,7 @@ internal_custom_field_permission_error=系統字段或模板無法刪除！ internal_template_permission_error=系統模板無法刪除！ default_template_permission_error=默认模板无法删除！ field_validate_error={0}字段參數值不合法 +simple_field_validate_error_tips=字段參數值不合法, 請檢查必填項或默認值! status_definition_required_error=該狀態無法取消 #result message diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/result/CommonResultCode.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/result/CommonResultCode.java index 3126369092..a0a30bd539 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/result/CommonResultCode.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/handler/result/CommonResultCode.java @@ -27,7 +27,7 @@ public enum CommonResultCode implements IResultCode { DEFAULT_TEMPLATE_PERMISSION(100014, "default_template_permission_error"), STATUS_ITEM_NOT_EXIST(100015, "status_item.not.exist"), STATUS_ITEM_EXIST(100016, "status_item.exist"), - FIELD_VALIDATE_ERROR(100017, "field_validate_error"), + FIELD_VALIDATE_ERROR(100017, "simple_field_validate_error_tips"), STATUS_DEFINITION_REQUIRED_ERROR(100018, "status_definition_required_error"), ADMIN_USER_ROLE_PERMISSION(100019, "internal_admin_user_role_permission_error");