diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack
index 57d6f78efa..24047fea95 160000
--- a/backend/src/main/java/io/metersphere/xpack
+++ b/backend/src/main/java/io/metersphere/xpack
@@ -1 +1 @@
-Subproject commit 57d6f78efa4b0300be188e8b024511ceef0873ed
+Subproject commit 24047fea950a74f7848a9fdaa857a22b884c4ce2
diff --git a/frontend/src/assets/zentao.jpg b/frontend/src/assets/zentao.jpg
new file mode 100644
index 0000000000..703a906898
Binary files /dev/null and b/frontend/src/assets/zentao.jpg differ
diff --git a/frontend/src/business/components/api/report/ApiReportList.vue b/frontend/src/business/components/api/report/ApiReportList.vue
index 3cd7f688ee..5f5f95687a 100644
--- a/frontend/src/business/components/api/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/report/ApiReportList.vue
@@ -126,6 +126,7 @@ export default {
let data = response.data;
this.total = data.itemCount;
this.tableData = data.listObject;
+ this.selectRows.clear();
});
},
handleSelectionChange(val) {
@@ -171,28 +172,13 @@ export default {
this.$set(row, "showMore", true);
this.selectRows.add(row);
}
-
- let arr = Array.from(this.selectRows);
-
- // 选中1个以上的用例时显示更多操作
- if (this.selectRows.size === 1) {
- this.$set(arr[0], "showMore", false);
- } else if (this.selectRows.size === 2) {
- arr.forEach(row => {
- this.$set(row, "showMore", true);
- })
- }
},
handleSelectAll(selection) {
if (selection.length > 0) {
- if (selection.length === 1) {
- this.selectRows.add(selection[0]);
- } else {
- this.tableData.forEach(item => {
- this.$set(item, "showMore", true);
- this.selectRows.add(item);
- });
- }
+ this.tableData.forEach(item => {
+ this.$set(item, "showMore", true);
+ this.selectRows.add(item);
+ });
} else {
this.selectRows.clear();
this.tableData.forEach(row => {
diff --git a/frontend/src/business/components/performance/report/PerformanceTestReport.vue b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
index 03500cad62..a48975eb31 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReport.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
@@ -222,28 +222,13 @@ export default {
this.$set(row, "showMore", true);
this.selectRows.add(row);
}
-
- let arr = Array.from(this.selectRows);
-
- // 选中1个以上的用例时显示更多操作
- if (this.selectRows.size === 1) {
- this.$set(arr[0], "showMore", false);
- } else if (this.selectRows.size === 2) {
- arr.forEach(row => {
- this.$set(row, "showMore", true);
- })
- }
},
handleSelectAll(selection) {
if (selection.length > 0) {
- if (selection.length === 1) {
- this.selectRows.add(selection[0]);
- } else {
- this.tableData.forEach(item => {
- this.$set(item, "showMore", true);
- this.selectRows.add(item);
- });
- }
+ this.tableData.forEach(item => {
+ this.$set(item, "showMore", true);
+ this.selectRows.add(item);
+ });
} else {
this.selectRows.clear();
this.tableData.forEach(row => {
diff --git a/frontend/src/business/components/settings/organization/IssuesManagement.vue b/frontend/src/business/components/settings/organization/BugManagement.vue
similarity index 98%
rename from frontend/src/business/components/settings/organization/IssuesManagement.vue
rename to frontend/src/business/components/settings/organization/BugManagement.vue
index 6506b90f06..8a2ee1511d 100644
--- a/frontend/src/business/components/settings/organization/IssuesManagement.vue
+++ b/frontend/src/business/components/settings/organization/BugManagement.vue
@@ -9,6 +9,9 @@
+
+
+
diff --git a/frontend/src/business/components/settings/organization/ServiceIntegration.vue b/frontend/src/business/components/settings/organization/ServiceIntegration.vue
index 65e3cefb6f..acb4662d77 100644
--- a/frontend/src/business/components/settings/organization/ServiceIntegration.vue
+++ b/frontend/src/business/components/settings/organization/ServiceIntegration.vue
@@ -2,7 +2,7 @@
-
+
@@ -10,12 +10,12 @@