From ee740ad063b936265781b4cbd7340fc2c2ce796d Mon Sep 17 00:00:00 2001
From: song-cc-rock <changchang.song@fit2cloud.com>
Date: Thu, 18 Aug 2022 16:54:43 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E5=9B=9E=E6=94=B6=E7=AB=99=E5=B7=A6=E4=BE=A7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=A0=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--task=1008552 --bug=1015939,1015927,1015930 --user=宋昌昌
https://www.tapd.cn/55049933/s/1226931
https://www.tapd.cn/55049933/s/1226965
https://www.tapd.cn/55049933/s/1226980
---
 .../base/mapper/ext/ExtTestCaseMapper.java    |  2 +
 .../base/mapper/ext/ExtTestCaseMapper.xml     | 12 ++++++
 .../track/service/TestCaseNodeService.java    |  3 ++
 .../components/search/MsTableAdvSearchBar.vue |  3 ++
 .../components/track/case/TestCase.vue        | 15 +++++++-
 .../track/case/components/TestCaseList.vue    | 38 ++++++++++++++++---
 .../track/module/TestCaseTrashNodeTree.vue    |  6 ++-
 7 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
index 6605adda9e..4897d9dac2 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.java
@@ -164,4 +164,6 @@ public interface ExtTestCaseMapper {
     int bathUpdateByCondition(@Param("request") QueryTestCaseRequest condition, @Param("record") TestCaseWithBLOBs testCaseWithBLOBs);
 
     List<TestCaseNodeDTO> getWorkspaceCountNodes(@Param("request") QueryTestCaseRequest request);
+
+    void updateNoModuleTrashNodeToDefault(@Param("projectId") String projectId, @Param("defaultNodeId") String defaultNodeId, @Param("defaultNodePath") String defaultNodePath);
 }
diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
index 89ee022465..40b2902244 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml
@@ -1351,4 +1351,16 @@
         and p.workspace_id = #{request.workspaceId}
         group by tcn.id;
     </select>
+
+    <update id="updateNoModuleTrashNodeToDefault">
+        update test_case
+        set node_id = #{defaultNodeId},
+            node_path = #{defaultNodePath}
+        where project_id = #{projectId}
+        and status = 'Trash'
+        and latest = true
+        and node_id not in (
+            select id from test_case_node where project_id = #{projectId}
+            )
+    </update>
 </mapper>
diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
index a11a979644..3d60c7fbee 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
@@ -280,6 +280,9 @@ public class TestCaseNodeService extends NodeTreeService<TestCaseNodeDTO> {
     }
 
     public List<TestCaseNodeDTO> getTrashCaseNode(String projectId, QueryTestCaseRequest request) {
+        // 初始化回收站中模块被删除的用例, 挂在默认未规划模块, 获取回收站模块节点数据
+        TestCaseNode defaultNode = this.getDefaultNode(projectId);
+        extTestCaseMapper.updateNoModuleTrashNodeToDefault(projectId, defaultNode.getId(), defaultNode.getName());
         request.setProjectId(projectId);
         request.setNodeIds(null);
         List<TestCaseNodeDTO> countModules = extTestCaseMapper.getCountNodes(request);
diff --git a/frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue b/frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
index 879a0faedb..6133dca975 100644
--- a/frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
+++ b/frontend/src/business/components/common/components/search/MsTableAdvSearchBar.vue
@@ -125,6 +125,9 @@ export default {
         condition['customs'] = [];
       }
       let value = component.value;
+      if (component.label === '用例状态' && value.length === 1 && value.indexOf('Trash') > -1) {
+        return;
+      }
       if (component.type === "multipleMember" || component.type === "checkbox" || component.type === "multipleSelect") {
         try {
           value = JSON.stringify(component.value);
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 1f374add7b..a49fcfa45e 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -39,7 +39,7 @@
 
     <ms-main-container>
       <el-tabs v-model="activeName" @tab-click="addTab" @tab-remove="closeConfirm">
-        <el-tab-pane name="trash" v-if="trashEnable" :label="$t('commons.trash')">
+        <el-tab-pane name="trash" v-if="trashEnable" :label="$t('commons.trash')" :closable="true">
           <ms-tab-button
             :isShowChangeButton="false">
             <template v-slot:version>
@@ -318,11 +318,16 @@ export default {
         this.$refs.minder.refresh();
       }
       if (oldVal === 'trash' && newVal === 'default') {
+        this.condition.filters.status = [];
         // 在回收站恢复后，切到列表页面刷新
         if (!this.hasRefreshDefault) {
           this.refreshAll();
           this.hasRefreshDefault = true;
+        } else {
+          this.refresh();
         }
+      } else if (newVal === 'default') {
+        this.refresh();
       }
     },
     activeDom(newVal, oldVal) {
@@ -551,6 +556,14 @@ export default {
       }
     },
     closeConfirm(targetName) {
+      this.activeName = 'default';
+      if (targetName === 'trash') {
+        this.trashEnable = false;
+      } else {
+        this.closeTabWithSave(targetName);
+      }
+    },
+    closeTabWithSave(targetName) {
       let t = this.tabs.filter(tab => tab.name === targetName);
       let message = "";
       if (t && this.$store.state.testCaseMap.has(t[0].testCaseInfo.id) && this.$store.state.testCaseMap.get(t[0].testCaseInfo.id) > 0) {
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 1a37d9655b..7525be0097 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -651,6 +651,26 @@ export default {
         // todo 处理高级搜索自定义字段部分
         this.condition.components = this.condition.components.filter(item => item.custom !== true);
         let comp = getAdvSearchCustomField(this.condition, this.testCaseTemplate.customFields);
+        // 系统字段国际化处理
+        comp.filter(element => {
+          if (element.label === '责任人') {
+            element.label = this.$t('custom_field.case_maintainer')
+          }
+          if (element.label === '用例等级') {
+            element.label = this.$t('custom_field.case_priority')
+          }
+          if (element.label === '用例状态') {
+            element.label = this.$t('custom_field.case_status')
+            // 回收站TAB页处理高级搜索用例状态字段
+            if (this.trashEnable) {
+              element.options = [{text: this.$t('test_track.plan.plan_status_trash'), value: 'Trash'}];
+            } else {
+              element.options.forEach(option => {
+                option.text = this.$t(option.text)
+              })
+            }
+          }
+        })
         this.condition.components.push(...comp);
         this.setTestCaseDefaultValue(template);
         this.typeArr = [];
@@ -694,18 +714,24 @@ export default {
         return row.priority;
       } else if (field.name === '责任人') {
         return row.maintainerName;
+      } else if (field.name === '用例状态') {
+        value = value === 'Trash' ? this.$t('test_track.plan.plan_status_trash') : value
       }
       return value ? value : defaultVal;
     },
     getCustomFieldFilter(field) {
       if (field.name === '用例状态') {
         let option = [];
-        field.options.forEach((item) => {
-          option.push({
-            text: this.$t(item.text),
-            value: item.value
-          })
-        });
+        if (this.trashEnable) {
+          option.push({text: this.$t('test_track.plan.plan_status_trash'), value: 'Trash'});
+        } else {
+          field.options.forEach((item) => {
+            option.push({
+              text: this.$t(item.text),
+              value: item.value
+            })
+          });
+        }
         return option;
       }
       return getCustomFieldFilter(field, this.userFilter);
diff --git a/frontend/src/business/components/track/module/TestCaseTrashNodeTree.vue b/frontend/src/business/components/track/module/TestCaseTrashNodeTree.vue
index 61f86bdb06..12ca59eb56 100644
--- a/frontend/src/business/components/track/module/TestCaseTrashNodeTree.vue
+++ b/frontend/src/business/components/track/module/TestCaseTrashNodeTree.vue
@@ -29,7 +29,11 @@ export default {
     },
     list() {
       this.result = getTestCaseTrashNodes(this.caseCondition, data => {
-        this.trashTreeNodes = data;
+        if (data && data.length > 0) {
+          this.trashTreeNodes = data[0].children;
+        } else {
+          this.trashTreeNodes = [];
+        }
         if (this.$refs.trashNodeTree) {
           this.trashTreeNodes.forEach(firstLevel => {
               this.$refs.trashNodeTree.nodeExpand(firstLevel);