From aac1261bb98fbdf3cab3b8e36dcd44825db2a9e2 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Wed, 23 Feb 2022 21:44:07 +0800
Subject: [PATCH] =?UTF-8?q?reverse(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E5=9B=9E=E9=80=80=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E4=B8=8B=E4=B8=80=E9=A1=B5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ext/ExtTestPlanTestCaseMapper.java |  2 -
 .../mapper/ext/ExtTestPlanTestCaseMapper.xml  | 27 --------------
 .../TestPlanTestCaseController.java           |  5 ---
 .../service/TestPlanTestCaseService.java      |  5 ---
 .../components/MsPreviousNextButton.vue       | 12 ++----
 .../functional/FunctionalTestCaseEdit.vue     | 37 ++++++-------------
 .../functional/FunctionalTestCaseList.vue     | 18 ++-------
 7 files changed, 19 insertions(+), 87 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
index 22da17d0ad..b7082a410b 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanTestCaseMapper.java
@@ -19,8 +19,6 @@ public interface ExtTestPlanTestCaseMapper {
 
     List<TestPlanCaseDTO> list(@Param("request") QueryTestPlanCaseRequest request);
 
-    List<String> nameList(@Param("request") QueryTestPlanCaseRequest request);
-
     List<TestPlanCaseDTO> listByPlanId(@Param("request") QueryTestPlanCaseRequest request);
 
     List<TestPlanCaseDTO> listByNode(@Param("request") QueryTestPlanCaseRequest request);
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 3c99eec98d..53b6282a6f 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
@@ -268,33 +268,6 @@
         </if>
     </select>
 
-    <select id="nameList" resultType="java.lang.String">
-        select test_case.name
-        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 project on project.id = test_case.project_id
-        left join project_version on project_version.id = test_case.version_id and project.id =
-        project_version.project_id
-        <include refid="queryWhereCondition"/>
-        <if test="request.orders != null and request.orders.size() > 0">
-            order by
-            <foreach collection="request.orders" separator="," item="order">
-                <choose>
-                    <when test="order.name == 'custom_num'">
-                        customNum ${order.type}
-                    </when>
-                    <when test="order.name == 'name'">
-                        test_case.name ${order.type}
-                    </when>
-                    <otherwise>
-                        test_plan_test_case.${order.name} ${order.type}
-                    </otherwise>
-                </choose>
-            </foreach>
-        </if>
-    </select>
-
     <select id="selectIds" resultType="java.lang.String">
         select distinct test_plan_test_case.id as id
         from test_plan_test_case
diff --git a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
index 95495c4949..003de8c8c5 100644
--- a/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
+++ b/backend/src/main/java/io/metersphere/track/controller/TestPlanTestCaseController.java
@@ -33,11 +33,6 @@ public class TestPlanTestCaseController {
         return PageUtils.setPageInfo(page, testPlanTestCaseService.list(request));
     }
 
-    @PostMapping("/nameList")
-    public List<String> getTestPlanCaseNames(@RequestBody QueryTestPlanCaseRequest request) {
-        return testPlanTestCaseService.getTestPlanCaseNames(request);
-    }
-
     /*jenkins测试计划下全部用例*/
     @GetMapping("/list/{planId}")
     public List<TestPlanCaseDTO> getTestPlanCaseByPlanId(@PathVariable String planId) {
diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
index 895b07d45f..2074a68cb0 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestPlanTestCaseService.java
@@ -435,9 +435,4 @@ public class TestPlanTestCaseService {
                 testPlanTestCaseMapper::updateByPrimaryKeySelective);
     }
 
-    public List<String> getTestPlanCaseNames(QueryTestPlanCaseRequest request) {
-        request.setOrders(ServiceUtils.getDefaultSortOrder(request.getOrders()));
-        List<String> list = extTestPlanTestCaseMapper.nameList(request);
-        return list;
-    }
 }
diff --git a/frontend/src/business/components/common/components/MsPreviousNextButton.vue b/frontend/src/business/components/common/components/MsPreviousNextButton.vue
index 59d6c3bf89..ed680a7d8c 100644
--- a/frontend/src/business/components/common/components/MsPreviousNextButton.vue
+++ b/frontend/src/business/components/common/components/MsPreviousNextButton.vue
@@ -1,17 +1,17 @@
 <template>
   <span class="previous-next-button">
     <span class="head-right-tip" v-if="countNum === total">
-      {{ $t('test_track.plan_view.pre_case') }} : {{ testCaseNameArr[countNum - 1] ? testCaseNameArr[countNum - 1] : '' }}
+      {{ $t('test_track.plan_view.pre_case') }} : {{list[index - 1] ? list[index - 1].name : ''}}
     </span>
     <span class="head-right-tip" v-if="countNum !== total">
-      {{ $t('test_track.plan_view.next_case') }} : {{ testCaseNameArr[countNum] ? testCaseNameArr[countNum] : '' }}
+      {{ $t('test_track.plan_view.next_case') }} : {{list[index + 1] ? list[index + 1].name : ''}}
     </span>
 
     <el-button plain size="mini" icon="el-icon-arrow-up" :disabled="countNum <= 1" @click="handlePre()"/>
     <span>
       {{ countNum }}/{{ total }}
     </span>
-    <el-button plain size="mini" icon="el-icon-arrow-down" :disabled="(countNum+1) >= total" @click="handleNext()"/>
+    <el-button plain size="mini" icon="el-icon-arrow-down" :disabled="countNum >= total" @click="handleNext()"/>
   </span>
 </template>
 
@@ -54,9 +54,6 @@ export default {
         return 0
       }
     },
-    testCaseNameArr: {
-      type: Array
-    },
     pageSize: {
       type: Number,
       default() {
@@ -69,9 +66,6 @@ export default {
       this.countNum = this.pageSize * (this.pageNum - 1) + this.index + 1;
     }
   },
-  mounted() {
-    this.countNum = this.pageSize * (this.pageNum - 1) + this.index + 1;
-  },
   methods: {
     handlePre() {
       this.$emit('pre');
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
index 441b1b49be..3bf0901987 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseEdit.vue
@@ -32,14 +32,12 @@
                         :page-num="pageNum"
                         :page-size="pageSize"
                         :page-total="pageTotal"
-                        :test-case-name-arr="testCaseNames"
                         :total="total"
                         @pre="handlePre"
                         @next="saveCase(true, true)"
                         :list="testCases"/>
-                      <el-button class="save-btn" type="primary" size="mini" :disabled="isReadOnly"
-                                 @click="saveCase(true)">
-                        {{ $t('test_track.save') }} & {{ $t('test_track.next') }}
+                      <el-button class="save-btn" type="primary" size="mini" :disabled="isReadOnly" @click="saveCase(true)">
+                        {{$t('test_track.save')}} & {{$t('test_track.next')}}
                       </el-button>
                     </el-col>
 
@@ -48,9 +46,7 @@
                   <el-row class="head-bar">
                     <el-col>
                       <el-divider content-position="left">
-                        <el-button class="test-case-name" type="text" @click="openTestTestCase(testCase)">
-                          {{ testCase.name }}
-                        </el-button>
+                        <el-button class="test-case-name" type="text" @click="openTestTestCase(testCase)">{{ testCase.name }}</el-button>
                       </el-divider>
                     </el-col>
                   </el-row>
@@ -62,16 +58,14 @@
 
                     <el-row>
                       <el-col :span="7">
-                        <el-form-item :label="$t('test_track.case.module')" prop="nodePath"
-                                      :label-width="formLabelWidth">
-                          {{ testCase.nodePath }}
-                        </el-form-item>
+                        <el-form-item :label="$t('test_track.case.module')" prop="nodePath" :label-width="formLabelWidth">
+                          {{testCase.nodePath}}
+                        </el-form-item >
                       </el-col>
                       <el-col :span="7">
-                        <el-form-item :label="$t('test_track.plan.plan_project')" prop="projectName"
-                                      :label-width="formLabelWidth">
-                          {{ testCase.projectName }}
-                        </el-form-item>
+                        <el-form-item :label="$t('test_track.plan.plan_project')" prop="projectName" :label-width="formLabelWidth">
+                          {{testCase.projectName}}
+                        </el-form-item >
                       </el-col>
                       <el-col :span="10">
                         <test-plan-test-case-status-button class="status-button"
@@ -116,7 +110,7 @@
                       <test-case-edit-other-info :plan-id="testCase.planId" v-if="otherInfoActive" @openTest="openTest"
                                                  :read-only="true" :is-test-plan="true" :project-id="testCase.projectId"
                                                  :form="testCase" :case-id="testCase.caseId" ref="otherInfo"/>
-                    </el-form-item>
+                    </el-form-item >
 
                   </el-form>
                 </div>
@@ -170,8 +164,7 @@ import {SYSTEM_FIELD_NAME_MAP} from "@/common/js/table-constants";
 import IssueDescriptionTableItem from "@/business/components/track/issue/IssueDescriptionTableItem";
 import StepChangeItem from "@/business/components/track/case/components/StepChangeItem";
 import TestCaseStepItem from "@/business/components/track/case/components/TestCaseStepItem";
-import TestPlanCaseStepResultsItem
-  from "@/business/components/track/plan/view/comonents/functional/TestPlanCaseStepResultsItem";
+import TestPlanCaseStepResultsItem from "@/business/components/track/plan/view/comonents/functional/TestPlanCaseStepResultsItem";
 
 export default {
   name: "FunctionalTestCaseEdit",
@@ -231,9 +224,6 @@ export default {
     searchParam: {
       type: Object
     },
-    testCaseNames: {
-      type: Array
-    },
     pageNum: Number,
     pageSize: {
       type: Number,
@@ -492,10 +482,7 @@ export default {
           break;
         }
         case "testcase": {
-          let caseData = this.$router.resolve({
-            name: 'ApiDefinition',
-            params: {redirectID: getUUID(), dataType: "apiTestCase", dataSelectRange: 'single:' + id}
-          });
+          let caseData = this.$router.resolve({name:'ApiDefinition',params:{redirectID:getUUID(),dataType:"apiTestCase",dataSelectRange:'single:'+id}});
           window.open(caseData.href, '_blank');
           break;
         }
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 6abc3004dd..0cd9084950 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -162,7 +162,7 @@
           :fields-width="fieldsWidth"
           :label="$t('test_track.plan_view.executor')">
           <template v-slot:default="scope">
-            {{ scope.row.executorName }}
+            {{scope.row.executorName}}
           </template>
         </ms-table-column>
 
@@ -231,11 +231,10 @@
                          :prop="field.name">
           <template v-slot="scope">
               <span v-if="field.name === '用例等级'">
-                  <priority-table-item
-                    :value="getCustomFieldValue(scope.row, field) ? getCustomFieldValue(scope.row, field) : scope.row.priority"/>
+                  <priority-table-item :value="getCustomFieldValue(scope.row, field) ? getCustomFieldValue(scope.row, field) : scope.row.priority"/>
               </span>
             <span v-else>
-                {{ getCustomFieldValue(scope.row, field) }}
+                {{getCustomFieldValue(scope.row, field)}}
               </span>
           </template>
         </ms-table-column>
@@ -254,7 +253,6 @@
       @nextPage="nextPage"
       @prePage="prePage"
       @refresh="initTableData"
-      :test-case-names="testCaseNameArr"
       :test-cases="tableData"
       :is-read-only="isReadOnly"
       :total="total"
@@ -326,7 +324,6 @@ export default {
       fieldsWidth: getCustomTableWidth('TEST_PLAN_FUNCTION_TEST_CASE'),
       screenHeight: 'calc(100vh - 275px)',
       tableLabel: [],
-      testCaseNameArr: [],
       result: {},
       deletePath: "/test/case/delete",
       condition: {
@@ -539,15 +536,8 @@ export default {
             callback();
           }
         });
-        this.selectTestCaseName(this.condition);
       }
     },
-    selectTestCaseName(condition){
-      this.result = this.$post("/test/plan/case/nameList", this.condition, response => {
-        let data = response.data;
-        this.testCaseNameArr = data;
-      });
-    },
     autoCheckStatus() {
       if (!this.planId) {
         return;
@@ -682,7 +672,7 @@ export default {
     getVersionOptions() {
       if (hasLicense()) {
         this.$get('/project/version/get-project-versions/' + getCurrentProjectID(), response => {
-          this.versionOptions = response.data;
+          this.versionOptions= response.data;
           this.versionFilters = response.data.map(u => {
             return {text: u.name, value: u.id};
           });