fix: 系统字段无法搜索

backend/src/main/resources/db/migration/V80__v1.9.0_release.sql

@@ -20,26 +20,26 @@ CREATE TABLE IF NOT EXISTS `custom_field` (
 
 -- 用例系统字段
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('45f2de57-9d1d-11eb-b418-0242ac120002','i43sf4_testCaseStatus','TEST_CASE','select','',
+VALUES ('45f2de57-9d1d-11eb-b418-0242ac120002','用例状态','TEST_CASE','select','',
         '[{"value":"Prepare", "text":"test_track.case.status_prepare", "system": true},{"value":"Underway", "text":"test_track.case.status_running","system": true},{"value":"Completed", "text":"test_track.case.status_finished", "system": true}]',
         1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('46065143-9d1d-11eb-b418-0242ac120002','i43sf4_testCaseMaintainer','TEST_CASE','member','',
+VALUES ('46065143-9d1d-11eb-b418-0242ac120002','责任人','TEST_CASE','member','',
         '[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('4619cc23-9d1d-11eb-b418-0242ac120002','i43sf4_testCasePriority','TEST_CASE','select','',
+VALUES ('4619cc23-9d1d-11eb-b418-0242ac120002','用例等级','TEST_CASE','select','',
         '[{"value":"P0", "text":"P0", "system": true},{"value":"P1", "text":"P1","system": true},{"value":"P2", "text":"P2", "system": true},{"value":"P3", "text":"P3", "system": true}]',
         1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 
 -- 缺陷系统字段
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('09642424-7b1b-4004-867e-ff9c798a1933','i43sf4_issueCreator','ISSUE','member','','[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
+VALUES ('09642424-7b1b-4004-867e-ff9c798a1933','创建人','ISSUE','member','','[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('a577bc60-75fe-47ec-8aa6-32dca23bf3d6','i43sf4_issueProcessor','ISSUE','member','','[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
+VALUES ('a577bc60-75fe-47ec-8aa6-32dca23bf3d6','处理人','ISSUE','member','','[]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('beb57501-19c8-4ca3-8dfb-2cef7c0ea087','i43sf4_issueStatus','ISSUE','select','','[{"text":"test_track.issue.status_new","value":"new","system": true},{"text":"test_track.issue.status_resolved","value":"resolved","system": true},{"text":"test_track.issue.status_closed","value":"closed","system": true}]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
+VALUES ('beb57501-19c8-4ca3-8dfb-2cef7c0ea087','状态','ISSUE','select','','[{"text":"test_track.issue.status_new","value":"new","system": true},{"text":"test_track.issue.status_resolved","value":"resolved","system": true},{"text":"test_track.issue.status_closed","value":"closed","system": true}]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 INSERT INTO custom_field (id,name,scene,`type`,remark,`options`,`system`,`global`,workspace_id,create_time,update_time)
-VALUES ('d392af07-fdfe-4475-a459-87d59f0b1626','i43sf4_issueSeverity','ISSUE','select','','[{"text":"P0","value":"P0","system": true},{"text":"P1","value":"P1","system": true},{"text":"P2","value":"P2","system": true},{"text":"P3","value":"P3","system": true}]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
+VALUES ('d392af07-fdfe-4475-a459-87d59f0b1626','严重程度','ISSUE','select','','[{"text":"P0","value":"P0","system": true},{"text":"P1","value":"P1","system": true},{"text":"P2","value":"P2","system": true},{"text":"P3","value":"P3","system": true}]',1,1,'global',unix_timestamp() * 1000,unix_timestamp() * 1000);
 
 -- 用例模板表
 CREATE TABLE IF NOT EXISTS `test_case_template` (

frontend/src/business/components/track/case/components/TestCaseEdit.vue

@@ -591,13 +591,13 @@ export default {
       if (customFieldsStr) {
         let customFields = JSON.parse(customFieldsStr);
         customFields.forEach(item => {
-          if (item.name === 'i43sf4_testCasePriority') {
+          if (item.name === '用例等级') {
             param.priority = item.value;
           }
-          if (item.name === 'i43sf4_testCaseMaintainer') {
+          if (item.name === '责任人') {
             param.maintainer = item.value;
           }
-          if (item.name === 'i43sf4_testCaseStatus') {
+          if (item.name === '用例状态') {
             param.status = item.value;
           }
         });

frontend/src/business/components/track/issue/IssueEditDetail.vue

@@ -242,9 +242,11 @@ export default {
       let customFieldsStr = param.customFields;
       if (customFieldsStr) {
         let customFields = JSON.parse(customFieldsStr);
-        if (customFields['i43sf4_issueStatus']) {
+        customFields.forEach(item => {
-          param.status = JSON.parse(customFields['i43sf4_issueStatus']);
+          if (item.name === '状态') {
+            param.status = item.value;
           }
+        });
       }
     },
   }

frontend/src/common/js/custom_field.js

@@ -49,8 +49,8 @@ export function parseCustomField(data, template, customFieldForm, rules, oldFiel
 
     // 将保存的值赋值给template
     if (data.customFields instanceof Array) {
-      for (const index in data.customFields) {
+      for (let i = 0; i < data.customFields.length; i++) {
-        let customField = data.customFields[index];
+        let customField = data.customFields[i];
         if (customField.id === item.id) {
           item.defaultValue = customField.value;
           break;
@@ -124,8 +124,8 @@ export function getTemplate(baseUrl, vueObj) {
 // 兼容旧字段
 export function buildTestCaseOldFields(testCase) {
   let oldFields = new Map();
-  oldFields.set('i43sf4_testCaseStatus', testCase.status);
+  oldFields.set('用例状态', testCase.status);
-  oldFields.set('i43sf4_testCaseMaintainer', testCase.maintainer);
+  oldFields.set('责任人', testCase.maintainer);
-  oldFields.set('i43sf4_testCasePriority', testCase.priority);
+  oldFields.set('用例等级', testCase.priority);
   return oldFields;
 }

frontend/src/common/js/table-constants.js

@@ -50,14 +50,14 @@ export const SCENE_MAP = {
 
 export const SYSTEM_FIELD_NAME_MAP = {
   //用例字段
-  i43sf4_testCaseStatus: 'custom_field.case_status',
+  用例状态: 'custom_field.case_status',
-  i43sf4_testCaseMaintainer: 'custom_field.case_maintainer',
+  责任人: 'custom_field.case_maintainer',
-  i43sf4_testCasePriority: 'custom_field.case_priority',
+  用例等级: 'custom_field.case_priority',
   //缺陷字段
-  i43sf4_issueCreator: 'custom_field.issue_creator',
+  创建人: 'custom_field.issue_creator',
-  i43sf4_issueProcessor: 'custom_field.issue_processor',
+  处理人: 'custom_field.issue_processor',
-  i43sf4_issueStatus: 'custom_field.issue_status',
+  状态: 'custom_field.issue_status',
-  i43sf4_issueSeverity: 'custom_field.issue_severity',
+  严重程度: 'custom_field.issue_severity',
 }
 
 

frontend/src/i18n/en-US.js

@@ -263,6 +263,15 @@ export default {
       host_is_null: 'Prometheus Host cannot be empty'
     }
   },
+  custom_field: {
+    case_status: 'Case Status',
+    case_maintainer: 'Maintainer',
+    case_priority: 'Case Priority',
+    issue_creator: 'Creator',
+    issue_processor: 'Processor',
+    issue_status: 'Status',
+    issue_severity: 'Severity'
+  },
   workspace: {
     create: 'Create Workspace',
     update: 'Update Workspace',

frontend/src/i18n/zh-TW.js

@@ -12,7 +12,7 @@ export default {
     import_mode: '導入模式',
     import_module: '導入模塊',
     import_user: '導入用戶',
-    export: "導出",
+    export: '導出',
     please_fill_in_the_template: '請填寫模版內容',
     cut_back_old_version: '切回舊版',
     cut_back_new_version: '切回新版',
@@ -39,14 +39,14 @@ export default {
     copy_success: '復制成功',
     modify_success: '修改成功',
     delete_cancel: '已取消刪除',
-    option_cannot_spread_pages: '這個操作不能跨頁，是否繼續？',
+    option_cannot_spread_pages: '這個操作不支持跨頁，是否繼續？',
     confirm: '確定',
     cancel: '取消',
     prompt: '提示',
     operating: '操作',
     input_limit: '長度在 {0} 到 {1} 個字符',
     login: '登錄',
-    welcome: '壹站式開源持續測試平臺',
+    welcome: '一站式開源持續測試平臺',
     username: '姓名',
     password: '密碼',
     input_username: '請輸入用戶姓名',
@@ -87,7 +87,7 @@ export default {
     please_select: '請選擇',
     search_by_name: '根據名稱搜索',
     search_by_name_or_id: '根據 ID/名稱 搜索',
-    search_by_id_name_tag: '根據 ID/名稱/標籤 搜索',
+    search_by_id_name_tag: '根據 ID/名稱/標簽 搜索',
     personal_information: '個人信息',
     exit_system: '退出系統',
     verification: '驗證',
@@ -95,7 +95,7 @@ export default {
     custom: '自定義',
     select_date: '選擇日期',
     calendar_heatmap: '測試日歷',
-    months_1: '壹月',
+    months_1: '一月',
     months_2: '二月',
     months_3: '三月',
     months_4: '四月',
@@ -105,10 +105,10 @@ export default {
     months_8: '八月',
     months_9: '九月',
     months_10: '十月',
-    months_11: '十壹月',
+    months_11: '十一月',
     months_12: '十二月',
     weeks_0: '周日',
-    weeks_1: '周壹',
+    weeks_1: '周一',
     weeks_2: '周二',
     weeks_3: '周三',
     weeks_4: '周四',
@@ -153,7 +153,7 @@ export default {
     more_operator: "更多操作",
     mock: "Mock 設置",
     table: {
-      select_tip: "已选中 {0} 条数据"
+      select_tip: "已選中 {0} 條數據"
     },
     date: {
       select_date: '選擇日期',
@@ -180,7 +180,7 @@ export default {
       search: "查詢",
       reset: "重置",
       and: '所有',
-      or: '任意壹個',
+      or: '任意一個',
       operators: {
         is_empty: "空",
         is_not_empty: "非空",
@@ -264,6 +264,15 @@ export default {
       host_is_null: 'Prometheus地址不能為空'
     }
   },
+  custom_field: {
+    case_status: '用例狀態',
+    case_maintainer: '責任人',
+    case_priority: '用例等級',
+    issue_creator: '創建人',
+    issue_processor: '處理人',
+    issue_status: '狀態',
+    issue_severity: '嚴重程度'
+  },
   workspace: {
     create: '創建工作空間',
     update: '修改工作空間',
@@ -300,7 +309,7 @@ export default {
       test_plan_task_notification: '測試計劃任務通知',
       test_review_task_notice: '測試評審任務通知',
       create_new_notification: '創建新通知',
-      mail_template_example: '郵件範本示例',
+      mail_template_example: '郵件模版',
       robot_template: '機器人模版',
       select_events: '選擇事件',
       defect_task_notification: '缺陷任務通知',
@@ -309,11 +318,11 @@ export default {
       nail_robot: '釘釘機器人',
       enterprise_wechat_robot: '企業微信機器人',
       lark: '飛書機器人',
-      notes: '1.釘釘和企業群裏新建壹個自定義機器人，然後復制 webhook 地址在我們平臺上;\n' +
+      notes: '1.釘釘和企業群裏新建一個自定義機器人，然後復制 webhook 地址在我們平臺上;\n' +
         '       2.機器人選擇為群機器人，安全驗證選擇“自定義關鍵詞” ："任務通知";\n' +
-        '       3.選擇接收人時必須是妳所建的群裏包含的人,接收人手機號為必填項且為釘釘企業所使用的手機號,',
+        '       3.選擇接收人時必須是你所建的群裏包含的人,接收人手機號為必填項且為釘釘企業所使用的手機號,',
       message: '事件，接收人，接收方式為必填項',
-      message_webhook: '接收方式為釘釘和企業機器人，飛書時，webhook為必填項',
+      message_webhook: '接收方式為釘釘和企業機器人,飛書時，webhook為必填項',
       template: "模版"
     },
     integration: {
@@ -392,7 +401,7 @@ export default {
     old_password: '舊密碼',
     new_password: '新密碼',
     repeat_password: '確認密碼',
-    inconsistent_passwords: '兩次輸入的密碼不壹致',
+    inconsistent_passwords: '兩次輸入的密碼不一致',
     remove_member: '確定要移除該成員嗎',
     org_remove_member: '將該用戶從組織中移除，將同時移除該組織下所有工作空間的權限，確定要移除該成員嗎？',
     input_id_or_email: '請輸入用戶 ID, 或者 用戶郵箱',
@@ -453,7 +462,7 @@ export default {
     export: '導出',
     export_to_ms_format: '導出 MeterSphere 格式',
     export_to_swagger3_format: '導出 Swagger3.0 格式',
-    compare: '報告比較',
+    compare: '報告對比',
     generation_error: '報告生成錯誤, 無法查看, 請檢查日誌詳情!',
     being_generated: '報告正在生成中...',
     delete_confirm: '確認刪除報告: ',
@@ -469,15 +478,15 @@ export default {
     batch_delete: "批量刪除報告",
     delete_batch_confirm: '確認批量刪除報告',
     response_time: '響應時間(s)',
-    max_users: '並發数'
+    max_users: '並發數'
   },
   load_test: {
-    concurrency_thread_group: '併發讀取組',
+    concurrency_thread_group: '並發讀取組',
     thread_group: '線程組',
-    completed_test_report: '已完成的測試報告',
+    completed_test_report: '已完成測試報告',
     test: '測試',
     name: '測試名稱',
-    same_project_test: '只能運行同壹項目內的測試',
+    same_project_test: '只能運行同一項目內的測試',
     already_exists: '測試名稱不能重復',
     operating: '操作',
     recent: '我最近的測試',
@@ -494,7 +503,7 @@ export default {
     is_running: '正在運行！',
     test_name_is_null: '測試名稱不能為空！',
     project_is_null: '項目不能為空！',
-    jmx_is_null: '必需包含壹個JMX文件，且只能包含壹個JMX文件！',
+    jmx_is_null: '必需包含一個JMX文件，且只能包含一個JMX文件！',
     file_name: '文件名',
     file_size: '文件大小',
     file_type: '文件類型',
@@ -506,7 +515,7 @@ export default {
     delete_file_confirm: '確認刪除文件: ',
     file_size_limit: "文件個數超出限制！",
     delete_file: "文件已存在，請先刪除同名文件！",
-    thread_num: '並發用戶數：',
+    thread_num: '並發用戶數',
     input_thread_num: '請輸入線程數',
     duration: '壓測時長',
     granularity: '聚合時間（秒）',
@@ -514,8 +523,8 @@ export default {
     rps_limit: 'RPS上限：',
     input_rps_limit: '請輸入限制',
     ramp_up_time_within: '在',
-    ramp_up_time_minutes: '秒內，分',
+    ramp_up_time_minutes: '{0}內，分',
-    ramp_up_time_seconds: '秒內增加並發用戶',
+    ramp_up_time_seconds: '{0}內增加並發用戶',
     iterate_num: '叠代次數 (次): ',
     by_iteration: '按叠代次數',
     by_duration: '按持續時間',
@@ -539,7 +548,7 @@ export default {
     custom_http_code: '自定義 HTTP 響應成功狀態碼',
     separated_by_commas: '按逗號分隔',
     create: '創建測試',
-    run: '壹鍵運行',
+    run: '一鍵運行',
     select_resource_pool: '請選擇資源池',
     serialize_threadgroups: '場景是否順序執行',
     autostop_threadgroups: '自動停止開啟',
@@ -552,9 +561,9 @@ export default {
     special_characters_are_not_supported: '測試名稱不支持特殊字符',
     pressure_config_params_is_empty: '壓力配置參數不能為空!',
     schedule_tip: '間隔時間不能小於壓測時長',
-    delete_threadgroup_confirm: '確認刪除場景: ',
+    delete_threadgroup_confirm: '確認刪除場景',
     scenario_list: '場景列表',
-    scenario_name: '場景名稱',
+    scenario_name: "場景名稱",
     upload_jmx: '上傳 JMX 文件',
     exist_jmx: '已存在的文件',
     other_resource: '資源文件',
@@ -564,10 +573,10 @@ export default {
     threadgroup_at_least_one: '至少啟用一個線程組',
     load_api_automation_jmx: '引用接口自動化場景',
     project_file_exist: "項目中已存在該文件，請直接引用",
-    project_file_update_type_error: '更新的文件類型必須一致',
     report: {
       diff: "對比"
     },
+    project_file_update_type_error: '更新的文件類型必須一致',
   },
   api_test: {
     creator: "創建人",
@@ -589,6 +598,7 @@ export default {
     export_config: "導出",
     enable_validate_tip: "沒有可用請求",
     copy: "復制測試",
+    batch_add_parameter: "格式：參數名,必填,參數值,備註 <br/> 如：Accept-Encoding,必填,utf-8,編碼",
     jar_config: {
       title: "jar包管理",
       jar_file: "jar包",
@@ -604,14 +614,14 @@ export default {
       create_error: "接口信息未保存",
       table: {
         name: "期望名稱",
-        tag: "標籤",
+        tag: "標簽",
         creator: "創建人",
         status: "狀態",
         update_time: "更新時間"
       },
       expect_detail: "期望詳情",
       base_info: "基本信息",
-      req_param: "請求參賽",
+      req_param: "請求參數",
       rsp_param: "響應內容",
       delete_mock_expect: "確認刪除這條預期嗎？",
       rule: {
@@ -681,7 +691,7 @@ export default {
         assertions_rule: "斷言規則",
         response_header: "響應頭",
         response_body: "響應體",
-        response_template: "響應報文模板",
+        response_template: "響應報文模版",
         console: "控制臺",
         status_code: "狀態碼",
         query_info: "地址欄中跟在？後面的參數,如updateapi?id=112",
@@ -710,7 +720,7 @@ export default {
           value: "數據",
           not_required: "非必填",
         },
-        esb_copy_confirm: "確認複製當前節點的數據結構",
+        esb_copy_confirm: "確認復制當前節點的數據結構",
         esb_title: "可以在報文模板中使用${參數名} 或 ${父節點參數名.子節點參數名}來生成xml數據結構",
       },
       document: {
@@ -719,8 +729,8 @@ export default {
         edit_time_positive_sequence: "按更新時間從前到後",
         edit_time_Reverse_order: "按更新時間從後到前",
         request_method: "請求方式",
-        request_interface: "請求接口e",
+        request_interface: "請求接口",
-        search_by_api_name: "API名稱搜索",
+        search_by_api_name: "名稱搜索",
         request_info: "請求信息",
         request_head: "請求頭",
         request_param: "參數",
@@ -749,11 +759,11 @@ export default {
       close_expansion: "一鍵收起",
       constant: "常量",
       counter: "計數器",
-      random: "随机器",
+      random: "隨機數",
       view_scene_variables: "查看場景變量",
       open_scene: "打開場景",
       save_as_api: "另存為接口定義",
-      delete_step: "删除步骤",
+      delete_step: "刪除步驟",
       reference_deleted_info: "引用場景已經被刪除",
       follow_people: "關註人",
       create_tag: "創建Tag",
@@ -821,7 +831,7 @@ export default {
       environment_list: "環境列表",
       environment_config: "環境配置",
       config_environment: "配置環境",
-      copy_environment: "複製環境",
+      copy_environment: "復制環境",
       environment: "環境",
       select_environment: "請選擇環境",
       please_save_test: "請先保存測試",
@@ -879,7 +889,7 @@ export default {
       jmeter_func: "JMeter 方法",
       parameters_filter_example: "示例",
       parameters_filter_tips: "只支持 MockJs 函數結果預覽",
-      parameters_advance: "高級參數設置",
+      parameters_advance: "return",
       parameters_preview: "預覽",
       parameters_mock_filter_tips: "請輸入關鍵字進行過濾",
       parameters_pre_request: "前置請求提取",
@@ -959,7 +969,7 @@ export default {
         code_template_get_response_header: "獲取響應頭",
         code_template_get_response_code: "獲取響應碼",
         code_template_get_response_result: "獲取響應結果",
-        code_add_report_length: "報文头添加長度",
+        code_add_report_length: "報文頭添加長度",
         code_hide_report_length: "隱藏報文長度"
       },
       dubbo: {
@@ -1014,12 +1024,12 @@ export default {
       export_tip: "導出方法",
       ms_tip: "支持 MeterSphere json 格式",
       ms_export_tip: "通過 MeterSphere 接口測試頁面或者瀏覽器插件導出 json 格式文件",
-      har_export_tip: "通过 瀏覽器到開發者工具 导出 HAR 格式文件",
+      har_export_tip: "通過 瀏覽器的開發者工具 導出 HAR 格式文件",
-      esb_export_tip: "暫時不支持ESB文件的导出",
+      esb_export_tip: "暫時不支持ESB文件的導出",
       postman_tip: "只支持 Postman Collection v2.1 格式的 json 文件",
       swagger_tip: "支持 Swagger 2.0 與 3.0 版本的 json 文件",
       har_tip: "只支持 HAR 文件",
-      esb_tip: "只支持 ESB 模板的xlsx文件",
+      esb_tip: "只支持 ESB 模版的xlsx文件",
       post_export_tip: "通過 Postman 導出測試集合",
       swagger_export_tip: "通過 Swagger 頁面導出",
       jmeter_export_tip: "通過 JMeter 生成JMX文件",
@@ -1030,6 +1040,8 @@ export default {
       next_synchronization_time: "下次同步時間",
       ms_env_import_file_limit: "支持通過MeterSphere導出的json格式文件",
       file_exceed_limit: "文件數量超出限制",
+
+
     },
     home_page: {
       unit_of_measurement: "個",
@@ -1039,10 +1051,10 @@ export default {
         completion: "已完成的接口/接口總數*100%",
         coverage: "有案例的接口/接口總數*100%",
         pass: "最後一次執行成功的場景/場景總數*100%",
-        success: "執行成功的次數/执行總次數*100%",
+        success: "執行成功的次數/執行總次數*100%",
         interface_coverage: "被場景步驟包含的接口/接口總數*100%",
         review: "評審通過的功能案例/所有功能案例 * 100%",
-        testplan_coverage: "關聯的功能案例數/所有功能案例 * 100%",
+        testplan_coverage: "關聯的功能案例/所有功能案例 * 100%",
       },
       api_count_card: {
         title: "接口數量統計",
@@ -1136,7 +1148,7 @@ export default {
           update_time: "更新時間",
         },
         scenario_schedule: "場景",
-        test_plan_schedule: "測試計畫",
+        test_plan_schedule: "測試計劃",
         swagger_schedule: "swagger",
         confirm: {
           close_title: "要關閉這條定時任務嗎？",
@@ -1193,12 +1205,12 @@ export default {
   test_track: {
     related_requirements: '關聯需求',
     please_related_requirements: '請選擇要關聯的需求',
-    please_select_the_test_to_associate: "請選擇要關聯的測試",
+    please_select_the_test_to_associate: "請選擇需要關聯的測試",
     person_responsible: "責任人",
     test_track: "測試跟蹤",
+    planning_execution: "規劃&執行",
     confirm: "確 定",
     cancel: "取 消",
-    planning_execution: "規劃&執行",
     project: "項目",
     save: "保 存",
     return: "返 回",
@@ -1249,7 +1261,7 @@ export default {
       input_type: "請選擇用例類型",
       input_method: "請選擇測試方式",
       input_prerequisite: "請輸入前置條件",
-      input_demand_name: "請輸入請求ID或名稱",
+      input_demand_name: "請輸入需求ID或名稱",
       delete_confirm: "確認刪除測試用例",
       delete: "刪除用例",
       save_create_continue: "保存並繼續創建",
@@ -1270,10 +1282,10 @@ export default {
       batch_delete_case: '批量刪除',
       batch_unlink: '批量取消關聯',
       project_name: '所屬項目',
-      status: '評審狀態',
+      status: '評審結果',
-      status_prepare: '未評審',
+      status_prepare: '未開始',
-      status_pass: '通過',
+      status_running: '進行中',
-      status_un_pass: '未通過',
+      status_finished: '已完成',
       cancel_relevance_project: "取消項目關聯會同時取消該項目下已關聯的測試用例",
       img_loading_fail: "圖片加載失敗",
       pdf_loading_fail: "PDF加載失敗",
@@ -1286,10 +1298,10 @@ export default {
         download_template: "下載模版",
         click_upload: "點擊上傳",
         upload_limit: "只能上傳xls/xlsx文件，且不超過20M",
-        upload_xmind: "支持文件類型：.xmind；壹次至多導入800 條用例",
+        upload_xmind: "支持文件類型：.xmind；一次至多導入800 條用例",
         upload_xmind_format: "上傳文件只能是 .xmind 格式",
         upload_limit_other_size: "上傳文件大小不能超過",
-        upload_limit_count: "壹次只能上傳壹個文件",
+        upload_limit_count: "一次只能上傳一個文件",
         upload_limit_format: "上傳文件只能是 xls、xlsx格式!",
         upload_limit_size: "上傳文件大小不能超過 20MB!",
         success: "導入成功！",
@@ -1370,6 +1382,7 @@ export default {
       no_link_case: "沒有關聯用例！",
       pass: "通過",
       un_pass: "未通過",
+      prepare: '未評審',
       comment: "評論",
       my_review: "我的評審",
       my_create: "我創建的評審",
@@ -1433,8 +1446,8 @@ export default {
       step_result: "步驟執行結果",
       my_case: "我的用例",
       all_case: "全部用例",
-      pre_case: "上壹條用例",
+      pre_case: "上一條用例",
-      next_case: "下壹條用例",
+      next_case: "下一條用例",
       change_execution_results: "更改執行結果",
       change_executor: "更改執行人",
       select_executor: "請選擇執行人",
@@ -1456,8 +1469,8 @@ export default {
       create_report: "創建測試報告",
       view_report: "查看測試報告",
       component_library: "組件庫",
-      component_library_tip: "拖拽組件庫中組件，添加至右側，預覽報告效果，每個系統組件只能添加壹個。",
+      component_library_tip: "拖拽組件庫中組件，添加至右側，預覽報告效果，每個系統組件只能添加一個。",
-      delete_component_tip: "請至少保留壹個組件",
+      delete_component_tip: "請至少保留一個組件",
       input_template_name: "輸入模版名稱",
       template_special_characters: '模版名稱不支持特殊字符',
       case_count: "用例數",
@@ -1486,16 +1499,19 @@ export default {
       title_description_required: "標題和描述必填",
       close_success: "關閉成功",
       preview: "預覽",
+      status_new: '新建',
+      status_resolved: '已解決',
+      status_closed: '已關閉',
       please_choose_current_owner: "請選擇處理人",
       tapd_current_owner: "Tapd 處理人",
       zentao_bug_build: "禪道 影響版本",
       zentao_bug_assigned: "禪道 處理人",
     },
     report: {
-      name: "測試計畫包括",
+      name: "測試計劃報告",
       list: {
         name: "名稱",
-        test_plan: "測試計畫名稱",
+        test_plan: "測試計劃名稱",
         creator: "創建人",
         create_time: "創建時間",
         trigger_mode: "觸發方式",
@@ -1623,13 +1639,13 @@ export default {
       every: "每",
       day_unit: "號",
       start: "開始",
-      execute_once: "執行壹次",
+      execute_once: "執行一次",
       last_working_day: "最近的那個工作日",
-      last_day_of_the_month: "本月最後壹天",
+      last_day_of_the_month: "本月最後一天",
       multi_select: "可多選",
       num: "第",
       week_of_weeks: "周的星期",
-      last_week_of_the_month: "本月最後壹個星期",
+      last_week_of_the_month: "本月最後一個星期",
       not_fill: "不填",
       recent_run_time: "最近5次運行時間",
       no_qualifying_results: "沒有達到條件的結果",
@@ -1687,7 +1703,7 @@ export default {
     checked_all: "全選",
     valid_json: "不是合法的json字符串",
     enum: "枚舉",
-    enum_msg: "每行只能寫壹個值",
+    enum_msg: "每行只能寫一個值",
     enum_desc: "備註",
     enum_desc_msg: "備註描述信息",
     required: "是否必須",
@@ -1727,9 +1743,9 @@ export default {
     title: '模塊管理'
   },
   table: {
-    header_display_field: '表頭顯示欄位',
+    header_display_field: '表頭顯示字段',
-    fields_to_be_selected: '待選欄位',
+    fields_to_be_selected: '待選字段',
-    selected_fields: '已選欄位'
+    selected_fields: '已選字段'
   },
   run_mode: {
     title: "模式",