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 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ AND issues.platform IN
+
+ #{value}
+
+
+
+
+
+
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 tapdIssues) {
int pageNum = 1;
- int limit = 200;
- int count = 200;
+ int limit = 50;
+ int count = 50;
List 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;
+ }
+ }
}
};
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 @@
@@ -69,6 +70,7 @@
@@ -79,6 +81,8 @@
@@ -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});
}
}