diff --git a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java index b359daf3af..1747f0a3c5 100644 --- a/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java +++ b/backend/src/main/java/io/metersphere/track/controller/TestCaseController.java @@ -14,13 +14,11 @@ import io.metersphere.excel.domain.ExcelResponse; import io.metersphere.service.CheckPermissionService; import io.metersphere.service.FileService; import io.metersphere.track.dto.TestCaseDTO; -import io.metersphere.track.dto.TestPlanCaseDTO; import io.metersphere.track.request.testcase.EditTestCaseRequest; import io.metersphere.track.request.testcase.QueryTestCaseRequest; import io.metersphere.track.request.testcase.TestCaseBatchRequest; import io.metersphere.track.request.testcase.TestCaseMinderEditRequest; import io.metersphere.track.request.testplan.FileOperationRequest; -import io.metersphere.track.request.testplancase.QueryTestPlanCaseRequest; import io.metersphere.track.service.TestCaseService; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresRoles; @@ -126,8 +124,8 @@ public class TestCaseController { @PostMapping(value = "/edit", consumes = {"multipart/form-data"}) @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR) - public void editTestCase(@RequestPart("request") EditTestCaseRequest request, @RequestPart(value = "file") List files) { - testCaseService.edit(request, files); + public String editTestCase(@RequestPart("request") EditTestCaseRequest request, @RequestPart(value = "file") List files) { + return testCaseService.edit(request, files); } @PostMapping("/delete/{testCaseId}") 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 fe7164524f..313901669b 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java @@ -165,7 +165,7 @@ public class TestCaseService { String steps = tc.getSteps(); String remark = tc.getRemark(); if (StringUtils.equals(steps, testCase.getSteps()) && StringUtils.equals(remark, caseRemark)) { - MSException.throwException(Translator.get("test_case_already_exists")); + //MSException.throwException(Translator.get("test_case_already_exists")); isExt = true; } } diff --git a/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql b/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql deleted file mode 100644 index 8c15c4fe47..0000000000 --- a/backend/src/main/resources/db/migration/V79__v1.8.1_release.sql +++ /dev/null @@ -1,2 +0,0 @@ --- api_scenario_report modify column length -ALTER TABLE api_scenario_report MODIFY COLUMN name VARCHAR(300); \ No newline at end of file diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue index 7334643973..20368c7be4 100644 --- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue +++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue @@ -374,7 +374,6 @@ }, methods: { customHeader() { - getLabel(this, API_SCENARIO_LIST); this.$refs.headerCustom.open(this.tableLabel) }, selectByParam() { diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue index 6437c94123..7bb7c2e60a 100644 --- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue +++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue @@ -264,11 +264,9 @@ export default { this.$nextTick(() => { this.$refs.caseTable.bodyWrapper.scrollTop = 5 }) - getLabel(this, API_CASE_LIST); }, watch: { selectNodeIds() { - getLabel(this, API_CASE_LIST); this.initTable(); }, currentProtocol() { @@ -294,11 +292,9 @@ export default { }, methods: { customHeader() { - getLabel(this, API_CASE_LIST); this.$refs.headerCustom.open(this.tableLabel) }, initTable() { - getLabel(this, API_CASE_LIST); this.selectRows = new Set(); this.condition.status = ""; this.condition.moduleIds = this.selectNodeIds; diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue index 7ec2982c49..faee8860ce 100644 --- a/frontend/src/business/components/api/definition/components/list/ApiList.vue +++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue @@ -383,7 +383,6 @@ this.getSystemLabel(this.type) this.initTable(); this.getMaintainerOptions(); - getLabel(this, API_LIST); }, watch: { selectNodeIds() { @@ -413,7 +412,6 @@ }) }, customHeader() { - getLabel(this, API_LIST); this.$refs.headerCustom.open(this.tableLabel) }, handleBatchMove() { diff --git a/frontend/src/business/components/performance/report/PerformanceReportCompare.vue b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue index 5e80cfa5e2..3193c0c973 100644 --- a/frontend/src/business/components/performance/report/PerformanceReportCompare.vue +++ b/frontend/src/business/components/performance/report/PerformanceReportCompare.vue @@ -1,21 +1,9 @@ @@ -24,16 +12,15 @@ import MsContainer from "@/business/components/common/components/MsContainer"; import MsMainContainer from "@/business/components/common/components/MsMainContainer"; import {checkoutTestManagerOrTestUser} from "@/common/js/utils"; -import OverviewCompareCard from "@/business/components/performance/report/components/OverviewCompareCard"; -import MsChart from "@/business/components/common/chart/MsChart"; -import LoadCompareCard from "@/business/components/performance/report/components/LoadCompareCard"; -import ResponseTimeCompareCard from "@/business/components/performance/report/components/ResponseTimeCompareCard"; export default { name: "PerformanceReportCompare", - components: {ResponseTimeCompareCard, LoadCompareCard, MsChart, OverviewCompareCard, MsMainContainer, MsContainer}, + components: {MsMainContainer, MsContainer}, mounted() { - this.init(); + let reportId = this.$route.path.split('/')[4]; + console.log(reportId); + let items = localStorage.getItem("compareReportIds"); + console.log(JSON.parse(items)); }, computed: { isReadOnly() { @@ -43,28 +30,11 @@ export default { data() { return {} }, - methods: { - init() { - this.$refs.overviewCard.initTable(); - this.$refs.loadCard.initCard(); - this.$refs.responseTimeCard.initCard(); - } - }, - watch: { - '$route'(to) { - if (to.name !== "ReportCompare") { - return; - } + methods: {} - this.init(); - } - } } diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue index d7934bc6b2..9758cddeed 100644 --- a/frontend/src/business/components/performance/report/PerformanceReportView.vue +++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue @@ -25,9 +25,6 @@ {{ $t('test_track.plan_view.export_report') }} - - {{ $t('report.compare') }} - {{ $t('report.downloadJtl') }} @@ -332,8 +329,6 @@ export default { this.$set(this.report, "id", this.reportId); this.$set(this.report, "status", data.status); this.$set(this.report, "testId", data.testId); - this.$set(this.report, "name", data.name); - this.$set(this.report, "createTime", data.createTime); this.$set(this.report, "loadConfiguration", data.loadConfiguration); this.checkReportStatus(data.status); if (this.status === "Completed" || this.status === "Running") { diff --git a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue index d8440fea96..9f5faffcc8 100644 --- a/frontend/src/business/components/performance/report/PerformanceTestReportList.vue +++ b/frontend/src/business/components/performance/report/PerformanceTestReportList.vue @@ -71,8 +71,6 @@ diff --git a/frontend/src/business/components/performance/report/components/LoadCompareCard.vue b/frontend/src/business/components/performance/report/components/LoadCompareCard.vue deleted file mode 100644 index 8cba2a523f..0000000000 --- a/frontend/src/business/components/performance/report/components/LoadCompareCard.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - diff --git a/frontend/src/business/components/performance/report/components/OverviewCompareCard.vue b/frontend/src/business/components/performance/report/components/OverviewCompareCard.vue deleted file mode 100644 index 18298b9967..0000000000 --- a/frontend/src/business/components/performance/report/components/OverviewCompareCard.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue b/frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue deleted file mode 100644 index 1f48b5ea2c..0000000000 --- a/frontend/src/business/components/performance/report/components/ResponseTimeCompareCard.vue +++ /dev/null @@ -1,188 +0,0 @@ - - - - - diff --git a/frontend/src/business/components/performance/report/components/SameTestReports.vue b/frontend/src/business/components/performance/report/components/SameTestReports.vue index ec2b835e73..6e203f66fb 100644 --- a/frontend/src/business/components/performance/report/components/SameTestReports.vue +++ b/frontend/src/business/components/performance/report/components/SameTestReports.vue @@ -5,23 +5,20 @@ :visible.sync="loadReportVisible"> - + prop="name" + :label="$t('commons.name')" + show-overflow-tooltip> + prop="userName" + :label="$t('report.user_name')" + show-overflow-tooltip> @@ -30,7 +27,7 @@ + :label="$t('commons.create_time')">