From 8b1e4f2a794b55737eb0ed009becea1ce5165e06 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Mon, 30 Mar 2020 00:18:36 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/service/TestCaseService.java | 10 +- backend/src/main/resources/i18n/en-US.json | 3 +- backend/src/main/resources/i18n/zh-CN.json | 3 +- .../components/common/router/router.js | 18 -- .../components/track/case/EditTestCase.vue | 157 ------------------ .../components/track/case/TestCase.vue | 4 +- .../track/case/components/NodeTree.vue | 16 +- .../track/case/components/TestCaseEdit.vue | 76 ++++----- .../track/case/components/TestCaseList.vue | 25 ++- frontend/src/i18n/en-US.js | 35 ++++ frontend/src/i18n/zh-CN.js | 37 ++++- 11 files changed, 139 insertions(+), 245 deletions(-) delete mode 100644 frontend/src/business/components/track/case/EditTestCase.vue diff --git a/backend/src/main/java/io/metersphere/service/TestCaseService.java b/backend/src/main/java/io/metersphere/service/TestCaseService.java index 04580af86..4f57c628b 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 04c61c9de..164b587ea 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 1d085f881..6b63726d0 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 84447ec04..1d42fc3e7 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 545c26f98..000000000 --- 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 4072b67ba..c26a449c1 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 1009d5ed4..d88bc190c 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 3efce261b..a8f765ad1 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> - - + + - + - +