From 97ec0ebf452b7434f4155db0fbc087edb2c0e051 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 18 Jan 2022 12:25:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=AF=AF=E6=8A=A5=E5=BA=93):=20=E8=AF=AF?=
 =?UTF-8?q?=E6=8A=A5=E5=BA=93=E7=BB=B4=E6=8A=A4=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=89=B9=E9=87=8F=E5=85=A8=E9=80=89=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

误报库维护页面增加批量全选功能操作
---
 .../io/metersphere/dto/BaseConditionDTO.java   | 18 ++++++++++++++++++
 frontend/src/i18n/en-US.js                     |  4 +++-
 frontend/src/i18n/zh-CN.js                     |  4 +++-
 frontend/src/i18n/zh-TW.js                     |  4 +++-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 backend/src/main/java/io/metersphere/dto/BaseConditionDTO.java

diff --git a/backend/src/main/java/io/metersphere/dto/BaseConditionDTO.java b/backend/src/main/java/io/metersphere/dto/BaseConditionDTO.java
new file mode 100644
index 0000000000..e25d3cc8e0
--- /dev/null
+++ b/backend/src/main/java/io/metersphere/dto/BaseConditionDTO.java
@@ -0,0 +1,18 @@
+package io.metersphere.dto;
+
+import io.metersphere.controller.request.OrderRequest;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+import java.util.Map;
+
+@Getter
+@Setter
+public class BaseConditionDTO {
+    private Map<String, String> filters;
+    private List<OrderRequest> orders;
+    private String projectId;
+    private boolean selectAll;
+    private List<String> unSelectIds;
+}
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index b0fabdc7be..cd0442c7dd 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -2954,10 +2954,12 @@ export default {
     use_desc: "In case of conflict between error code and error assertions, it is treated as error code",
     option: {
       name: "Err code",
-      error_code: "Err code",
+      error_code: "Name",
       match_type: "Match",
       status: "Status",
       is_open: "Is open",
+      create: "Create",
+      match_rule: "Rule",
     },
     match_type: {
       text: "TXT"
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index d8a5e6c35f..6fc914833e 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -2958,10 +2958,12 @@ export default {
     use_desc: "失败断言与误报规则冲突时统一处理为误报",
     option: {
       name: "误报",
-      error_code: "错误码",
+      error_code: "误报名称",
       match_type: "匹配类型",
       status: "状态",
       is_open: "启用状态",
+      create: "创建误报",
+      match_rule: "匹配规则",
     },
     match_type: {
       text: "文本"
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 2c8fdb48f6..a7e8aed151 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -2957,10 +2957,12 @@ export default {
     use_desc: "失敗斷言與誤報規則衝突時統一處理為誤報",
     option: {
       name: "誤報",
-      error_code: "錯誤碼",
+      error_code: "誤報名稱",
       match_type: "匹配類型",
       status: "狀態",
       is_open: "啟用狀態",
+      create: "創建誤報",
+      match_rule: "匹配規則",
     },
     match_type: {
       text: "文本"