Merge remote-tracking branch 'origin/dev' into dev

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

@@ -7,11 +7,7 @@
           <el-row type="flex" justify="space-between" align="middle">
             <el-col :span="5">
               <span class="title">{{$t('test_track.test_case')}}</span>
-            </el-col>
+              <ms-create-box :tips="$t('test_track.create')" :exec="testCaseCreate"/>
-
-            <el-col :span="2" :offset="10">
-              <el-button icon="el-icon-circle-plus-outline" size="small" round
-                         @click="$emit('openTestCaseEditDialog')" >{{$t('commons.create')}}</el-button>
             </el-col>
 
             <el-col :span="5">
@@ -108,21 +104,24 @@
 
 <script>
 
+  import MsCreateBox from '../../../settings/CreateBox';
+
   export default {
-      name: "TestCaseList",
+    name: "TestCaseList",
-      data() {
+    components: {MsCreateBox},
-        return {
+    data() {
-          result: {},
+      return {
-          deletePath: "/test/case/delete",
+        result: {},
-          condition: "",
+        deletePath: "/test/case/delete",
-          tableData: [],
+        condition: "",
-          multipleSelection: [],
+        tableData: [],
-          currentPage: 1,
+        multipleSelection: [],
-          pageSize: 5,
+        currentPage: 1,
-          total: 0,
+        pageSize: 5,
-          loadingRequire: {project: true, testCase: true},
+        total: 0,
-          testId: null
+        loadingRequire: {project: true, testCase: true},
-        }
+        testId: null
+      }
       },
       props: {
         currentProject: {
@@ -160,6 +159,9 @@
         buildPagePath(path) {
           return path + "/" + this.currentPage + "/" + this.pageSize;
         },
+        testCaseCreate() {
+          this.$emit('openTestCaseEditDialog');
+        },
         handleSizeChange(size) {
           this.pageSize = size;
           this.initTableData();
@@ -175,7 +177,7 @@
           this.$emit('testCaseEdit', testCase);
         },
         handleDelete(testCase) {
-          this.$alert(this.$t('load_test.delete_confirm') + testCase.name + "？", '', {
+          this.$alert(this.$t('test_track.case_delete_confirm') + testCase.name + "？", '', {
             confirmButtonText: this.$t('commons.confirm'),
             callback: (action) => {
               if (action === 'confirm') {

frontend/src/business/components/track/head/TrackHeaderMenus.vue

@@ -21,7 +21,7 @@
           <el-submenu v-if="isCurrentWorkspaceUser"
                       index="6" popper-class="submenu" v-permission="['test_manager', 'test_user']">
             <template v-slot:title>{{$t('test_track.test_case')}}</template>
-            <ms-recent-list :options="testRecent"/>
+            <ms-recent-list :options="caseRecent"/>
             <el-divider/>
             <ms-show-all :index="'/track/case/all'"/>
             <el-menu-item :index="testCaseEditPath" class="blank_item"></el-menu-item>
@@ -34,7 +34,7 @@
             <el-divider/>
             <ms-show-all :index="'/track/plan/all'"/>
             <el-menu-item :index="testPlanViewPath" class="blank_item"></el-menu-item>
-            <ms-create-button :index="'/track/plan/create'" :title="$t('project.create')"/>
+            <ms-create-button :index="'/track/plan/create'" :title="$t('test_track.create_plan')"/>
           </el-submenu>
         </el-menu>
       </el-col>
@@ -69,8 +69,8 @@
             return {name: 'testCase', params: {projectId: item.id, projectName: item.name}}
           }
         },
-        testRecent: {
+        caseRecent: {
-          title: this.$t('load_test.recent'),
+          title: this.$t('test_track.recent_case'),
           url: "/test/case/recent/5",
           index: function (item) {
             return '/track/case/edit/' + item.id;
@@ -78,7 +78,7 @@
           router: function (item) {}
         },
         planRecent: {
-          title: this.$t('report.recent'),
+          title: this.$t('test_track.recent_plan'),
           url: "/test/plan/recent/5",
           index: function (item) {
             return '/track/plan/view/' + item.id;

frontend/src/business/components/track/plan/components/TestPlanList.vue

@@ -8,14 +8,9 @@
             <el-row type="flex" justify="space-between" align="middle">
               <el-col :span="5">
                 <span class="title">{{$t('test_track.test_plan')}}</span>
+                <ms-create-box :tips="$t('test_track.create_plan')" :exec="testPlanCreate"/>
               </el-col>
 
-              <el-col :span="2" :offset="10">
-                <el-button icon="el-icon-circle-plus-outline" size="small" round
-                           @click="$emit('openTestPlanEditDialog')" >{{$t('commons.create')}}</el-button>
-              </el-col>
-
-
               <el-col :span="5">
                     <span class="search">
                       <el-input type="text" size="small" :placeholder="$t('load_test.search_by_name')"
@@ -117,8 +112,11 @@
 </template>
 
 <script>
-    export default {
+  import MsCreateBox from '../../../settings/CreateBox';
+
+  export default {
       name: "TestPlanList",
+      components: {MsCreateBox},
       data() {
         return {
           result: {},
@@ -154,6 +152,9 @@
         buildPagePath(path) {
           return path + "/" + this.currentPage + "/" + this.pageSize;
         },
+        testPlanCreate() {
+          this.$emit('openTestPlanEditDialog');
+        },
         handleSizeChange(size) {
           this.pageSize = size;
           this.initTableData();
@@ -169,7 +170,7 @@
           this.$emit('testPlanEdit', testPlan);
         },
         handleDelete(testPlan) {
-          this.$alert(this.$t('load_test.delete_confirm') + testPlan.name + "？", '', {
+          this.$alert(this.$t('test_track.plan_delete_confirm') + testPlan.name + "？", '', {
             confirmButtonText: this.$t('commons.confirm'),
             callback: (action) => {
               if (action === 'confirm') {

frontend/src/i18n/en-US.js

@@ -228,7 +228,7 @@ export default {
     'executor': 'executor',
     'execute_result': 'Execute result',
     'case_type': 'Case type',
-    'pass': 'Success',
+    'pass': 'Pass',
     'failure': 'Failure',
     'blocking': 'Blocking',
     'skip': 'Skip',
@@ -239,6 +239,10 @@ export default {
     'confirm_cancel_relevance': 'Confirm cancel relevance',
     'plan': 'Plan',
     'project': 'Project',
+    'recent_plan': 'Recent plan',
+    'recent_case': 'Recent case',
+    'plan_delete_confirm': 'Confirm delete test plan: ',
+    'case_delete_confirm': 'Confirm delete test case: ',
   },
   test_resource_pool: {
     'type': 'type',

frontend/src/i18n/zh-CN.js

@@ -205,7 +205,7 @@ export default {
     'add_submodule': '添加子模块',
     'add_module': '添加模块',
     'module_name': '模块名称',
-    'create_plan': '新建测试计划',
+    'create_plan': '创建测试计划',
     'plan_name': '计划名称',
     'plan_project': '所属项目',
     'plan_stage': '测试阶段',
@@ -228,7 +228,7 @@ export default {
     'executor': '执行人',
     'execute_result': '执行结果',
     'case_type': '用例类型',
-    'pass': '成功',
+    'pass': '通过',
     'failure': '失败',
     'blocking': '阻塞',
     'skip': '跳过',
@@ -239,6 +239,10 @@ export default {
     'confirm_cancel_relevance': '确认取消关联',
     'plan': '计划',
     'project': '项目',
+    'recent_plan': '最近的计划',
+    'recent_case': '最近的用例',
+    'plan_delete_confirm': '确认删除测试计划: ',
+    'case_delete_confirm': '确认删除测试用例: ',
   },
   test_resource_pool: {
     'type': '类型',