diff --git a/internal/pkg/helper/script/asset.go b/internal/pkg/helper/script/asset.go index ff15c014b18d37b1cd8b08204b3233e8cc1b4834..881103fdb93670deb1add0e0e80a7300e0dc0b62 100644 --- a/internal/pkg/helper/script/asset.go +++ b/internal/pkg/helper/script/asset.go @@ -98,13 +98,13 @@ func loadScriptNodesInDir(folder string, parent *serverDomain.TestAsset, level i caseId, _ := strconv.Atoi(caseIdStr) if scriptIdsFromZentao == nil || caseId < 1 { // not to filter - AddScript(0, caseId, childPath, "", "workspace", false, parent) + AddScript(0, caseId, childPath, "", "workspace", true, parent) continue } _, ok := scriptIdsFromZentao[caseId] if ok { - AddScript(0, caseId, childPath, "", "workspace", false, parent) + AddScript(0, caseId, childPath, "", "workspace", true, parent) } } } diff --git a/internal/server/modules/v1/index/zentao.go b/internal/server/modules/v1/index/zentao.go index e1d962a887e736f887c723c29f4de8c4abcd9940..353062ca1d2a97edbb2eb61793c99bab7f115199 100644 --- a/internal/server/modules/v1/index/zentao.go +++ b/internal/server/modules/v1/index/zentao.go @@ -28,7 +28,7 @@ func (m *ZentaoModule) Party() module.WebModule { index.Get("/listProduct", m.ZentaoCtrl.ListProduct).Name = "产品列表" index.Get("/listModule", m.ZentaoCtrl.ListModule).Name = "模块列表" index.Get("/listSuite", m.ZentaoCtrl.ListSuite).Name = "套件列表" - index.Get("/listTask", m.ZentaoCtrl.ListTask).Name = "任务列表" + index.Get("/listTask", m.ZentaoCtrl.ListTask).Name = "测试单列表" index.Get("/listCase", m.ZentaoCtrl.ListCase).Name = "用例列表" index.Get("/listBugFields", m.ZentaoCtrl.ListBugFields).Name = "获取缺陷属性数据" diff --git a/res/server/zh/messages.json b/res/server/zh/messages.json index f85ea72ed2f172dc372aa462d733cfffbbcae683..f5a3aa40b9656890fec11d66b2ed598fd6f8175b 100644 --- a/res/server/zh/messages.json +++ b/res/server/zh/messages.json @@ -108,7 +108,7 @@ }, { "id": "task_id", - "translation": "测试任务Id" + "translation": "测试单Id" }, { "id": "test_case", diff --git a/ui/src/locales/zh-CN.ts b/ui/src/locales/zh-CN.ts index daeb96e1a040f9a3d3157f299ea7f944d4bbd78e..5f9d32485f6a81a583c77be414a38fc6903a97a0 100644 --- a/ui/src/locales/zh-CN.ts +++ b/ui/src/locales/zh-CN.ts @@ -95,7 +95,7 @@ export default { 'execution.execCase': '执行用例', 'execution.execModule': '执行模块', 'execution.execSuite': '执行套件', - 'execution.execTask': '执行任务', + 'execution.execTask': '执行测试单', 'execution.execUnit': '执行单元测试', 'workspace': '工作目录', 'filter': '筛选', @@ -211,7 +211,7 @@ export default { 'by_workspace': '按目录', 'by_module': '按模块', 'by_suite': '按套件', - 'by_task': '按任务', + 'by_task': '按测试单', 'by_case': '按用例', 'checkout_case': '导出禅道用例', 'checkin_case': '更新禅道用例', @@ -250,10 +250,10 @@ export default { 'open-in-explore': '在资源管理器中显示', 'open-in-terminal': '从此位置打开命令行', - 'pls_select_task': '请选择任务', + 'pls_select_task': '请选择测试单', 'pls_select_step': '请选择步骤', - 'or_input_task_name': '或输入新任务标题', - 'task_name': '禅道任务标题', + 'or_input_task_name': '或输入新测试单标题', + 'task_name': '禅道测试单标题', 'pls_select_workspace': '请选择导出到的工作目录。', 'pls_add_zentao_site': '初次使用,请点击右上按钮新建禅道站点。', @@ -267,7 +267,7 @@ export default { 'pls_select_co_case': '请选择用例', 'pls_module': '请选择模块', 'pls_suite': '请选择套件', - 'pls_task': '请选择任务', + 'pls_task': '请选择测试单', 'pls_test_tool': '请选择测试工具', 'pls_build_tool': '请选择构建工具', 'pls_cmd': '请输入所要执行的命令',