From cf6c247ca882cf65071c8148f77afe6226782721 Mon Sep 17 00:00:00 2001 From: chenjianxing Date: Fri, 17 Dec 2021 14:50:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=9A=84=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=20--bug=3D1008903=20--user=3D=E9=99=88=E5=BB=BA?= =?UTF-8?q?=E6=98=9F=20=E3=80=90=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=E3=80=91-=E6=89=B9=E9=87=8F=E6=9B=B4=E6=96=B0=E7=94=A8?= =?UTF-8?q?=E4=BE=8B=E7=9A=84=E8=B4=A3=E4=BB=BB=E4=BA=BA=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=20https://www.tapd.cn/55049933/s/1082080?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../track/service/TestCaseService.java | 4 +- .../db/migration/V103__v1.16_release.sql | 11 +-- .../track/case/components/TestCaseList.vue | 2 +- .../track/common/minder/minderUtils.js | 2 +- frontend/src/i18n/en-US.js | 1 + frontend/src/i18n/zh-CN.js | 1 + frontend/src/i18n/zh-TW.js | 84 ++++++++++--------- 7 files changed, 53 insertions(+), 52 deletions(-) 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 8ff73d57f1..1dbe290177 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestCaseService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestCaseService.java @@ -1280,7 +1280,7 @@ public class TestCaseService { List testCases = extTestCaseMapper.getCustomFieldsByIds(ids); testCases.forEach((testCase) -> { String customFields = testCase.getCustomFields(); - List fields = null; + List fields; if (StringUtils.isBlank(customFields)) { fields = new ArrayList<>(); } else { @@ -1289,7 +1289,7 @@ public class TestCaseService { boolean hasField = false; for (TestCaseBatchRequest.CustomFiledRequest field : fields) { - if (StringUtils.equals(request.getCustomTemplateFieldId(), field.getId())) { + if (StringUtils.equals(request.getCustomField().getName(), field.getName())) { field.setValue(request.getCustomField().getValue()); hasField = true; break; diff --git a/backend/src/main/resources/db/migration/V103__v1.16_release.sql b/backend/src/main/resources/db/migration/V103__v1.16_release.sql index ebeeb44921..dc1ee90a9b 100644 --- a/backend/src/main/resources/db/migration/V103__v1.16_release.sql +++ b/backend/src/main/resources/db/migration/V103__v1.16_release.sql @@ -9,14 +9,9 @@ ALTER TABLE project ADD third_part_template tinyint(1) DEFAULT 0 NULL COMMENT '是否使用第三方平台缺陷模板'; -- 处理历史数据 -UPDATE issue_template -SET platform = 'Local' -WHERE platform = 'metersphere'; -UPDATE project p JOIN issue_template it -on p.issue_template_id = it.id SET p.platform = it.platform; -UPDATE custom_field -SET `type` = 'date' -WHERE `type` = 'data'; +UPDATE issue_template SET platform = 'Local' WHERE platform = 'metersphere'; +UPDATE project p JOIN issue_template it on p.issue_template_id = it.id SET p.platform = it.platform; +UPDATE custom_field SET `type` = 'date' WHERE `type` = 'data'; -- 公共用例库 ALTER TABLE project diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue index 767a610989..4cce3f83d9 100644 --- a/frontend/src/business/components/track/case/components/TestCaseList.vue +++ b/frontend/src/business/components/track/case/components/TestCaseList.vue @@ -228,7 +228,7 @@ import MsTableOperatorButton from "../../../common/components/MsTableOperatorBut import MsTableButton from "../../../common/components/MsTableButton"; import {TEST_CASE_CONFIGS} from "../../../common/components/search/search-components"; import BatchEdit from "./BatchEdit"; -import {PROJECT_NAME, TEST_CASE_LIST} from "@/common/js/constants"; +import {TEST_CASE_LIST} from "@/common/js/constants"; import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem"; import TestCaseDetail from "./TestCaseDetail"; import ReviewStatus from "@/business/components/track/case/components/ReviewStatus"; diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js index e71ab0b544..bdff9ad3cd 100644 --- a/frontend/src/business/components/track/common/minder/minderUtils.js +++ b/frontend/src/business/components/track/common/minder/minderUtils.js @@ -545,7 +545,7 @@ export function handleMinderIssueDelete(commandName, isPlan) { } }); Promise.all(promises).then(() => { - success('取消缺陷关联成功'); + success(i18n.t('test_track.case.minder_create_tip')); }); return isAllIssue; } diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js index 41b7f66f9f..287fad2836 100644 --- a/frontend/src/i18n/en-US.js +++ b/frontend/src/i18n/en-US.js @@ -1744,6 +1744,7 @@ export default { text_describe_tip: "For simple test scenarios, there are no clear test steps", change_type: "Change Type", minder_create_tip: "failed, unable to create its parent module in minder", + minder_issue_delete_tip: "Successfully cancel the defect association", check_select: "Please check the case", export_all_cases: 'Are you sure you want to export all use cases?', input_test_case: 'Please enter the associated case name', diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js index 6c0894049e..02e4c10778 100644 --- a/frontend/src/i18n/zh-CN.js +++ b/frontend/src/i18n/zh-CN.js @@ -1747,6 +1747,7 @@ export default { text_describe_tip: "使用于简单的测试场景，没有明确的测试步骤", change_type: "更改类型", minder_create_tip: "失败, 无法在脑图创建其父模块", + minder_issue_delete_tip: "取消缺陷关联成功", check_select: "请勾选用例", export_all_cases: '确定要导出全部用例吗?', input_test_case: '请输入关联用例名称', diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js index 93746dc9e1..7dca5279fe 100644 --- a/frontend/src/i18n/zh-TW.js +++ b/frontend/src/i18n/zh-TW.js @@ -76,7 +76,7 @@ export default { update_time: '更新時間', delete_time: '刪除時間', delete_user: '刪除人', - delete_user_id:'删除人ID', + delete_user_id:'刪除人ID', add: '添加', preview: '預覽', member: '成員', @@ -86,7 +86,7 @@ export default { group: '用戶組', personal_info: '個人信息', api_keys: 'API Keys', - third_account: '第三方平台賬號', + third_account: '第三方平臺賬號', quota: '配額管理', status: '狀態', show_all: '顯示全部', @@ -103,12 +103,12 @@ export default { enable_settings: '啟用設置', view_settings: '顯示設置', functional: '功能測試', + my_workstation: '我的工作臺', input_content: '請輸入內容', - my_workstation: '我的工作台', create: '新建', edit: '編輯', copy: '復製', - follow: '關注', + follow: '關註', refresh: '刷新', remark: '備註', delete: '刪除', @@ -206,8 +206,8 @@ export default { run_success: "執行成功", run_completed: "執行完成", run_fail: "執行失敗", - follow_success:"關注成功", - cancel_follow_success: "取消關注成功", + follow_success:"關註成功", + cancel_follow_success:"取消關註成功", type: "類型", relationship: { name: '依賴關系', @@ -224,10 +224,10 @@ export default { current_case: '本用例', }, generate_test_data: "生成測試數據", + project_setting: '項目設置', table: { select_tip: "已選中 {0} 條數據" }, - project_setting: '項目設置', selector: { required: "必填", not_required: "非必填", @@ -366,13 +366,14 @@ export default { system_project: "項目", user_unit: "人", workspace_unit: "個", - dash_board:'儀錶盤', + dash_board:'儀表盤', all_project:'全部項目', to_be_completed:'待完成', pending_upgrade:'待更新', information:'信息', - nick_name:'暱稱', + nick_name:'昵稱', resourceId:'資源ID', + level:'級別', num:'數量', original_state:'原始狀態', custom_num:'自定義編號', @@ -396,14 +397,14 @@ export default { expired: '已過期', }, workstation:{ - dash_board: '我的儀錶盤', + dash_board: '我的儀表盤', upcoming: '我的待辦', - focus: '我的關注', + focus: '我的關註', creation: '我創建的', creation_case:'我創建的用例', creation_issue:'我創建的缺陷', - creation_case_tip: '暫時還沒有創建用例，马上創建', - creation_issue_tip:'暫時還沒有創建缺陷，马上創建', + creation_case_tip:'暫時還沒有創建用例，馬上創建', + creation_issue_tip:'暫時還沒有創建缺陷，馬上創建', table_name:{ track_case:'功能用例', track_plan:'測試計劃', @@ -512,20 +513,20 @@ export default { env_group: { name: "環境組", create: "創建環境組", - not_intact: "項目與環境對應關係不完整！", + not_intact: "項目與環境對應關系不完整！", cascader_tip: "若環境組中已經包含此次將要加入的項目，則該項目環境將被覆蓋", search_tip: "請輸入名稱搜索環境組", - fast_create_tip: "請輸入名稱搜索環境組", + fast_create_tip: "請輸入環境組名稱快速創建", quickly_add: "快速添加", select: "請選擇環境組", name_not_null: "環境組名不能為空", delete: "刪除環境組", please_select_project: "請選擇項目", please_select_env: "請選擇環境", - view_details: "請選擇環境", + view_details: "查看域名詳情", domain_list: "域名列表", batch_add_to_ws: "批量添加到環境組", - choice_conflict: "環境選擇衝突，一個項目選擇一個對應環境！", + choice_conflict: "環境選擇沖突，一個項目選擇一個對應環境！", env_list: "環境列表", confirm: "確 定", please_select_env_for_current_scenario: "請為當前場景選擇一個運行環境！", @@ -598,7 +599,7 @@ export default { input_zentao_request: '請輸入Zentao請求方式', input_zentao_url: '請輸入Zentao地址，例：http://xx.xx.xx.xx/zentao/', zentao_info:'禪道信息', - zentao_account:'禪道賬號', + zentao_account:'禪道賬戶', zentao_password:'禪道密碼', zentao_prompt_information:'該信息為通過禪道提交缺陷的的用戶名、密碼，若未填寫，則使用工作空間中配置的默認信息', use_tip: '使用指引：', @@ -637,7 +638,6 @@ export default { edit: '編輯項目', delete: '刪除項目', delete_confirm: '確定要刪除這個項目嗎?', - group_permission: '用戶組與許可權', delete_tip: '刪除該項目，會刪除該項目下所有測試資源，確定要刪除嗎?', file_delete_tip: '刪除該項目的文件: {0}？', search_by_name: '根據名稱搜索', @@ -655,10 +655,12 @@ export default { azureDevops_info: 'AzureDevops 信息', azureDevops_tip: '該信息為通過Azure Devops提交缺陷的用戶令牌信息，若未填寫，則使用工作空間中配置的默認信息', manager: '項目管理', + group_permission: '用戶組與權限', + global: '全局', no_data: '無數據', select: '選擇項目', repeatable: '接口定義URL可重復', - repeatable_info: '接口定義URL可重復 \n 啟用後介面定義重複性校驗將不校驗URL', + repeatable_info: '接口定義URL可重復 \n 啟用後接口定義重復性校驗將不校驗URL', case_public: '公共用例庫', public_info: '啟動公共用例庫 \n 可以使用公共用例庫數據，也可以自行添加用例至公共用例庫', upload_file_again: '重新上傳', @@ -698,10 +700,10 @@ export default { creator: '創建人', create_time: '創建時間', member_desc: '添加項目成員以及項目成員管理', + group_desc: '添加用戶組與權限以及全局配置', env_desc: '項目運行環境以及全局配置', file_desc: 'jar包以及資源文件管理', log_desc: '項目全部操作過程', - group_desc: '添加用戶組與許可權以及全局配置', code_segment_desc: '自定義代碼片段', test_case_custom_id: '測試用例自定義ID', test_case_custom_id_info: '測試用例自定義ID \n 用例ID默認為系統自增ID', @@ -733,7 +735,7 @@ export default { no_such_user: '無此用戶信息, 請輸入正確的用戶 ID 或者 用戶郵箱！', }, user: { - id:"用户ID", + id:'用戶ID', create: '創建用戶', modify: '修改用戶', input_name: '請輸入用戶姓名', @@ -753,8 +755,8 @@ export default { add_user_role_batch: '批量添加角色', }, select_project: '請選擇項目', - select_group: '請選擇用戶組', select_workspace: '請選擇工作空間', + select_group: '請選擇用戶組', add_user_group_batch: '批量添加用戶組', add_project_batch: '批量添加到項目', add_workspace_batch: "批量添加到工作空間", @@ -790,7 +792,7 @@ export default { permission: '權限', please_select_group: '請選擇用戶組', global: '全局', - ws_admin_global: '工作空間管理員才可以創建全域用戶組' + ws_admin_global: '工作空間管理員才可以創建全局用戶組' }, role: { please_choose_role: '請選擇角色', @@ -900,6 +902,7 @@ export default { resource_strategy: '分配策略', run_mode: '執行方式', input_rps_limit: '請輸入限製', + ramp_up_time: '預熱時間', ramp_up_time_within: '在', ramp_up_time_minutes: '秒內，分', ramp_up_time_seconds: '秒內增加並發用戶', @@ -977,7 +980,7 @@ export default { LatencyChart: '延遲', BytesThroughputChart: '字節數', Network: '網絡', - url:'路徑', + url:'路徑' }, project_file_update_type_error: '更新的文件類型必須一致', add_monitor: '添加監控', @@ -1224,7 +1227,7 @@ export default { update_time: "最後更新時間", step: "步驟數", last_result: "最後結果", - last_result_id:'最後结果ID', + last_result_id:'最後結果ID', passing_rate: "通過率", success: "通過", fail: "失敗", @@ -1285,7 +1288,6 @@ export default { common_config: "通用配置", http_config: "HTTP配置", database_config: "數據庫配置", - tips: "Tips: 執行多條SQL語句需配寘allowMultiQueries=true", tcp_config: "TCP配置", import: "導入環境", request_timeout: "鏈接超時", @@ -1733,11 +1735,6 @@ export default { report_statistics: "報告統計", sort:'種類', other_test_name:'其他測試名稱', - demand:{ - id:'需求ID', - name:'需求名稱' - }, - step_model:'步驟模型', automatic_status_update:"自動狀態更新", case: { list: "列表", @@ -1750,6 +1747,7 @@ export default { text_describe_tip: "使用於簡單的測試場景，沒有明確的測試步驟", change_type: "更改類型", minder_create_tip: "失敗, 無法在腦圖創建其父模塊", + minder_issue_delete_tip: "取消缺陷關聯成功", check_select: "請勾選用例", export_all_cases: '確定要導出全部用例嗎?', input_test_case: '請輸入關聯用例名稱', @@ -1807,11 +1805,11 @@ export default { please_select_attr_value: '請選擇屬性對應的值', batch_edit_case: '批量編輯', batch_move_case: '批量移動', - batch_copy: '批量複製', - generate_dependencies: '生成依賴關係', - batch_add_public: '批量添加到公共用例庫', - public_warning: '未開啟公共用例庫配寘', batch_delete_case: '批量刪除', + batch_copy: '批量復製', + batch_add_public: '批量添加到公共用例庫', + public_warning: '未開啟公共庫用例配置', + generate_dependencies: '生成依賴關系', batch_unlink: '批量取消關聯', unlink: '取消關聯', project_name: '所屬項目', @@ -1825,7 +1823,7 @@ export default { upload_tip: "只能上傳jpg、jpeg、png、docx、doc、pdf、xlsx、txt文件", attachment: "附件", upload_time: "上傳時間", - total: "用例總數", + total:"用例總數", node_id:"節點ID", node_path:"節點路徑", match_rule:"測試用例匹配規則", @@ -1861,6 +1859,7 @@ export default { }, case_desc: "用例描述", passing_rate:'用例通過率' + }, plan: { test_plan: "測試計劃", @@ -1902,9 +1901,9 @@ export default { scenario_case: "場景測試用例", execute_result: "執行結果", execute_time:'執行時間', - is_api_case_executing:"是否执行接口用例", - is_scenario_executing:'是否执行场景', - is_performance_executing:'是否执行性能', + is_api_case_executing:"是否執行接口用例", + is_scenario_executing:'是否執行場景', + is_performance_executing:'是否執行性能', test_plan_test_case_count: "功能用例數", test_plan_api_case_count: "接口用例數", test_plan_api_scenario_count: "場景用例數", @@ -1921,6 +1920,11 @@ export default { report_not_found: "報告不存在", } }, + demand:{ + id:'需求ID', + name:'需求名稱' + }, + step_model:'步驟模型', review: { test_review: "用例評審", create_review: "創建用例評審",