From b55ca479a4adce8909b53d49203df99cced5f7e0 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 8 Sep 2020 18:28:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E4=B8=8B=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=A2=9E=E5=8A=A0=E6=89=80=E5=B1=9E=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  |  7 +++--
 .../track/dto/TestPlanCaseDTO.java            |  1 +
 .../view/comonents/TestPlanTestCaseEdit.vue   |  7 +++++
 .../view/comonents/TestPlanTestCaseList.vue   | 31 ++++---------------
 4 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
index 938936e64d..577f53ed1f 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.xml
@@ -115,10 +115,11 @@
     </select>
 
     <select id="list" resultType="io.metersphere.track.dto.TestPlanCaseDTO">
-        select test_case.remark, test_plan_test_case.id as id, test_plan_test_case.*,test_case.*,test_case_node.name as model
+        select test_case.remark, test_plan_test_case.id as id, test_plan_test_case.*,test_case.*,test_case_node.name as model, project.name as projectName
         from test_plan_test_case
-        inner join test_case on test_plan_test_case.case_id = test_case.id left join test_case_node on
-        test_case_node.id=test_case.node_id
+        inner join test_case on test_plan_test_case.case_id = test_case.id
+        left join test_case_node on test_case_node.id=test_case.node_id
+        inner join project on project.id = test_case.project_id
         <where>
             <if test="request.combine != null">
                 <include refid="combine">
diff --git a/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java b/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java
index 09815e6dff..d677de4b0b 100644
--- a/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java
+++ b/backend/src/main/java/io/metersphere/track/dto/TestPlanCaseDTO.java
@@ -17,4 +17,5 @@ public class TestPlanCaseDTO extends TestCaseWithBLOBs {
     private String issues;
     private String reportId;
     private String model;
+    private String projectName;
 }
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
index c524c9ef3f..c8a2b56e08 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseEdit.vue
@@ -89,6 +89,13 @@
                 <span class="cast_item">{{testCase.nodePath}}</span>
               </el-col>
               <el-col :span="4" :offset="1">
+                <span class="cast_label">{{$t('test_track.plan.plan_project')}}：</span>
+                <span class="cast_item">{{testCase.projectName}}</span>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :offset="1">
                 <span class="cast_label">{{$t('test_track.case.prerequisite')}}：</span>
                 <span class="cast_item">{{testCase.prerequisite}}</span>
               </el-col>
diff --git a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
index 068bce4c17..1853f209cb 100644
--- a/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/TestPlanTestCaseList.vue
@@ -15,13 +15,6 @@
             <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
                              :content="$t('test_track.plan_view.relevance_test_case')"
                              @click="$emit('openTestCaseRelevanceDialog')"/>
-<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-unlock"-->
-<!--                             :content="$t('test_track.plan_view.cancel_relevance')" @click="handleBatch('delete')"/>-->
-<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-edit-outline"-->
-<!--                             :content="$t('test_track.plan_view.change_execution_results')"-->
-<!--                             @click="handleBatch('status')"/>-->
-<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-user"-->
-<!--                             :content="$t('test_track.plan_view.change_executor')" @click="handleBatch('executor')"/>-->
             <ms-table-button :is-tester-permission="true" v-if="!testPlan.reportId" icon="el-icon-document"
                              :content="$t('test_track.plan_view.create_report')" @click="openTestReport"/>
             <ms-table-button :is-tester-permission="true" v-if="testPlan.reportId" icon="el-icon-document"
@@ -103,7 +96,12 @@
         </el-table-column>
 
         <el-table-column
-          prop="nodePath"
+          prop="projectName"
+          :label="$t('test_track.plan.plan_project')"
+          show-overflow-tooltip>
+        </el-table-column>
+
+        <el-table-column
           :label="$t('test_track.issue.issue')"
           show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -112,7 +110,6 @@
               width="400"
               trigger="hover">
               <el-table border class="adjust-table" :data="scope.row.issuesContent" style="width: 100%">
-<!--                <el-table-column prop="id" label="缺陷ID" show-overflow-tooltip/>-->
                 <el-table-column prop="title" :label="$t('test_track.issue.title')" show-overflow-tooltip/>
                 <el-table-column prop="description" :label="$t('test_track.issue.description')">
                   <template v-slot:default="scope">
@@ -127,7 +124,6 @@
                     </el-popover>
                   </template>
                 </el-table-column>
-<!--                <el-table-column prop="status" label="缺陷状态"/>-->
                 <el-table-column prop="platform" :label="$t('test_track.issue.platform')"/>
               </el-table>
               <el-button slot="reference" type="text">{{scope.row.issuesSize}}</el-button>
@@ -262,7 +258,6 @@
         currentPage: 1,
         pageSize: 10,
         total: 0,
-        // selectIds: new Set(),
         selectRows: new Set(),
         testPlan: {},
         isReadOnly: false,
@@ -369,7 +364,6 @@
                 })
               }
             }
-            // this.selectIds.clear();
             this.selectRows.clear();
           });
         }
@@ -380,7 +374,6 @@
       },
       refresh() {
         this.condition = {components: TEST_CASE_CONFIGS};
-        // this.selectIds.clear();
         this.selectRows.clear();
         this.$emit('refresh');
       },
@@ -443,13 +436,6 @@
         });
       },
       handleSelectAll(selection) {
-        // if (selection.length > 0) {
-        //   this.tableData.forEach(item => {
-        //     this.selectIds.add(item.id);
-        //   });
-        // } else {
-        //   this.selectIds.clear();
-        // }
         if (selection.length > 0) {
           if (selection.length === 1) {
             this.selectRows.add(selection[0]);
@@ -467,11 +453,6 @@
         }
       },
       handleSelectionChange(selection, row) {
-        // if (this.selectIds.has(row.id)) {
-        //   this.selectIds.delete(row.id);
-        // } else {
-        //   this.selectIds.add(row.id);
-        // }
         if (this.selectRows.has(row)) {
           this.$set(row, "showMore", false);
           this.selectRows.delete(row);