Merge branch 'master' of https://github.com/metersphere/metersphere

frontend/src/business/components/common/head/SearchList.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-loading="result.loading">
-    <el-input placeholder="搜索项目"
+    <el-input :placeholder="$t('project.search_by_name')"
               prefix-icon="el-icon-search"
               v-model="searchString"
               clearable
@@ -8,7 +8,7 @@
               size="small"/>
     <div v-if="items.length === 0" style="text-align: center; margin: 15px 0">
         <span style="font-size: 15px; color: #8a8b8d;">
-          无数据
+          {{ $t('project.no_data') }}
         </span>
     </div>
     <div v-else style="height: 150px;overflow: auto">
@@ -114,7 +114,7 @@ export default {
           this.$emit("update:currentProject", project[0].name);
         }
       } else {
-        this.$emit("update:currentProject", '选择项目');
+        this.$emit("update:currentProject", this.$t('project.select'));
       }
     }
   }

frontend/src/business/components/settings/project/MsProject.vue

@@ -5,7 +5,7 @@
         <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="search" @create="create"
                          :create-tip="btnTips" :title="$t('commons.project')"/>
       </template>
-      <el-table border class="adjust-table" @row-click="link" :data="items" style="width: 100%" @sort-change="sort">
+      <el-table border class="adjust-table" :data="items" style="width: 100%" @sort-change="sort">
         <el-table-column prop="name" :label="$t('commons.name')" width="250" show-overflow-tooltip/>
         <el-table-column prop="description" :label="$t('commons.description')" show-overflow-tooltip>
           <template v-slot:default="scope">
@@ -95,7 +95,6 @@ import MsDeleteConfirm from "../../common/components/MsDeleteConfirm";
 import MsTableOperatorButton from "../../common/components/MsTableOperatorButton";
 import ApiEnvironmentConfig from "../../api/test/components/ApiEnvironmentConfig";
 import TemplateComponent from "../../track/plan/view/comonents/report/TemplateComponent/TemplateComponent";
-import {ApiEvent, LIST_CHANGE, PerformanceEvent, TrackEvent} from "@/business/components/common/head/ListEvent";
 import {PROJECT_ID} from "@/common/js/constants";
 
 export default {
@@ -223,10 +222,6 @@ export default {
           }
           Message.success(this.$t('commons.delete_success'));
           this.list();
-          // 发送广播，刷新 head 上的最新列表
-          ApiEvent.$emit(LIST_CHANGE);
-          TrackEvent.$emit(LIST_CHANGE);
-          PerformanceEvent.$emit(LIST_CHANGE);
         });
       }).catch(() => {
         this.$message({
@@ -253,22 +248,6 @@ export default {
         this.total = data.itemCount;
       })
     },
-    link(row) {
-      // performance_test project link
-      if (this.$route.name === 'perProject') {
-        this.$router.push({
-          path: '/performance/test/' + row.id,
-        })
-      } else if (this.$route.name === 'fucProject') {
-        this.$router.push({
-          path: '/api/test/list/' + row.id
-        })
-      } else if (this.$route.name === 'trackProject') {
-        this.$router.push({
-          path: '/track/case/' + row.id
-        })
-      }
-    },
     sort(column) {
       _sort(column, this.condition);
       this.list();
@@ -292,11 +271,6 @@ export default {
 </script>
 
 <style scoped>
-
-.el-table {
-  cursor: pointer;
-}
-
   pre {
     margin: 0 0;
   }

frontend/src/i18n/en-US.js

@@ -304,6 +304,8 @@ export default {
     jira_key: 'JIRA Project key',
     zentao_id: 'Zentao Project ID',
     manager: 'Manager',
+    no_data: 'No Data',
+    select: 'Select'
   },
   member: {
     create: 'Create',

frontend/src/i18n/zh-CN.js

@@ -301,6 +301,8 @@ export default {
     jira_key: 'JIRA项目key',
     zentao_id: 'Zentao项目ID',
     manager: '项目管理',
+    no_data: '无数据',
+    select: '选择项目'
   },
   member: {
     create: '添加成员',

frontend/src/i18n/zh-TW.js

@@ -301,6 +301,8 @@ export default {
     jira_key: 'JIRA項目key',
     zentao_id: 'Zentao項目ID',
     manager: '項目管理',
+    no_data: '無數據',
+    select: '選擇項目'
   },
   member: {
     create: '添加成員',