fix(报表统计): 报表统计echart排序方式国际化优化

报表统计echart排序方式国际化优化

frontend/src/business/components/reportstatistics/projectstatistics/casecount/chart/TestCaseCountChart.vue

@@ -73,7 +73,7 @@ export default {
         {id: 'pie', name: this.$t('commons.report_statistics.pie')}
       ],
       order: "",
-      orders: [{id: '', name: '默认排序'}, {id: 'desc', name: this.$t('commons.report_statistics.desc')}, {
+      orders: [{id: '', name: this.$t('commons.sort_default')}, {id: 'desc', name: this.$t('commons.report_statistics.desc')}, {
         id: 'asc',
         name: this.$t('commons.report_statistics.asc')
       }],

frontend/src/business/components/reportstatistics/projectstatistics/track/chart/TestAnalysisChart.vue

@@ -53,7 +53,7 @@
         chartType: "line",
         charts: [{id: 'line', name: this.$t('commons.report_statistics.line')}, {id: 'bar', name: this.$t('commons.report_statistics.bar')}],
         order: "",
-        orders: [{id: '', name: '默认排序'},{id: 'desc', name: this.$t('commons.report_statistics.desc')}, {id: 'asc', name: this.$t('commons.report_statistics.asc')}],
+        orders: [{id: '', name: this.$t('commons.sort_default')},{id: 'desc', name: this.$t('commons.report_statistics.desc')}, {id: 'asc', name: this.$t('commons.report_statistics.asc')}],
         loading: false,
         options: {},
       }

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 63b194c25f43ef628a630ccf1ecba01dc65fd3bf
+Subproject commit ed6902f776faa1f04a732a6f92b825a32116b3a0

frontend/src/i18n/en-US.js

@@ -10,6 +10,7 @@ export default {
     excelFile: "Excel",
     xmindFile: "Xmind",
     default: "default",
+    sort_default: "Default",
     please_select_import_mode: 'Please select import mode',
     please_select_import_module: 'Please select import module',
     pass_rate: 'Pass rate',
@@ -68,18 +69,18 @@ export default {
     input_limit: 'Within {0} and {1} characters',
     login: 'Sign In',
     welcome: 'One-stop open source continuous testing platform',
-    theme_color:'Theme color',
+    theme_color: 'Theme color',
     username: 'Username',
     password: 'Password',
     input_username: 'Please enter username',
     input_password: 'Please enter password',
     test: 'Test',
     create_time: 'Created Time',
-    update_user_id:'Updater ID',
+    update_user_id: 'Updater ID',
     update_time: 'Updated Time',
     delete_time: 'Delete Time',
     delete_user: 'Deleted by',
-    delete_user_id:'Deleted by id',
+    delete_user_id: 'Deleted by id',
     add: 'Add',
     preview: 'Preview',
     member: 'Member',
@@ -398,20 +399,20 @@ export default {
     system_project: "Project",
     user_unit: "",
     workspace_unit: "",
-    dash_board:'DashBoard',
+    dash_board: 'DashBoard',
-    all_project:'All Project',
+    all_project: 'All Project',
-    to_be_completed:'Unfinished',
+    to_be_completed: 'Unfinished',
-    pending_upgrade:'To be update',
+    pending_upgrade: 'To be update',
-    information:'Information',
+    information: 'Information',
-    nick_name:'Nick name',
+    nick_name: 'Nick name',
-    resourceId:'Resource ID',
+    resourceId: 'Resource ID',
-    num:'Number',
+    num: 'Number',
-    original_state:'Original State',
+    original_state: 'Original State',
-    custom_num:'CustomNum',
+    custom_num: 'CustomNum',
-    version:'Version',
+    version: 'Version',
-    is_new:"Is new",
+    is_new: "Is new",
-    form_config:"Form config",
+    form_config: "Form config",
-    form_content:"Form content"
+    form_content: "Form content"
   },
   login: {
     normal_Login: "Normal Login",
@@ -432,25 +433,25 @@ export default {
     invalid: 'invalid',
     expired: 'expired',
   },
-  workstation:{
+  workstation: {
     dash_board: 'My DashBoard',
     upcoming: 'My Upcoming',
     focus: 'My Focus',
     creation: 'My Creation',
-    creation_case:'My Creation Case',
+    creation_case: 'My Creation Case',
-    creation_issue:'My Creation Issue',
+    creation_issue: 'My Creation Issue',
     creation_case_tip: 'No use case has been created yet, create it now',
-    creation_issue_tip:'No defects have been created yet, create them now',
+    creation_issue_tip: 'No defects have been created yet, create them now',
-    table_name:{
+    table_name: {
-      track_case:'Track Case',
+      track_case: 'Track Case',
-      track_plan:'Track Plan',
+      track_plan: 'Track Plan',
-      track_review:'Track Review',
+      track_review: 'Track Review',
-      track_issue:'Track Issue',
+      track_issue: 'Track Issue',
-      api_definition:'Api Definition',
+      api_definition: 'Api Definition',
-      api_automation:'Api Automation',
+      api_automation: 'Api Automation',
-      api_case:'Api Case',
+      api_case: 'Api Case',
-      performance:'Performance',
+      performance: 'Performance',
-      scenario_case:'Scenario Case'
+      scenario_case: 'Scenario Case'
     }
   },
   display: {
@@ -516,7 +517,7 @@ export default {
     option_value_check: 'Please fill in the full option values',
   },
   workspace: {
-    id:'Workspace ID',
+    id: 'Workspace ID',
     create: 'Create Workspace',
     update: 'Update Workspace',
     delete: 'Delete Workspace',
@@ -637,12 +638,12 @@ export default {
       zentao_request: 'Zentao request',
       input_zentao_request: 'Please enter zentao request type',
       input_zentao_url: 'Please enter Zentao address, for example: http://xx.xx.xx.xx/zentao/',
-      zentao_info:'Zentao Information',
+      zentao_info: 'Zentao Information',
-      zentao_account:'Zentao Account',
+      zentao_account: 'Zentao Account',
-      zentao_password:'Zentao Password',
+      zentao_password: 'Zentao Password',
-      zentao_prompt_information:'This information is the username and password of the user who submitted the defect through ZenTao. If not filled in, the default information configured in the workspace will be used',
+      zentao_prompt_information: 'This information is the username and password of the user who submitted the defect through ZenTao. If not filled in, the default information configured in the workspace will be used',
-      zentao_config_tip:"Refer to the value of $config->requestType in the ZenTao configuration file",
+      zentao_config_tip: "Refer to the value of $config->requestType in the ZenTao configuration file",
-      zentao_config_path:"Configuration file reference path: /opt/zbox/app/zentao/config/my.php",
+      zentao_config_path: "Configuration file reference path: /opt/zbox/app/zentao/config/my.php",
       use_tip: 'Usage guidelines:',
       use_tip_tapd: 'Basic Auth account information is queried in "Company Management-Security and Integration-Open Platform"',
       use_tip_jira: 'Jira software server authentication information is account password, Jira software cloud authentication information is account + token (account settings-security-create API token)',
@@ -669,11 +670,11 @@ export default {
       input_azure_url: 'Please enter Azure Devops Url',
       input_azure_id: 'Please enter Azure Organization ID',
       use_tip_azure: 'Azure Devops URL+PersonalAccessTokens(User Settings-Personal Access Tokens-New Token)',
-      jira_prompt_information:'This information is the user authentication information for submitting defects through Jira. If it is not filled in, the default information configured in the workspace will be used'
+      jira_prompt_information: 'This information is the user authentication information for submitting defects through Jira. If it is not filled in, the default information configured in the workspace will be used'
     }
   },
   project: {
-    id:'Project ID',
+    id: 'Project ID',
     name: 'Project name',
     recent: 'Recent Projects',
     create: 'Create Project',
@@ -777,7 +778,7 @@ export default {
     no_such_user: 'Without this user information, please enter the correct user ID or user Email!',
   },
   user: {
-    id:'User ID',
+    id: 'User ID',
     create: 'Create',
     modify: 'Modify',
     input_name: 'Please enter a user name',
@@ -803,7 +804,7 @@ export default {
     add_project_batch: 'Batch Add User To Project',
     add_workspace_batch: "Batch Add User To Workspace",
     add_project_batch_tip: 'Add a read-only user group for members by default (system)',
-    import_user_tip:'User group only supports system default user group',
+    import_user_tip: 'User group only supports system default user group',
   },
   group: {
     add: 'Add User Group',
@@ -848,7 +849,7 @@ export default {
     add: 'Add Role',
   },
   report: {
-    id:'Report ID',
+    id: 'Report ID',
     api_test_report: 'Api Test Report',
     load_test_report: 'Load Test Report',
     test_plan_report: 'Test Plan Report',
@@ -895,13 +896,13 @@ export default {
     delete_batch_confirm: 'Confirm batch delete report',
     response_time: 'Response Time(s)',
     max_users: 'VUs',
-    file_id:'Report File ID',
+    file_id: 'Report File ID',
-    avg_response_time:'Average Response Time',
+    avg_response_time: 'Average Response Time',
-    tps:'Transactions Per Second',
+    tps: 'Transactions Per Second',
-    plan_share_url:'Whether the link jump is logged in'
+    plan_share_url: 'Whether the link jump is logged in'
   },
   load_test: {
-    id:'Load Test ID',
+    id: 'Load Test ID',
     concurrency_thread_group: 'Concurrent read group',
     thread_group: 'ThreadGroup',
     completed_test_report: 'Completed test report',
@@ -1023,7 +1024,7 @@ export default {
       LatencyChart: 'Latency',
       BytesThroughputChart: 'Bytes',
       Network: 'Network',
-      url:'URL'
+      url: 'URL'
     },
     add_monitor: 'Add Monitor',
     monitor_item: 'Monitor',
@@ -1068,7 +1069,7 @@ export default {
       upload_limit_size: "Upload file size cannot exceed 30MB!",
       upload_limit_size_warn: "Upload file size cannot exceed {0} MB!",
       upload_limit: "Upload file size cannot exceed",
-      upload_tip:"Only upload JAR packages"
+      upload_tip: "Only upload JAR packages"
     },
     batch_menus: {
       select_all_data: "Select all datas({0})",
@@ -1084,7 +1085,7 @@ export default {
         update_time: "Update time"
       },
       expect_detail: "Expect",
-      request_condition:"Request Condition",
+      request_condition: "Request Condition",
       base_info: "Base info",
       req_param: "Request params",
       rsp_param: "Response Params",
@@ -1116,7 +1117,7 @@ export default {
       create_tip: "Note: Detailed interface information can be filled out on the edit page",
       api_import: "Api Import",
       check_select: "Please check the API",
-      api_project:"Project",
+      api_project: "Project",
       select_comp: {
         no_data: "No Data",
         add_data: "Add Data"
@@ -1238,7 +1239,7 @@ export default {
           none: "None"
         },
       },
-      case_reduction_error_text:"Please restore first"
+      case_reduction_error_text: "Please restore first"
     },
     automation: {
       open_expansion: "One-click expansion",
@@ -1276,7 +1277,7 @@ export default {
       update_time: "Update time",
       step: "Step",
       last_result: "Last result",
-      last_result_id:'Last result id',
+      last_result_id: 'Last result id',
       passing_rate: "Passing rate",
       success: "Success",
       fail: "Fail",
@@ -1300,9 +1301,9 @@ export default {
         select_table: "Select table",
         select_all: "Select all",
         check_case: "Please check the Scene Use Case",
-        api_none:"The original api does not exist",
+        api_none: "The original api does not exist",
-        case_none:"The original case does not exist",
+        case_none: "The original case does not exist",
-        num_none:"The original scene does not exist"
+        num_none: "The original scene does not exist"
       },
       report_name_info: 'Please enter the registration name',
       save_case_info: 'Please save the use case first',
@@ -1319,7 +1320,7 @@ export default {
       generate_report: "Generate report",
     },
     environment: {
-      id:'Environment ID',
+      id: 'Environment ID',
       create: 'Create environment',
       name: "Environment Name",
       socket: "Socket",
@@ -1345,7 +1346,7 @@ export default {
       copy_warning: "Domain names whose enabling conditions are'none' do not support copying!"
     },
     scenario: {
-      id:"Scenario ID",
+      id: "Scenario ID",
       scenario: "Scenario",
       dubbo: "Dubbo Config",
       config: "Scenario Config",
@@ -1428,54 +1429,54 @@ export default {
       condition_variable: "Variable, e.g: ${var}",
       wait: "wait",
 
-      all_name:"name",
+      all_name: "name",
-      all_url:"url",
+      all_url: "url",
-      boolean:"Boolean value",
+      boolean: "Boolean value",
-      capitalize:"Start with a capital letter",
+      capitalize: "Start with a capital letter",
-      cfirst:"Last name (Chinese)",
+      cfirst: "Last name (Chinese)",
-      character:"character",
+      character: "character",
-      city:"city",
+      city: "city",
-      clast:"First name (Chinese)",
+      clast: "First name (Chinese)",
-      cname:"Chinese name",
+      cname: "Chinese name",
-      color:"colour",
+      color: "colour",
-      county:"county",
+      county: "county",
-      ctitle:"Chinese title",
+      ctitle: "Chinese title",
-      dataImage:"Data image",
+      dataImage: "Data image",
-      date:"date",
+      date: "date",
-      datetime:"Date time",
+      datetime: "Date time",
-      domain:"field",
+      domain: "field",
-      email:"E-mail",
+      email: "E-mail",
-      first:"surname",
+      first: "surname",
-      float:"Floating point number",
+      float: "Floating point number",
-      guid:"guid",
+      guid: "guid",
-      hex:"hexadecimal",
+      hex: "hexadecimal",
-      hsl:"hsl",
+      hsl: "hsl",
-      id:"id",
+      id: "id",
-      img:"Picture address",
+      img: "Picture address",
-      increment:"increment",
+      increment: "increment",
-      integer:"integer",
+      integer: "integer",
-      ip:"intellectual property right",
+      ip: "intellectual property right",
-      last:"name",
+      last: "name",
-      lower:"Lowercase letters",
+      lower: "Lowercase letters",
-      natural:"Natural number",
+      natural: "Natural number",
-      now:"current time ",
+      now: "current time ",
-      paragraph:"paragraph",
+      paragraph: "paragraph",
-      pick:"choice",
+      pick: "choice",
-      protocol:"agreement",
+      protocol: "agreement",
-      province:"province",
+      province: "province",
-      range:"Range",
+      range: "Range",
-      region:"region",
+      region: "region",
-      rgb:"rgb",
+      rgb: "rgb",
-      rgba:"rgba",
+      rgba: "rgba",
-      sentence:"sentence",
+      sentence: "sentence",
-      shuffle:"shuffle the cards",
+      shuffle: "shuffle the cards",
-      string:"character string",
+      string: "character string",
-      time:"time",
+      time: "time",
-      title:"title",
+      title: "title",
-      tld:"tld",
+      tld: "tld",
-      upper:"capital",
+      upper: "capital",
-      word:"Words",
+      word: "Words",
-      zip:"Postal Code",
+      zip: "Postal Code",
 
       assertions: {
         label: "Assertion",
@@ -1858,14 +1859,14 @@ export default {
     performance_test_case: "Performance Case",
     scenario_test_case: "Scenario Case",
     report_statistics: "Report Statistics",
-    sort:'Sort',
+    sort: 'Sort',
-    other_test_name:'Other Test Name',
+    other_test_name: 'Other Test Name',
-    demand:{
+    demand: {
-      id:'Demand ID',
+      id: 'Demand ID',
-      name:'Demand Name'
+      name: 'Demand Name'
     },
-    step_model:'Step Model',
+    step_model: 'Step Model',
-    automatic_status_update:"Automatic Status Update",
+    automatic_status_update: "Automatic Status Update",
     case: {
       list: "List",
       minder: "Minder",
@@ -1956,9 +1957,9 @@ export default {
       attachment: "Attachment",
       upload_time: "Upload Time",
       total: "Total Case",
-      node_id:"Node ID",
+      node_id: "Node ID",
-      node_path:"Node Path",
+      node_path: "Node Path",
-      match_rule:"Test Case Match Rule",
+      match_rule: "Test Case Match Rule",
       import: {
         import: "Import test case",
         case_import: "Import test case",
@@ -1990,11 +1991,11 @@ export default {
         export_tip: "Switch to Interface List and check Use Case Export"
       },
       case_desc: "Case Desc",
-      passing_rate:'Case Pass Rate'
+      passing_rate: 'Case Pass Rate'
     },
     plan: {
       test_plan: "Plan",
-      test_plan_id:'Plan ID',
+      test_plan_id: 'Plan ID',
       create_plan: "Create test plan",
       edit_plan: "Edit test plan",
       plan_name: "Name",
@@ -2031,10 +2032,10 @@ export default {
       api_case: "Api case",
       scenario_case: "Scenario case",
       execute_result: "Execute Result",
-      execute_time:'Execute Time',
+      execute_time: 'Execute Time',
-      is_api_case_executing:"Api Case Executing",
+      is_api_case_executing: "Api Case Executing",
-      is_scenario_executing:'Scenario Executing',
+      is_scenario_executing: 'Scenario Executing',
-      is_performance_executing:'Performance Executing',
+      is_performance_executing: 'Performance Executing',
       test_plan_test_case_count: "Track case count",
       test_plan_api_case_count: "Api case count",
       test_plan_api_scenario_count: "Scenario case count",
@@ -2098,7 +2099,7 @@ export default {
       cannot_delete: "Cannot delete this comment！",
     },
     module: {
-      id:'Module ID',
+      id: 'Module ID',
       search: "Search module",
       rename: "Rename",
       add_submodule: "Add submodule",
@@ -2141,7 +2142,7 @@ export default {
       relevance_test_case: "Relevance case",
       cancel_all_relevance: "Unlink all",
       executor: "Executor",
-      executor_match_rule:"Executor Match Rule",
+      executor_match_rule: "Executor Match Rule",
       execute_result: "Result",
       pass: "Pass",
       not_pass: "UnPass",
@@ -2166,7 +2167,7 @@ export default {
       submit_issues: "Commit issues",
       operate_step: "Operate step",
       edit_component: "Edit component",
-      component:"component",
+      component: "component",
       base_info: "Base info",
       mock_info: "Mock service",
       test_result: "Test result",
@@ -2211,7 +2212,7 @@ export default {
       description: "Issue Describe",
       status: "Issue Status",
       platform: "Platform",
-      issue_project:"Project",
+      issue_project: "Project",
       operate: "Operate",
       close: "Close",
       delete: "Delete",
@@ -2221,12 +2222,12 @@ export default {
       status_new: 'new',
       status_resolved: 'resolved',
       status_closed: 'closed',
-      status_active:'active',
+      status_active: 'active',
-      status_delete:'delete',
+      status_delete: 'delete',
       status_in_progress: 'in_progress',
       status_rejected: 'rejected',
-      status_upcoming:'upcoming',
+      status_upcoming: 'upcoming',
-      status_reopened:'reopened',
+      status_reopened: 'reopened',
       please_choose_current_owner: "Please choose current owner",
       tapd_current_owner: "Tapd Current Owner",
       zentao_bug_build: "Zentao Impact version",
@@ -2272,11 +2273,11 @@ export default {
       issue_list: "Issue List",
       all_case: "All Case",
     },
-    reporter:'Reporter',
+    reporter: 'Reporter',
-    lastmodify:'Last Modify'
+    lastmodify: 'Last Modify'
   },
   test_resource_pool: {
-    id:'Resource Pool ID',
+    id: 'Resource Pool ID',
     type: 'type',
     enable_disable: 'Enable / Disable',
     search_by_name: 'Search by name',
@@ -2369,7 +2370,7 @@ export default {
     task_config: "Task Config",
     test_name: 'Test Name',
     running_rule: 'Rule',
-    job:'Job',
+    job: 'Job',
     job_status: 'Status',
     running_task: 'Running Task',
     please_input_cron_expression: "Please Input Cron Expression",
@@ -2502,7 +2503,7 @@ export default {
   },
   module: {
     title: 'Module Management',
-    path:'Module Path'
+    path: 'Module Path'
   },
   table: {
     header_display_field: 'Header display field',
@@ -2539,7 +2540,7 @@ export default {
     script_entry: "Script execution entry",
     plugin_id: "Plug-in Id",
     script_view: "View script",
-    warning_tip:'Script content not found'
+    warning_tip: 'Script content not found'
   },
   mail: {
     input_mail_subject: "Please input subject",

frontend/src/i18n/zh-CN.js

@@ -10,6 +10,7 @@ export default {
     excelFile: "表格文件.xls",
     xmindFile: "思维导图.xmind",
     default: "默认值",
+    sort_default: "默认排序",
     please_select_import_mode: '请选择导入模式',
     please_select_import_module: '请选择导入模块',
     pass_rate: '通过率',

frontend/src/i18n/zh-TW.js

@@ -10,6 +10,7 @@ export default {
     excelFile: "表格文件.xls",
     xmindFile: "思維導圖.xmind",
     default: "默認值",
+    sort_default: "默認排序",
     please_select_import_mode: '請選擇導入模式',
     please_select_import_module: '請選擇導入模塊',
     pass_rate: '通過率',