From df1c5b29627292185d30d4f9ca1f201b0cdafa73 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 9 Jul 2021 14:21:19 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BC=BA=E9=99=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtIssuesMapper.xml       | 30 +++++++++----------
 .../metersphere/track/issue/TapdPlatform.java |  4 +--
 .../common/components/table/MsTableColumn.vue | 10 +++++--
 .../components/track/issue/IssueList.vue      | 10 +++++--
 frontend/src/common/js/tableUtils.js          |  6 ++--
 5 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
index 0983f88adf..adabd9ee1c 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtIssuesMapper.xml
@@ -71,22 +71,20 @@
 <!--                </foreach>-->
 <!--            </if>-->
 
-
-<!--            <if test="request.filters != null and request.filters.size() > 0">-->
-<!--                <foreach collection="request.filters.entrySet()" index="key" item="values">-->
-<!--                    <if test="values != null and values.size() > 0">-->
-<!--                        <choose>-->
-<!--                            <when test="key == 'scene'">-->
-<!--                                AND cf.scene IN-->
-<!--                                <foreach collection="values" item="value" separator="," open="(" close=")">-->
-<!--                                    #{value}-->
-<!--                                </foreach>-->
-<!--                            </when>-->
-<!--                        </choose>-->
-<!--                    </if>-->
-<!--                </foreach>-->
-<!--            </if>-->
-
+            <if test="request.filters != null and request.filters.size() > 0">
+                <foreach collection="request.filters.entrySet()" index="key" item="values">
+                    <if test="values != null and values.size() > 0">
+                        <choose>
+                            <when test="key == 'platform'">
+                                AND issues.platform IN
+                                <foreach collection="values" item="value" separator="," open="(" close=")">
+                                    #{value}
+                                </foreach>
+                            </when>
+                        </choose>
+                    </if>
+                </foreach>
+            </if>
         </where>
     </sql>
 
diff --git a/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java b/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
index 15cc81bf9c..453b22a0c3 100644
--- a/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
+++ b/backend/src/main/java/io/metersphere/track/issue/TapdPlatform.java
@@ -194,8 +194,8 @@ public class TapdPlatform extends AbstractIssuePlatform {
     @Override
     public void syncIssues(Project project, List<IssuesDao> tapdIssues) {
         int pageNum = 1;
-        int limit = 200;
-        int count = 200;
+        int limit = 50;
+        int count = 50;
 
         List<String> ids = tapdIssues.stream()
                 .map(Issues::getId)
diff --git a/frontend/src/business/components/common/components/table/MsTableColumn.vue b/frontend/src/business/components/common/components/table/MsTableColumn.vue
index 1ff4370c44..2473b91b3b 100644
--- a/frontend/src/business/components/common/components/table/MsTableColumn.vue
+++ b/frontend/src/business/components/common/components/table/MsTableColumn.vue
@@ -6,7 +6,7 @@
       :fixed="fixed"
       :filters="filters"
       :prop="prop"
-      :column-key="prop"
+      :column-key="columnKey ? columnKey : prop"
       :label="label"
       :sortable="sortable"
       :show-overflow-tooltip="showOverflowTooltip">
@@ -50,7 +50,13 @@ export default {
       }
     },
     // 保存自定义列宽
-    fieldsWidth: Object
+    fieldsWidth: Object,
+    columnKey: {
+      type: String,
+      default() {
+        return null;
+      }
+    }
   }
 };
 </script>
diff --git a/frontend/src/business/components/track/issue/IssueList.vue b/frontend/src/business/components/track/issue/IssueList.vue
index 2a3cb8c1a1..01fd791929 100644
--- a/frontend/src/business/components/track/issue/IssueList.vue
+++ b/frontend/src/business/components/track/issue/IssueList.vue
@@ -62,6 +62,7 @@
           <ms-table-column
             :field="item"
             :fields-width="fieldsWidth"
+            :filters="platformFilters"
             :label="$t('test_track.issue.platform')"
             prop="platform">
           </ms-table-column>
@@ -69,6 +70,7 @@
           <ms-table-column
                   :field="item"
                   :fields-width="fieldsWidth"
+                  sortable
                   :label="$t('test_track.issue.platform_status') "
                   prop="platformStatus">
             <template v-slot="scope">
@@ -79,6 +81,8 @@
           <ms-table-column
             :field="item"
             :fields-width="fieldsWidth"
+            column-key="creator"
+            sortable
             :label="$t('custom_field.issue_creator')"
             prop="creatorName">
           </ms-table-column>
@@ -159,7 +163,7 @@ import MsTablePagination from "@/business/components/common/pagination/TablePagi
 import {
   CUSTOM_FIELD_SCENE_OPTION,
   CUSTOM_FIELD_TYPE_OPTION,
-  FIELD_TYPE_MAP,
+  FIELD_TYPE_MAP, ISSUE_PLATFORM_OPTION,
   ISSUE_STATUS_MAP,
   SYSTEM_FIELD_NAME_MAP
 } from "@/common/js/table-constants";
@@ -177,7 +181,6 @@ import MsMainContainer from "@/business/components/common/components/MsMainConta
 import {getCurrentProjectID} from "@/common/js/utils";
 import {getIssueTemplate} from "@/network/custom-field-template";
 import {getProjectMember} from "@/network/user";
-import {getIntegrationService} from "@/network/organization";
 
 export default {
   name: "IssueList",
@@ -247,6 +250,9 @@ export default {
     fieldFilters() {
       return CUSTOM_FIELD_TYPE_OPTION;
     },
+    platformFilters() {
+     return ISSUE_PLATFORM_OPTION;
+    },
     sceneFilters() {
       return CUSTOM_FIELD_SCENE_OPTION;
     },
diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index 9c83e9a77f..8104f5533c 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -135,7 +135,7 @@ export function _filter(filters, condition) {
 
 //表格数据排序
 export function _sort(column, condition) {
-  column.prop = humpToLine(column.prop);
+  let field = humpToLine(column.column.columnKey ? column.column.columnKey : column.prop);
   if (column.order === 'descending') {
     column.order = 'desc';
   } else {
@@ -146,7 +146,7 @@ export function _sort(column, condition) {
   }
   let hasProp = false;
   condition.orders.forEach(order => {
-    if (order.name === column.prop) {
+    if (order.name === field) {
       order.type = column.order;
       hasProp = true;
     }
@@ -155,7 +155,7 @@ export function _sort(column, condition) {
     hasProp = true;
   }*/
   if (!hasProp) {
-    condition.orders.push({name: column.prop, type: column.order});
+    condition.orders.push({name: field, type: column.order});
   }
 }