From cc4b5015d188c7f7178a55eab7f7b62766bef5f1 Mon Sep 17 00:00:00 2001
From: q4speed <kun@fit2cloud.com>
Date: Tue, 19 May 2020 14:26:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/report/ApiReportList.vue   |  3 +-
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    | 67 ++++++++++---------
 4 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/frontend/src/business/components/api/report/ApiReportList.vue b/frontend/src/business/components/api/report/ApiReportList.vue
index b1698a47e6..1dbab837b0 100644
--- a/frontend/src/business/components/api/report/ApiReportList.vue
+++ b/frontend/src/business/components/api/report/ApiReportList.vue
@@ -7,7 +7,8 @@
                            :show-create="false"/>
         </template>
         <el-table :data="tableData" class="table-content">
-          <el-table-column prop="name" :label="$t('commons.name')" width="150" show-overflow-tooltip/>
+          <el-table-column prop="name" :label="$t('commons.name')" width="200" show-overflow-tooltip/>
+          <el-table-column prop="testName" :label="$t('api_report.test_name')" width="200" show-overflow-tooltip/>
           <el-table-column width="250" :label="$t('commons.create_time')">
             <template v-slot:default="scope">
               <span>{{ scope.row.createTime | timestampFormatDate }}</span>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index d8e886c11a..e1efa8074b 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -318,6 +318,7 @@ export default {
     result: "Result",
     success: "Success",
     fail: "Fail",
+    test_name: "Test"
   },
   test_track: {
     test_track: "Test Track",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 56396ada49..fc25deb49f 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -318,6 +318,7 @@ export default {
     result: "结果",
     success: "成功",
     fail: "失败",
+    test_name: "所属测试"
   },
   test_track: {
     test_track: "测试跟踪",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 40957d7b6a..0aa900ecec 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -18,7 +18,7 @@ export default {
     'operating': '操作',
     'input_limit': '長度在 {0} 到 {1} 個字符',
     'login': '登錄',
-    'welcome': '歡迎回來，請輸入用戶名和密碼登錄MeterSphere',
+    'welcome': '歡迎回來,請輸入用戶名和密碼登錄MeterSphere',
     'username': '用戶名',
     'password': '密碼',
     'input_username': '請輸入用戶名',
@@ -85,7 +85,7 @@ export default {
   workspace: {
     'create': '創建工作空間',
     'update': '修改工作空間',
-    'delete_confirm': '刪除工作空間會關聯刪除該工作空間下的資源，確定要刪除嗎?',
+    'delete_confirm': '刪除工作空間會關聯刪除該工作空間下的資源,確定要刪除嗎?',
     'add': '添加工作空間',
     'input_name': '請輸入工作空間名稱',
     'search_by_name': '根據名稱搜索',
@@ -98,7 +98,7 @@ export default {
   organization: {
     'create': '創建組織',
     'modify': '修改組織',
-    'delete_confirm': '刪除組織會關聯刪除該組織下的資源，確定要刪除嗎?',
+    'delete_confirm': '刪除組織會關聯刪除該組織下的資源,確定要刪除嗎?',
     'input_name': '請輸入組織名稱',
     'select_organization': '請選擇組織',
     'search_by_name': '根據名稱搜索',
@@ -130,7 +130,7 @@ export default {
     'special_characters_are_not_supported': '不支持特殊字符',
     'mobile_number_format_is_incorrect': '手機號碼格式不正確',
     'email_format_is_incorrect': '郵箱格式不正確',
-    'password_format_is_incorrect': '密碼格式不正確(至少8-16個字符，至少1個大寫字母，1個小寫字母和1個數字)',
+    'password_format_is_incorrect': '密碼格式不正確(至少8-16個字符,至少1個大寫字母,1個小寫字母和1個數字)',
     'old_password': '舊密碼',
     'new_password': '新密碼',
   },
@@ -197,7 +197,7 @@ export default {
     'file_type': '文件類型',
     'file_status': '文件狀態',
     'last_modify_time': '修改時間',
-    'upload_tips': '將文件拖到此處，或<em>點擊上傳</em>',
+    'upload_tips': '將文件拖到此處,或<em>點擊上傳</em>',
     'upload_type': '只能上傳JMX/CSV文件',
     'related_file_not_found': "未找到關聯的測試文件！",
     'delete_file_confirm': '確認刪除文件: ',
@@ -209,7 +209,7 @@ export default {
     'rps_limit': 'RPS上限：',
     'input_rps_limit': '請輸入限制',
     'ramp_up_time_within': '在',
-    'ramp_up_time_minutes': '分鐘內，分',
+    'ramp_up_time_minutes': '分鐘內,分',
     'ramp_up_time_times': '次增加並髮用戶',
     'advanced_config_error': '高級配置校驗失敗',
     'domain_bind': '域名綁定',
@@ -233,76 +233,78 @@ export default {
     'pressure_prediction_chart': '壓力預估圖',
   },
   api_test: {
+    title: "測試",
     save_and_run: "保存並執行",
     run: "執行",
     running: "正在執行",
     reset: "重置",
     input_name: "請輸入測試名稱",
     select_project: "請選擇項目",
-    variable_name: "變量名",
+    variable_name: "變數名",
     copied: "已拷貝",
     key: "鍵",
     value: "值",
     scenario: {
-      config: "場景配置",
+      config: "場景配寘",
       input_name: "請輸入場景名稱",
       name: "場景名稱",
       base_url: "基礎URL",
-      base_url_description: "基礎URL作為所有請求的URL前綴",
-      variables: "自定義變量",
+      base_url_description: "基礎URL作為所有請求的URL首碼",
+      variables: "自定義變數",
       headers: "請求頭",
-      kv_description: "所有請求可以使用自定義變量",
+      kv_description: "所有請求可以使用自定義變數",
     },
     request: {
       input_name: "請輸入請求名稱",
       name: "請求名稱",
       method: "請求方法",
       url: "請求URL",
-      url_description: "例如: https://fit2cloud.com",
+      url_description: "例如：https://fit2cloud.com",
       parameters: "請求參數",
-      parameters_desc: "參數追加到URL，例如https://fit2cloud.com/entries?key1=Value1&Key2=Value2",
+      parameters_desc: "參數追加到URL,例如https://fit2cloud.com/entries？key1=Value1&amp;Key2=Value2",
       headers: "請求頭",
       body: "請求內容",
       body_kv: "鍵值對",
-      body_text: "文本",
+      body_text: "文字",
       assertions: {
         label: "斷言",
-        text: "文本",
+        text: "文字",
         regex: "正則",
-        response_time: "響應時間",
+        response_time: "回應時間",
         select_type: "請選擇類型",
         select_subject: "請選擇對象",
         select_condition: "請選擇條件",
         contains: "包含",
         not_contains: "不包含",
         equals: "等於",
-        start_with: "以...開始",
-        end_with: "以...結束",
+        start_with: "以…開始",
+        end_with: "以…結束",
         value: "值",
-        expression: "Perl型正則表達式",
-        response_in_time: "響應時間在...毫秒以內",
+        expression: "Perl型規則運算式",
+        response_in_time: "回應時間在…毫秒以內",
       },
       extract: {
-        label: "提取",
+        label: "選取",
         select_type: "請選擇類型",
-        description: "從響應結果中提取數據並將其存儲在變量中，在後續請求中使用變量。",
+        description: "從響應結果中選取數據並將其存儲在變數中,在後續請求中使用變數。",
         regex: "正則",
-        regex_expression: "Perl型正則表達式",
-        json_path_expression: "JSONPath表達式",
-        xpath_expression: "XPath表達式",
+        regex_expression: "Perl型規則運算式",
+        json_path_expression: "JSONPath運算式",
+        xpath_expression: "XPath運算式",
       }
     }
   },
   api_report: {
+    title: "報告",
     request: "請求",
     request_body: "請求內容",
     request_headers: "請求頭",
     request_cookie: "Cookie",
     response: "響應",
-    delete_confirm: '確認刪除報告: ',
+    delete_confirm: '確認删除報告：',
     scenario_name: "場景名稱",
-    response_time: "響應時間(ms)",
-    latency: "網絡延遲",
+    response_time: "回應時間（ms）",
+    latency: "網路延遲",
     request_size: "請求大小",
     response_size: "響應大小",
     response_code: "狀態碼",
@@ -311,11 +313,12 @@ export default {
     assertions: "斷言",
     assertions_pass: "成功斷言",
     assertions_name: "斷言名稱",
-    assertions_message: "斷言信息",
+    assertions_message: "斷言資訊",
     assertions_is_success: "是否成功",
     result: "結果",
     success: "成功",
     fail: "失敗",
+    test_name: "所屬測試"
   },
   test_track: {
     test_track: "測試跟踪",
@@ -335,7 +338,7 @@ export default {
       create_case: "創建用例",
       edit_case: "編輯用例",
       view_case: "查看用例",
-      no_project: "該工作空間下無項目，請先創建項目",
+      no_project: "該工作空間下無項目,請先創建項目",
       priority: "優先級",
       type: "類型",
       method: "測試方式",
@@ -365,7 +368,7 @@ export default {
         case_import: "導入測試用例",
         download_template: "下載模版",
         click_upload: "點擊上傳",
-        upload_limit: "只能上傳xls/xlsx文件，且不超過20M",
+        upload_limit: "只能上傳xls/xlsx文件,且不超過20M",
         upload_limit_count: "一次只能上傳一個文件",
         upload_limit_format: "上傳文件只能是 xls、xlsx格式!",
         upload_limit_size: "上傳文件大小不能超過 20MB!",
@@ -450,7 +453,7 @@ export default {
       create_report: "創建測試報告",
       view_report: "查看測試報告",
       component_library: "組件庫",
-      component_library_tip: "拖拽組件庫中組件，添加至右側，預覽報告效果，每個系統組件只能添加壹個。",
+      component_library_tip: "拖拽組件庫中組件,添加至右側,預覽報告效果,每個系統組件只能添加壹個。",
       delete_component_tip: "請至少保留壹個組件",
       input_template_name: "輸入模版名稱",
       case_count: "用例數",