From cb58177c62665a402d38feeef09a891cb8358b9b Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 3 Aug 2020 14:52:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8Dcase=E5=AF=BC=E5=87=BA=E5=90=8E=EF=BC=8Cxl?=
 =?UTF-8?q?s=E6=89=93=E5=BC=80=E9=A1=BA=E5=BA=8F=E4=B8=8D=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/base/mapper/ext/ExtTestCaseMapper.xml   | 7 ++++++-
 .../track/request/testcase/TestCaseBatchRequest.java       | 2 ++
 .../java/io/metersphere/track/service/TestCaseService.java | 7 +++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

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 5e91d2dd43..af48a713cb 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
@@ -235,7 +235,12 @@
                 </foreach>
             </if>
         </where>
-        order by update_time desc
+        <if test="request.orders != null and request.orders.size() > 0">
+            order by
+            <foreach collection="request.orders" separator="," item="order">
+                ${order.name} ${order.type}
+            </foreach>
+        </if>
     </select>
 
     <select id="getMaxNumByProjectId" resultType="io.metersphere.base.domain.TestCase">
diff --git a/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseBatchRequest.java b/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseBatchRequest.java
index fb725d62c2..2faea63877 100644
--- a/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseBatchRequest.java
+++ b/backend/src/main/java/io/metersphere/track/request/testcase/TestCaseBatchRequest.java
@@ -1,6 +1,7 @@
 package io.metersphere.track.request.testcase;
 
 import io.metersphere.base.domain.TestCaseWithBLOBs;
+import io.metersphere.controller.request.OrderRequest;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,4 +11,5 @@ import java.util.List;
 @Setter
 public class TestCaseBatchRequest extends TestCaseWithBLOBs {
     private List<String> ids;
+    private List<OrderRequest> orders;
 }
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 f1bfb4612c..d6c7a199c0 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java
@@ -356,6 +356,12 @@ public class TestCaseService {
     }
 
     private List<TestCaseExcelData> generateTestCaseExcel(TestCaseBatchRequest request) {
+        List<OrderRequest> orderList = ServiceUtils.getDefaultOrder(request.getOrders());
+        OrderRequest order = new OrderRequest();
+        order.setName("sort");
+        order.setType("desc");
+        orderList.add(order);
+        request.setOrders(orderList);
         List<TestCaseDTO> TestCaseList = extTestCaseMapper.listByTestCaseIds(request);
         List<TestCaseExcelData> list = new ArrayList<>();
         StringBuilder step = new StringBuilder("");
@@ -466,6 +472,7 @@ public class TestCaseService {
 
     /**
      * 导入用例前，检查数据库是否存在此用例
+     *
      * @param testCaseWithBLOBs
      * @return
      */

From 82eb4a4e7ae8cbc12aa22116ba226f518e9c10ea Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Mon, 3 Aug 2020 18:44:14 +0800
Subject: [PATCH 2/4] =?UTF-8?q?style(api):=20=E5=88=A0=E9=99=A4=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/metersphere/api/controller/APITestController.java | 4 ----
 .../main/java/io/metersphere/api/service/APITestService.java  | 3 ---
 2 files changed, 7 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index 82e9a2819f..b95c35cce8 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -47,10 +47,6 @@ public class APITestController {
         return apiTestService.getApiTestByProjectId(projectId);
     }
 
-    @GetMapping("/state/get/{testId}")
-    public ApiTest apiState(@PathVariable String testId) {
-        return apiTestService.getApiTestByTestId(testId);
-    }
 
     @PostMapping(value = "/schedule/update")
     public void updateSchedule(@RequestBody Schedule request) {
diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index 44a25e32d9..13f41da08b 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -126,9 +126,6 @@ public class APITestService {
         return null;
     }
 
-    public ApiTest getApiTestByTestId(String testId) {
-        return apiTestMapper.selectByPrimaryKey(testId);
-    }
 
     public List<ApiTest> getApiTestByProjectId(String projectId) {
         return extApiTestMapper.getApiTestByProjectId(projectId);

From eebfb7211011070819bee7d62a45dbfd55dd9833 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 4 Aug 2020 12:36:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?refactor(=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95):=20=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8Alabel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../performance/report/components/RequestStatistics.vue   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/performance/report/components/RequestStatistics.vue b/frontend/src/business/components/performance/report/components/RequestStatistics.vue
index 29f27afe96..5331ea2798 100644
--- a/frontend/src/business/components/performance/report/components/RequestStatistics.vue
+++ b/frontend/src/business/components/performance/report/components/RequestStatistics.vue
@@ -66,8 +66,8 @@
       <el-table-column label="Throughput">
         <el-table-column
           prop="transactions"
-          label="Transactions"
-          width="100"
+          label="Transactions/s"
+          width="150"
         />
       </el-table-column>
 
@@ -76,13 +76,13 @@
           prop="received"
           label="Received"
           align="center"
-          width="200"
+          width="150"
         />
         <el-table-column
           prop="sent"
           label="Sent"
           align="center"
-          width="200"
+          width="150"
         />
       </el-table-column>
 

From 58cfcb13fff6607599ca678cae898526cdd21157 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 4 Aug 2020 17:27:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):?=
 =?UTF-8?q?=20=E7=BB=84=E7=BB=87=E7=AE=A1=E7=90=86=E5=91=98=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4=E5=BC=B9=E6=A1=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/OrganizationWorkspace.vue    | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 86aecf23b6..890af868c3 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -39,9 +39,25 @@
           @confirm="submit('form')"/>
       </template>
     </el-dialog>
+    <el-dialog :title="$t('workspace.update')" :visible.sync="dialogWsUpdateVisible" width="30%">
+      <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="100px" size="small">
+        <el-form-item :label="$t('commons.name')" prop="name">
+          <el-input v-model="form.name" autocomplete="off"/>
+        </el-form-item>
+        <el-form-item :label="$t('commons.description')" prop="description">
+          <el-input type="textarea" v-model="form.description"></el-input>
+        </el-form-item>
+      </el-form>
+      <template v-slot:footer>
+        <ms-dialog-footer
+          @cancel="dialogWsUpdateVisible = false"
+          @confirm="submit('form')"/>
+      </template>
+    </el-dialog>
 
     <!-- dialog of workspace member -->
-    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc" class="dialog-css">
+    <el-dialog :visible.sync="dialogWsMemberVisible" width="70%" :destroy-on-close="true" @close="closeMemberFunc"
+               class="dialog-css">
       <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
                        :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       <!-- organization member table -->
@@ -201,8 +217,13 @@
             }
             this.$post("/workspace/" + saveType, this.form, () => {
               this.dialogWsAddVisible = false;
+              this.dialogWsUpdateVisible = false;
               this.list();
-              Message.success(this.$t('commons.save_success'));
+              if (saveType == 'add') {
+                Message.success(this.$t('commons.save_success'));
+              } else if (saveType == 'update') {
+                Message.success(this.$t('commons.modify_success'));
+              }
             });
           } else {
             return false;
@@ -210,7 +231,7 @@
         });
       },
       edit(row) {
-        this.dialogWsAddVisible = true;
+        this.dialogWsUpdateVisible = true;
         this.form = Object.assign({}, row);
       },
       handleDelete(workspace) {
@@ -423,6 +444,7 @@
       return {
         result: {},
         dialogWsAddVisible: false,
+        dialogWsUpdateVisible: false,
         dialogWsMemberVisible: false,
         dialogWsMemberAddVisible: false,
         dialogWsMemberUpdateVisible: false,