diff --git a/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java index bdcb8bbb59..9f49ebdacc 100644 --- a/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java +++ b/backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java @@ -53,6 +53,7 @@ public class PerformanceTestController { public Pager> list(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody QueryTestPlanRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); request.setWorkspaceId(SessionUtils.getCurrentWorkspaceId()); + request.setProjectId(SessionUtils.getCurrentProjectId()); return PageUtils.setPageInfo(page, performanceTestService.list(request)); } diff --git a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java index dcf8c57919..609830785e 100644 --- a/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java +++ b/backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java @@ -79,7 +79,6 @@ public class PerformanceTestService { public List list(QueryTestPlanRequest request) { request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders())); - request.setProjectId(SessionUtils.getCurrentProjectId()); return extLoadTestMapper.list(request); } diff --git a/frontend/src/business/components/track/case/components/CaseComment.vue b/frontend/src/business/components/track/case/components/CaseComment.vue new file mode 100644 index 0000000000..77aa8a0512 --- /dev/null +++ b/frontend/src/business/components/track/case/components/CaseComment.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index c3799ba890..fd02887d7b 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -1,255 +1,263 @@ @@ -264,10 +272,11 @@ import {Message} from "element-ui"; import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment"; import {getCurrentProjectID} from "../../../../../common/js/utils"; import {buildNodePath} from "../../../api/definition/model/NodeTree"; +import CaseComment from "@/business/components/track/case/components/CaseComment"; export default { name: "TestCaseEdit", - components: {MsDialogFooter, TestCaseAttachment}, + components: {CaseComment, MsDialogFooter, TestCaseAttachment}, data() { return { result: {}, @@ -318,7 +327,8 @@ export default { methodOptions: [ {value: 'auto', label: this.$t('test_track.case.auto')}, {value: 'manual', label: this.$t('test_track.case.manual')} - ] + ], + testCase: {} }; }, props: { @@ -347,6 +357,11 @@ export default { this.$nextTick(() => (this.isStepTableAlive = true)); }, open(testCase) { + this.testCase = {}; + if (testCase) { + // 复制 不查询评论 + this.testCase = testCase.isCopy ? {} : testCase; + } this.resetForm(); this.projectId = getCurrentProjectID(); if (window.history && window.history.pushState) { @@ -697,4 +712,8 @@ export default { width: 194px; } +.case-dialog >>> .el-dialog__body { + padding: 0 20px 10px 20px; +} +