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

frontend/src/business/components/api/head/ApiHeaderMenus.vue

@@ -2,38 +2,35 @@
   <div id="menu-bar">
     <el-row type="flex">
       <el-col :span="8">
-        <el-menu class="header-menu" :unique-opened="true" mode="horizontal" router :default-active='$route.path'>
+        <el-menu class="header-menu" :unique-opened="true" mode="horizontal" router :default-active='$route.path'
+                 menu-trigger="click">
           <el-menu-item :index="'/api/home'">
             {{ $t("i18n.home") }}
           </el-menu-item>
 
-          <el-submenu v-if="isCurrentWorkspaceUser"
+          <el-submenu v-if="isCurrentWorkspaceUser" index="3">
-                      index="3" popper-class="submenu">
             <template v-slot:title>{{$t('commons.project')}}</template>
             <ms-recent-list :options="projectRecent"/>
-            <el-divider/>
+            <el-divider class="menu-divider"/>
             <ms-show-all :index="'/api/project/all'"/>
-            <ms-create-button v-permission="['test_manager', 'test_user']" :index="'/api/project/create'" :title="$t('project.create')"/>
+            <ms-create-button v-permission="['test_manager', 'test_user']" :index="'/api/project/create'"
+                              :title="$t('project.create')"/>
           </el-submenu>
 
-          <el-submenu v-if="isCurrentWorkspaceUser"
+          <el-submenu v-if="isCurrentWorkspaceUser" index="4">
-                      index="4" popper-class="submenu">
             <template v-slot:title>{{$t('commons.test')}}</template>
             <ms-recent-list :options="testRecent"/>
-            <el-divider/>
+            <el-divider class="menu-divider"/>
             <ms-show-all :index="'/api/test/list/all'"/>
-            <ms-create-button v-permission="['test_manager', 'test_user']" :index="'/api/test/create'" :title="$t('load_test.create')"/>
+            <ms-create-button v-permission="['test_manager', 'test_user']" :index="'/api/test/create'"
-            <!--            <el-menu-item :index="testCaseProjectPath" class="blank_item"></el-menu-item>-->
+                              :title="$t('load_test.create')"/>
-            <!--            <el-menu-item :index="testEditPath" class="blank_item"></el-menu-item>-->
           </el-submenu>
 
-          <el-submenu v-if="isCurrentWorkspaceUser"
+          <el-submenu v-if="isCurrentWorkspaceUser" index="5">
-                      index="5" popper-class="submenu">
             <template v-slot:title>{{$t('commons.report')}}</template>
             <ms-recent-list :options="reportRecent"/>
-            <el-divider/>
+            <el-divider class="menu-divider"/>
             <ms-show-all :index="'/api/report/list/all'"/>
-            <!--            <el-menu-item :index="reportViewPath" class="blank_item"></el-menu-item>-->
           </el-submenu>
         </el-menu>
       </el-col>
@@ -62,10 +59,6 @@
     data() {
       return {
         isCurrentWorkspaceUser: false,
-        // testCaseProjectPath: '',
-        // testEditPath: '',
-        // reportViewPath: '',
-        // isRouterAlive: true,
         projectRecent: {
           title: this.$t('project.recent'),
           url: "/project/recent/5",
@@ -96,55 +89,20 @@
         }
       }
     },
-    // watch: {
-    //   '$route'(to, from) {
-    //     let path = to.path;
-    //     //激活菜单栏
-    //     if (path.indexOf("/api/test/") >= 0) {
-    //       this.testCaseProjectPath = '/api/test/' + this.$route.params.projectId;
-    //       this.reload();
-    //     }
-    //     if (path.indexOf("/api/test/edit/") >= 0) {
-    //       this.testEditPath = '/api/test/edit/' + this.$route.params.testId;
-    //       this.reload();
-    //     }
-    //     if (path.indexOf("/api/report/view/") >= 0) {
-    //       this.reportViewPath = '/api/report/view/' + this.$route.params.reportId;
-    //       this.reload();
-    //     }
-    //   }
-    // },
     mounted() {
       this.isCurrentWorkspaceUser = checkoutCurrentWorkspace();
     },
-    // methods: {
-    //   reload() {
-    //     this.isRouterAlive = false;
-    //     this.$nextTick(function () {
-    //       this.isRouterAlive = true;
-    //     })
-    //   }
-    // }
   }
 
 </script>
 
 <style scoped>
-  .el-divider--horizontal {
-    margin: 0;
-  }
-
-  .el-menu.el-menu--horizontal {
-    border-bottom: none;
-  }
-
   #menu-bar {
     border-bottom: 1px solid #E6E6E6;
     background-color: #FFF;
   }
 
-  .blank_item {
+  .menu-divider {
-    display: none;
+    margin: 0;
   }
-
 </style>

frontend/src/business/components/api/test/ApiTestConfig.vue

@@ -85,9 +85,7 @@
 
     methods: {
       init() {
-        this.result = this.$get("/project/listAll", response => {
+        let projectId;
-          this.projects = response.data;
-        })
         if (this.id) {
           this.create = false;
           this.getTest(this.id);
@@ -97,7 +95,14 @@
           if (this.$refs.config) {
             this.$refs.config.reset();
           }
+          // 仅创建时获取选择的项目
+          projectId = this.$store.state.common.projectId;
         }
+        this.result = this.$get("/project/listAll", response => {
+          this.projects = response.data;
+          // 等待项目列表加载完
+          if (projectId) this.test.projectId = projectId;
+        })
       },
       getTest(id) {
         this.result = this.$get("/api/get/" + id, response => {

frontend/src/business/components/api/test/ApiTestList.vue

@@ -150,6 +150,9 @@
       },
       init() {
         this.projectId = this.$route.params.projectId;
+        if (this.projectId && this.projectId !== "all") {
+          this.$store.commit('setProjectId', this.projectId);
+        }
         this.search();
       },
      /* filter(value, row) {

frontend/src/business/store.js

@@ -3,6 +3,17 @@ import Vuex from 'vuex'
 
 Vue.use(Vuex);
 
+const Common = {
+  state: {
+    projectId: ""
+  },
+  mutations: {
+    setProjectId(state, projectId) {
+      state.projectId = projectId;
+    }
+  }
+}
+
 const API = {
   state: {
     test: {}
@@ -14,13 +25,12 @@ const API = {
     clearTest(state) {
       state.test = {};
     }
-  },
+  }
-  actions: {},
-  getters: {}
 }
 
 export default new Vuex.Store({
   modules: {
-    api: API
+    api: API,
+    common: Common
   }
 })

frontend/src/i18n/en-US.js

@@ -4,6 +4,7 @@ export default {
     'organization': 'Organization',
     'setting': 'Setting',
     'project': 'Project',
+    current_project: 'Current Project',
     'name': 'Name',
     'description': 'Description',
     'clear': 'Clear',

frontend/src/i18n/zh-CN.js

@@ -4,6 +4,7 @@ export default {
     'organization': '组织',
     'setting': '设置',
     'project': '项目',
+    current_project: '当前项目',
     'name': '名称',
     'description': '描述',
     'clear': '清空',

frontend/src/i18n/zh-TW.js

@@ -4,6 +4,7 @@ export default {
     'organization': '組織',
     'setting': '設置',
     'project': '項目',
+    current_project: '當前項目',
     'name': '名稱',
     'description': '描述',
     'clear': '清空',