diff --git a/backend/src/main/java/io/metersphere/service/TestCaseService.java b/backend/src/main/java/io/metersphere/service/TestCaseService.java index 04580af86df1f4129af55358bc9d9b9c8fc22acd..4f57c628b882582edc18f220606e89fca133bf7d 100644 --- a/backend/src/main/java/io/metersphere/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/service/TestCaseService.java @@ -1,18 +1,18 @@ package io.metersphere.service; -import io.metersphere.base.domain.*; +import io.metersphere.base.domain.TestCase; +import io.metersphere.base.domain.TestCaseExample; +import io.metersphere.base.domain.TestCaseWithBLOBs; import io.metersphere.base.mapper.TestCaseMapper; -import io.metersphere.base.mapper.TestCaseNodeMapper; -import io.metersphere.commons.utils.BeanUtils; import io.metersphere.controller.request.testcase.QueryTestCaseRequest; -import io.metersphere.dto.TestCaseNodeDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; +import java.util.List; +import java.util.UUID; @Service @Transactional(rollbackFor = Exception.class) diff --git a/backend/src/main/resources/i18n/en-US.json b/backend/src/main/resources/i18n/en-US.json index 04c61c9de696ea45df21e8739c9a9cf2677e52da..164b587eabc3ecdcea61478402ee315609c9b5e6 100644 --- a/backend/src/main/resources/i18n/en-US.json +++ b/backend/src/main/resources/i18n/en-US.json @@ -13,5 +13,6 @@ "run_load_test_file_not_found": "Unable to run test, unable to get test file meta information, test ID:", "run_load_test_file_content_not_found": "Cannot run test, cannot get test file content, test ID:", "run_load_test_file_init_error": "Failed to run test, failed to initialize run environment, test ID:", - "load_test_is_running": "Load test is running, please wait." + "load_test_is_running": "Load test is running, please wait.", + "node_deep_limit": "The node depth does not exceed 5 layers!" } \ No newline at end of file diff --git a/backend/src/main/resources/i18n/zh-CN.json b/backend/src/main/resources/i18n/zh-CN.json index 1d085f881353d21297cd6a36d8e956259b0ea13f..6b63726d0cc6e8c61df280fe9d8886a24780fcc7 100644 --- a/backend/src/main/resources/i18n/zh-CN.json +++ b/backend/src/main/resources/i18n/zh-CN.json @@ -13,5 +13,6 @@ "run_load_test_file_not_found": "无法运行测试,无法获取测试文件元信息,测试ID:", "run_load_test_file_content_not_found": "无法运行测试,无法获取测试文件内容,测试ID:", "run_load_test_file_init_error": "无法运行测试,初始化运行环境失败,测试ID:", - "load_test_is_running": "测试正在运行, 请等待" + "load_test_is_running": "测试正在运行, 请等待", + "node_deep_limit": "节点深度不超过5层!" } \ No newline at end of file diff --git a/frontend/src/business/components/common/router/router.js b/frontend/src/business/components/common/router/router.js index 84447ec0485f711337e6662eb1669b45e165e3a7..1d42fc3e7da193aba659c5d9feffd678bbf06c53 100644 --- a/frontend/src/business/components/common/router/router.js +++ b/frontend/src/business/components/common/router/router.js @@ -28,7 +28,6 @@ import TrackHome from "../../track/home/TrackHome"; import TestPlan from "../../track/plan/TestPlan"; import TestCase from "../../track/case/TestCase"; import TestTrack from "../../track/TestTrack"; -import EditTestCase from "../../track/case/EditTestCase"; Vue.use(VueRouter); @@ -203,23 +202,6 @@ const router = new VueRouter({ name: 'trackHome', component: TrackHome, }, - { - path: 'case/create', - name: "createCase", - component: EditTestCase, - }, - { - path: "case/edit/:caseId", - name: "editCase", - component: EditTestCase, - props: { - content: (route) => { - return { - ...route.params - } - } - } - }, { path: 'case/:caseId', name: 'testCase', diff --git a/frontend/src/business/components/track/case/EditTestCase.vue b/frontend/src/business/components/track/case/EditTestCase.vue deleted file mode 100644 index 545c26f9872a46d56b9c088a3cf590dfe0f17c57..0000000000000000000000000000000000000000 --- a/frontend/src/business/components/track/case/EditTestCase.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - - - diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue index 4072b67baf9da3394b5a015582c85131484e0a35..c26a449c125148ca1af4140eba2e3f7c9b2e72fe 100644 --- a/frontend/src/business/components/track/case/TestCase.vue +++ b/frontend/src/business/components/track/case/TestCase.vue @@ -96,8 +96,8 @@ }, checkProject() { if(this.currentProject === null) { - this.$alert('该工作空间下无项目,请先创建项目', '创建项目', { - confirmButtonText: '去创建项目', + this.$alert(this.$t('test_track.no_project'), { + confirmButtonText: this.$t('project.create'), callback: action => { this.$router.push("/track/project/create"); } diff --git a/frontend/src/business/components/track/case/components/NodeTree.vue b/frontend/src/business/components/track/case/components/NodeTree.vue index 1009d5ed4a0064524f35b6212b20f7f65642fba7..d88bc190c32ff13c0215be3c46b9f608ae40b9dc 100644 --- a/frontend/src/business/components/track/case/components/NodeTree.vue +++ b/frontend/src/business/components/track/case/components/NodeTree.vue @@ -2,7 +2,7 @@
- @@ -32,25 +32,25 @@ -
重命名
+
{{$t('test_track.rename')}}
-
添加子模块
+
{{$t('test_track.add_submodule')}}
-
删除
+
{{$t('commons.delete')}}
- + - + @@ -58,8 +58,8 @@ diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue index 3efce261bfe7ef1cced59b7862e887f8f0f615d6..a8f765ad1e22649271d3387371bb8d03ce992924 100644 --- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue +++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue @@ -2,15 +2,15 @@
- + @@ -18,10 +18,10 @@ - + - - + + - - + + @@ -61,26 +61,26 @@ - - - - - + + + + + - - - - + + + + - 前置条件: + {{$t('test_track.prerequisite')}}: @@ -89,13 +89,13 @@ type="textarea" :autosize="{ minRows: 2, maxRows: 4}" :rows="2" - placeholder="请输入前置条件"> + :placeholder="$t('test_track.input_prerequisite')"> - 执行步骤: + {{$t('test_track.steps')}}: @@ -105,28 +105,28 @@ border :default-sort = "{prop: 'num', order: 'ascending'}" highlight-current-row> - - + + - + - +