diff --git a/backend/framework/sdk/src/main/resources/i18n/bug.properties b/backend/framework/sdk/src/main/resources/i18n/bug.properties index f2cb2bec97..0645257cae 100644 --- a/backend/framework/sdk/src/main/resources/i18n/bug.properties +++ b/backend/framework/sdk/src/main/resources/i18n/bug.properties @@ -80,7 +80,7 @@ bug_relation_case.create_user.length_range=创建人长度必须在1-50之间 bug_not_exist=缺陷不存在 not_local_bug_error=非本地缺陷,无法操作 bug_tags_size_large_than=缺陷标签数量超过{0}个 -third_party_not_config=项目应用设置的同步配置未启用, 或服务集成配置为空及未启用; +third_party_not_config=请正确配置服务集成或项目应用设置的参数, 并启用; bug_attachment_upload_error=缺陷附件上传失败 bug_attachment_link_error=缺陷附件关联失败 bug_attachment_delete_error=缺陷附件删除失败 diff --git a/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties b/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties index 9fabd75d2d..697a467063 100644 --- a/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties +++ b/backend/framework/sdk/src/main/resources/i18n/bug_en_US.properties @@ -80,7 +80,7 @@ bug_relation_case.create_user.length_range=createUser length must be between 1-5 bug_not_exist=Bug does not exist bug_tags_size_large_than=Bug size large than {0} not_local_bug_error=Not local bug, error -third_party_not_config=Please correctly configure the service integration or project application settings and enable them; +third_party_not_config=Please configure the service integration or project application settings correctly and enable them; bug_attachment_upload_error=Bug attachment upload error bug_attachment_link_error=Bug attachment link error bug_attachment_delete_error=Bug attachment delete error diff --git a/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties b/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties index a8e98ef5d7..1b092bd2c7 100644 --- a/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties +++ b/backend/framework/sdk/src/main/resources/i18n/bug_zh_CN.properties @@ -80,7 +80,7 @@ bug_relation_case.create_user.length_range=创建人长度必须在1-50之间 bug_not_exist=缺陷不存在 not_local_bug_error=非本地缺陷,无法操作 bug_tags_size_large_than=缺陷标签数量超过{0}个 -third_party_not_config=请正确配置服务集成或项目应用设置的同步缺陷参数, 并启用; +third_party_not_config=请正确配置服务集成或项目应用设置的参数, 并启用; bug_attachment_upload_error=缺陷附件上传失败 bug_attachment_link_error=缺陷附件关联失败 bug_attachment_delete_error=缺陷附件删除失败 diff --git a/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties b/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties index 1b4d03f75d..c31a3859e6 100644 --- a/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties +++ b/backend/framework/sdk/src/main/resources/i18n/bug_zh_TW.properties @@ -79,7 +79,7 @@ bug_relation_case.create_user.length_range=创建人長度必須在1-50之間 # error bug_not_exist=缺陷不存在 not_local_bug_error=非本地缺陷,無法操作 -third_party_not_config=請正確配置服務集成或項目應用設置的同步缺陷參數, 並啟用; +third_party_not_config=請正確配置服務集成或項目應用設置的參數, 並啟用; bug_tags_size_large_than=缺陷标签数量超过{0}个 bug_attachment_upload_error=缺陷附件上傳失敗 bug_attachment_link_error=缺陷附件關聯失敗 diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/dto/response/BugDetailDTO.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/dto/response/BugDetailDTO.java index 3c224a3a7b..879dac7338 100644 --- a/backend/services/bug-management/src/main/java/io/metersphere/bug/dto/response/BugDetailDTO.java +++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/dto/response/BugDetailDTO.java @@ -46,6 +46,9 @@ public class BugDetailDTO { @Schema(description = "是否平台默认模板") private Boolean platformDefault; + @Schema(description = "所属平台") + private String platform; + @Schema(description = "是否关注") private Boolean followFlag; diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java index db46430e0d..b7b63f6b3e 100644 --- a/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java +++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/service/BugService.java @@ -254,6 +254,7 @@ public class BugService { detail.setNum(bug.getNum()); detail.setProjectId(bug.getProjectId()); detail.setTemplateId(template.getId()); + detail.setPlatform(bug.getPlatform()); detail.setPlatformDefault(template.getPlatformDefault()); detail.setStatus(bug.getStatus()); detail.setPlatformBugId(bug.getPlatformBugId()); diff --git a/frontend/src/components/pure/ms-table/columnSelector.vue b/frontend/src/components/pure/ms-table/columnSelector.vue index e756519bcb..12e4dd53aa 100644 --- a/frontend/src/components/pure/ms-table/columnSelector.vue +++ b/frontend/src/components/pure/ms-table/columnSelector.vue @@ -5,6 +5,7 @@ unmount-on-close :footer="false" :title="t('msTable.columnSetting.display')" + class="column-drawer" @cancel="handleCancel" >
@@ -88,7 +89,7 @@ >
-
+
{{ t((element.title || element.columnTitle) as string) }}
@@ -254,3 +255,9 @@ line-height: 16px; } + + diff --git a/frontend/src/views/bug-management/components/bug-detail-drawer.vue b/frontend/src/views/bug-management/components/bug-detail-drawer.vue index 76672cb1aa..f1d208240c 100644 --- a/frontend/src/views/bug-management/components/bug-detail-drawer.vue +++ b/frontend/src/views/bug-management/components/bug-detail-drawer.vue @@ -17,6 +17,18 @@ :mask="false" @loaded="loadedBug" > +