From 17856ece0145b2a2bc1add2035b82006cf82fdd0 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Thu, 2 Sep 2021 16:50:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=A8=E4=BE=8B=E8=84=91=E5=9B=BE?=
 =?UTF-8?q?=E5=92=8C=E5=88=97=E8=A1=A8=E9=A1=BA=E5=BA=8F=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/track/service/TestCaseService.java  |  7 +++++++
 .../components/common/components/table/MsTable.vue     | 10 +++++++---
 .../components/track/common/minder/TestCaseMinder.vue  |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
index 0c1b3212de..60d5af13a9 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -1486,6 +1486,13 @@ public class TestCaseService {
     }
 
     public List<TestCaseWithBLOBs> listTestCaseForMinder(QueryTestCaseRequest request) {
+        List<OrderRequest> orderList = ServiceUtils.getDefaultOrder(request.getOrders());
+        OrderRequest order = new OrderRequest();
+        // 对模板导入的测试用例排序
+        order.setName("sort");
+        order.setType("desc");
+        orderList.add(order);
+        request.setOrders(orderList);
         request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
         return extTestCaseMapper.listForMinder(request);
     }
diff --git a/frontend/src/business/components/common/components/table/MsTable.vue b/frontend/src/business/components/common/components/table/MsTable.vue
index e111e9d286..f80eaeb89a 100644
--- a/frontend/src/business/components/common/components/table/MsTable.vue
+++ b/frontend/src/business/components/common/components/table/MsTable.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="tableActive">
     <el-table
       border
       :data="data"
@@ -115,6 +115,7 @@ export default {
       selectDataCounts: 0,
       selectRows: new Set(),
       selectIds: [],
+      tableActive: true,
       hasBatchTipShow: false
     };
   },
@@ -349,13 +350,16 @@ export default {
     },
     resetHeader() {
       this.$emit('update:fields', getCustomTableHeader(this.fieldKey, this.customFields));
-      this.doLayout();
+      this.reloadTable();
     },
     toggleRowSelection() {
       this.$refs.table.toggleRowSelection();
     },
     reloadTable() {
-      this.doLayout();
+      this.tableActive = false;
+      this.$nextTick(() => {
+        this.tableActive = true;
+      });
     }
   }
 };
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index 848bc45286..036a959308 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -95,6 +95,7 @@ name: "TestCaseMinder",
       return {
         request: {
           projectId: this.projectId,
+          orders: this.condition.orders
         },
         result: this.result,
         isDisable: false