From 4f3aa4b8aefadbb52ae0e3a429ab1a175d165286 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 2 Jun 2020 14:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtProjectMapper.xml           |  7 ++++++-
 .../controller/request/ProjectRequest.java         |  3 +++
 .../io/metersphere/service/ProjectService.java     |  2 ++
 .../src/business/components/project/MsProject.vue  | 14 +++++++++++---
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
index 2ccd8dede8..23ef69272d 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml
@@ -15,7 +15,12 @@
                 and w.id = #{proRequest.workspaceId}
             </if>
         </where>
-        order by p.update_time desc
+        <if test="proRequest.orders != null and proRequest.orders.size() > 0">
+            order by
+            <foreach collection="proRequest.orders" separator="," item="order">
+                p.${order.name} ${order.type}
+            </foreach>
+        </if>
     </select>
     <select id="getProjectIdByWorkspaceId" resultType="java.lang.String">
         select id
diff --git a/backend/src/main/java/io/metersphere/controller/request/ProjectRequest.java b/backend/src/main/java/io/metersphere/controller/request/ProjectRequest.java
index cf2a689215..59fbe7038a 100644
--- a/backend/src/main/java/io/metersphere/controller/request/ProjectRequest.java
+++ b/backend/src/main/java/io/metersphere/controller/request/ProjectRequest.java
@@ -3,9 +3,12 @@ package io.metersphere.controller.request;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public class ProjectRequest {
     private String workspaceId;
     private String name;
+    private List<OrderRequest> orders;
 }
diff --git a/backend/src/main/java/io/metersphere/service/ProjectService.java b/backend/src/main/java/io/metersphere/service/ProjectService.java
index cd1df1f0e7..7b9fb88c39 100644
--- a/backend/src/main/java/io/metersphere/service/ProjectService.java
+++ b/backend/src/main/java/io/metersphere/service/ProjectService.java
@@ -10,6 +10,7 @@ import io.metersphere.base.mapper.LoadTestMapper;
 import io.metersphere.base.mapper.ProjectMapper;
 import io.metersphere.base.mapper.ext.*;
 import io.metersphere.commons.exception.MSException;
+import io.metersphere.commons.utils.ServiceUtils;
 import io.metersphere.commons.utils.SessionUtils;
 import io.metersphere.controller.request.ProjectRequest;
 import io.metersphere.dto.ProjectDTO;
@@ -81,6 +82,7 @@ public class ProjectService {
         if (StringUtils.isNotBlank(request.getName())) {
             request.setName(StringUtils.wrapIfMissing(request.getName(), "%"));
         }
+        request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders()));
         return extProjectMapper.getProjectWithWorkspace(request);
     }
 
diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index fa77915cd1..c48df125f2 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -6,7 +6,7 @@
           <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search" @create="create"
                            :create-tip="btnTips" :title="title"/>
         </template>
-        <el-table :data="items" style="width: 100%">
+        <el-table :data="items" style="width: 100%" @sort-change="sort">
           <el-table-column prop="name" :label="$t('commons.name')">
             <template v-slot:default="scope">
               <el-link type="info" @click="link(scope.row)">{{ scope.row.name }}</el-link>
@@ -15,6 +15,8 @@
           <el-table-column prop="description" :label="$t('commons.description')"/>
           <!--<el-table-column prop="workspaceName" :label="$t('project.owning_workspace')"/>-->
           <el-table-column
+            sortable
+            prop="createTime"
             :label="$t('commons.create_time')"
             show-overflow-tooltip>
             <template v-slot:default="scope">
@@ -22,6 +24,8 @@
             </template>
           </el-table-column>
           <el-table-column
+            sortable
+            prop="updateTime"
             :label="$t('commons.update_time')"
             show-overflow-tooltip>
             <template v-slot:default="scope">
@@ -67,7 +71,7 @@
   import MsTableHeader from "../common/components/MsTableHeader";
   import MsTableOperator from "../common/components/MsTableOperator";
   import MsDialogFooter from "../common/components/MsDialogFooter";
-  import {getCurrentUser} from "../../../common/js/utils";
+  import {_sort, getCurrentUser} from "../../../common/js/utils";
   import MsContainer from "../common/components/MsContainer";
   import MsMainContainer from "../common/components/MsMainContainer";
 
@@ -228,7 +232,11 @@
             path: '/api/test/list/' + row.id
           })
         }
-      }
+      },
+      sort(column) {
+        _sort(column, this.condition);
+        this.list();
+      },
     }
   }
 </script>