Merge branch 'v1.3' of https://github.com/metersphere/server into v1.3

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

@@ -1 +1 @@
-Subproject commit cf6b06526324326a563d933e07118fac014a63b4
+Subproject commit c2dacf960cdb1ed35664bdd3432120b1203b73d8

frontend/src/business/components/settings/system/BaseSetting.vue

@@ -6,7 +6,7 @@
         <el-col>
           <el-form-item :label="$t('system_config.base.url')" prop="url">
             <el-input v-model="formInline.url" :placeholder="$t('system_config.base.url_tip')"/>
-            <i>(示例:https://rdmetersphere.fit2cloud.com)</i>
+            <i>({{$t('commons.examples')}}:https://rdmetersphere.fit2cloud.com)</i>
           </el-form-item>
         </el-col>
       </el-row>

frontend/src/business/components/track/home/components/ReviewList.vue

@@ -1,11 +1,11 @@
 <template>
-  <home-base-component title="我的评审" v-loading>
+  <home-base-component :title="$t('test_track.review.my_review')" v-loading>
     <template slot="header-area">
       <div style="float: right">
         <ms-table-button :is-tester-permission="true" v-if="!showMyCreator" icon="el-icon-view"
-                         content="我创建的评审" @click="searchMyCreator"/>
+                         :content="$t('test_track.review.my_create')" @click="searchMyCreator"/>
         <ms-table-button :is-tester-permission="true" v-if="showMyCreator" icon="el-icon-view"
-                         content="待我评审" @click="searchMyCreator"/>
+                         :content="$t('test_track.review.reviewed_by_me')" @click="searchMyCreator"/>
       </div>
 
     </template>
@@ -24,13 +24,13 @@
       <el-table-column
         prop="creator"
         fixed
-        label="创建人"
+        :label="$t('test_track.review.creator')"
         show-overflow-tooltip>
       </el-table-column>
       <el-table-column
         prop="reviewerName"
         fixed
-        label="评审人"
+        :label="$t('test_track.review.reviewer')"
         show-overflow-tooltip>
       </el-table-column>
 
@@ -45,7 +45,7 @@
 
       <el-table-column
         prop="projectName"
-        label="已评用例"
+        :label="$t('test_track.review.done')"
         show-overflow-tooltip>
         <template v-slot:default="scope">
           {{scope.row.reviewed}}/{{scope.row.total}}

frontend/src/business/components/xpack

@@ -1 +1 @@
-Subproject commit 06d935cd1d22ab36f09763745c2aff8ad3fb08c1
+Subproject commit cc38137a69a0f20fadece9c0f9f50a9468c4ace9

frontend/src/i18n/en-US.js

@@ -1,5 +1,6 @@
 export default {
   commons: {
+    examples: 'examples',
     help_documentation: 'Help documentation',
     delete_cancelled: 'Delete cancelled',
     workspace: 'Workspace',
@@ -760,6 +761,11 @@ export default {
       pass: "pass",
       un_pass: "UnPass",
       comment: "Comment",
+      my_review: "My Review",
+      my_create: "My Create",
+      reviewed_by_me: "Review By Me",
+      creator: "Creator",
+      done: "Commented use cases"
     },
     comment: {
       no_comment: "No Comment",

frontend/src/i18n/zh-CN.js

@@ -1,5 +1,6 @@
 export default {
   commons: {
+    examples: '示例',
     help_documentation: '帮助文档',
     delete_cancelled: '已取消删除',
     workspace: '工作空间',
@@ -766,6 +767,11 @@ export default {
       pass: "通过",
       un_pass: "未通过",
       comment: "评论",
+      my_review: "我的评审",
+      my_create: "我创建的评审",
+      reviewed_by_me: "待我评审",
+      creator: "创建人",
+      done: "已评用例"
     },
     comment: {
       no_comment: "暂无评论",

frontend/src/i18n/zh-TW.js

@@ -1,5 +1,6 @@
 export default {
   commons: {
+    examples: '示例',
     help_documentation: '幫助文檔',
     delete_cancelled: '已取消刪除',
     workspace: '工作空間',
@@ -762,6 +763,11 @@ export default {
       pass: "通過",
       un_pass: "未通過",
       comment: "評論",
+      my_review: "我的評審",
+      my_create: "我創建的評審",
+      reviewed_by_me: "待我評審",
+      creator: "創建人",
+      done: "已評用例"
     },
     comment: {
       no_comment: "暫無評論",