From d42d8ec3183c66811085bb44b220821602624b88 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 9 Jul 2021 15:10:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92-?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtTestPlanApiCaseMapper.xml          | 8 +++++++-
 .../api/automation/scenario/ApiScenarioList.vue           | 8 --------
 .../view/comonents/functional/FunctionalTestCaseList.vue  | 1 +
 .../review/view/components/TestReviewTestCaseList.vue     | 8 --------
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
index 78c9790a70..31dcdf8142 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanApiCaseMapper.xml
@@ -88,6 +88,12 @@
                 #{value}
               </foreach>
             </when>
+            <when test="key == 'priority'">
+              and a.priority in
+              <foreach collection="values" item="value" separator="," open="(" close=")">
+                #{value}
+              </foreach>
+            </when>
           </choose>
         </if>
       </foreach>
@@ -230,4 +236,4 @@
     SELECT `status` FROM test_plan_api_case WHERE test_plan_id = #{0}
   </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index bd85703c20..49a51bb1d8 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -946,15 +946,7 @@ export default {
   height: 100% !important;
 }
 
-/*/deep/ .el-table__fixed {*/
-/*  height: 110px !important;*/
-/*}*/
-
 /deep/ .el-card__header {
   padding: 10px;
 }
-
-/deep/ .el-table__fixed-body-wrapper {
-  top: 48px !important;
-}
 </style>
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 139beab7d3..1dd4d6d0cf 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
@@ -205,6 +205,7 @@
         <ms-table-column v-for="field in testCaseTemplate.customFields" :key="field.id"
                          :filters="field.name === '用例等级' ? priorityFilters : null"
                          :field="item"
+                         column-key="priority"
                          :fields-width="fieldsWidth"
                          :label="field.name"
                          :min-width="90"
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
index 49ef3a35c7..59089cf113 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseList.vue
@@ -537,18 +537,10 @@ export default {
 </script>
 
 <style scoped>
-/*.ms-table-header {*/
-/*  margin: 5px;*/
-/*}*/
-
 /deep/ .table-title {
   height: 0px;
   font-weight: bold;
   font-size: 0px;
 }
-
-/deep/ .el-table__fixed-body-wrapper {
-  top: 48px !important;
-}
 </style>