Merge remote-tracking branch 'origin/master'

backend/src/main/java/io/metersphere/xpack

@@ -1 +1 @@
-Subproject commit fb5ecdccbb0102d365a80d7ed294801b9340afc5
+Subproject commit 3f497f88ebbd312a3b7637c1b694a8e28c68c287

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 46f1ad6670d023844e7f8f09f89ef9fe9b466bbf
+Subproject commit ef5067d0de3ed940a5d31485f6370f201818dc3a

frontend/src/i18n/en-US.js

@@ -196,7 +196,20 @@ export default {
       default_module: "Default module",
     },
     report_statistics: {
-      title: "Report statistics"
+      title: "Report statistics",
+      test_case_analysis: "Test case analysis",
+      test_case_activity: "Test case activity",
+      name: "Report",
+      excel: "Excel",
+      add_case: "Add case",
+      change_case: "Change case",
+      type: "Type",
+      options: "Options",
+      chart: "Chart",
+      line: "Line",
+      bar: "Bar",
+      desc: "Desc",
+      asc: "Asc",
     }
   },
   license: {
@@ -377,7 +390,7 @@ export default {
     apikey_delete_confirm: 'Are you sure you want to delete this API Key?',
     input_id_placeholder: 'Please enter ID (Chinese characters are not supported)',
     source: 'Source',
-    button:{
+    button: {
       add_workspace_batch: 'Batch add user to workspace',
       add_user_role_batch: 'Batch add user role',
     }

frontend/src/i18n/zh-CN.js

@@ -197,7 +197,20 @@ export default {
       default_module: "默认模块",
     },
     report_statistics: {
-      title: "报表统计"
+      title: "报表统计",
+      test_case_analysis: "测试用例分析",
+      test_case_activity: "测试用例活动情况",
+      name: "报表",
+      excel: "表格",
+      add_case: "新增用例",
+      change_case: "变更用例",
+      type: "类别",
+      options: "选项",
+      chart: "图表",
+      line: "折线图",
+      bar: "柱状图",
+      desc: "总数从高到低",
+      asc: "总数从低到高",
     }
   },
   license: {
@@ -375,7 +388,7 @@ export default {
     apikey_delete_confirm: '这个 API Key 确定要删除吗?',
     input_id_placeholder: '请输入ID (不支持中文)',
     source: '用户来源',
-    button:{
+    button: {
       add_workspace_batch: '批量添加到工作空间',
       add_user_role_batch: '批量添加角色',
     }

frontend/src/i18n/zh-TW.js

@@ -197,7 +197,20 @@ export default {
       default_module: "默認模塊",
     },
     report_statistics: {
-      title: "報表統計"
+      title: "報表統計",
+      test_case_analysis: "測試用例分析",
+      test_case_activity: "測試用例活動情況",
+      name: "報表",
+      excel: "表格",
+      add_case: "新增用例",
+      change_case: "變更用例",
+      type: "類別",
+      options: "選項",
+      chart: "圖表",
+      line: "折線圖",
+      bar: "柱狀圖",
+      desc: "總數從高到低",
+      asc: "總數從低到高",
     }
   },
   license: {