feat: 修改项目名称获取方式

firefang · Sep 21, 2019 · 2e17552 · 2e17552
1 parent f86cdcb
commit 2e17552
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 21 deletions.
diff --git a/src/api/index.js b/src/api/index.js
@@ -9,10 +9,12 @@ const api = {
   GetTags: '/statistic/tags',
   // projects
   GetProjects: '/projects',
+  GetProjectNameById: projectId => `/projects/${projectId}/name`,
   // apis
   GetApisByProjectId: projectId => `/projects/${projectId}/apis`,
   // cases
-  GetCasesByApiId: (projectId, apiId) => `/projects/${projectId}/apis/${apiId}/cases`,
+  GetCasesByApiId: (projectId, apiId) =>
+    `/projects/${projectId}/apis/${apiId}/cases`,
   // tasks
   GetTasks: '/tasks'
 }

diff --git a/src/api/project.js b/src/api/project.js
@@ -11,3 +11,10 @@ export function getProjects (params) {
     params: params
   })
 }
+
+export function getProjectNameById (projectId) {
+  return axios({
+    url: api.GetProjectNameById(projectId),
+    method: 'get'
+  })
+}
diff --git a/src/config/router.config.js b/src/config/router.config.js
@@ -89,8 +89,9 @@ export const asyncRouterMap = [
             component: () => import('@/views/project/ProjectDetail'),
             hidden: true,
             meta: { title: '项目详情' },
-            // 在代码中跳转
-            // redirect: '/project/:projectId/info',
+            redirect: to => {
+              return `/project/${to.params.projectId}/info`
+            },
             children: [
               {
                 path: '/project/:projectId/info',

diff --git a/src/mock/services/project.js b/src/mock/services/project.js
@@ -1,5 +1,5 @@
 import Mock from 'mockjs2'
-import { pageBuilder } from '../util'
+import { pageBuilder, builder } from '../util'
 
 const getProjects = options => {
   return pageBuilder(options, i => {
@@ -16,4 +16,9 @@ const getProjects = options => {
   })
 }
 
+const getProjectNameById = options => {
+  return builder(Mock.mock('@ctitle(3, 6)'))
+}
+
+Mock.mock(/\/projects\/\d+\/name/, 'get', getProjectNameById)
 Mock.mock(/\/projects/, 'get', getProjects)
diff --git a/src/views/project/ProjectDetail.vue b/src/views/project/ProjectDetail.vue
@@ -28,6 +28,7 @@
 
 <script>
 import { RouteView } from '@/layouts'
+import { getProjectNameById } from '@/api/project'
 import { getApisByProjectId } from '@/api/api'
 import { getCasesByApiId } from '@/api/case'
 
@@ -40,7 +41,6 @@ export default {
     return {
       spinning: true,
       root: null,
-      name: null,
       treeData: [],
       expandedKeys: []
     }
@@ -81,30 +81,34 @@ export default {
     onTreeSelect (selectedKeys, e) {
       const { dataRef } = e.node
       if (!e.selected) {
+        // 禁止取消选择
         selectedKeys.push(dataRef.key)
       } else {
         const { id } = dataRef
         switch (dataRef.type) {
           case 'p':
-            this.$router.push({ name: 'ProjectInfo', params: { projectId: id }, query: { name: this.name } })
+            this.$router.push({ name: 'ProjectInfo', params: { projectId: id } })
             break
           case 'a':
-            this.$router.push({ name: 'ApiInfo', params: { projectId: this.root.id, apiId: id }, query: { name: this.name } })
+            this.$router.push({ name: 'ApiInfo', params: { projectId: this.root.id, apiId: id } })
             break
           case 'c':
-            this.$router.push({ name: 'CaseInfo', params: { projectId: this.root.id, apiId: dataRef.apiId, caseId: id }, query: { name: this.name } })
+            this.$router.push({ name: 'CaseInfo', params: { projectId: this.root.id, apiId: dataRef.apiId, caseId: id } })
             break
           default:
             break
         }
       }
     },
     initTreeData (projectId) {
-      getApisByProjectId(projectId)
-        .then(resp => {
-          this.name = this.$route.query.name
-          this.root = { id: this.$route.params.projectId, title: this.name, key: 'root', type: 'p', scopedSlots: { icon: 'project' } }
-          this.root.children = resp.data.map(d => {
+      const p1 = getProjectNameById(projectId)
+      const p2 = getApisByProjectId(projectId)
+      Promise.all([p1, p2])
+        .then(results => {
+          const name = results[0].data
+          const apis = results[1].data
+          this.root = { id: this.$route.params.projectId, title: name, key: 'root', type: 'p', scopedSlots: { icon: 'project' } }
+          this.root.children = apis.map(d => {
             return {
               id: d.id,
               title: d.name,
@@ -115,9 +119,6 @@ export default {
           })
           this.treeData.push(this.root)
           this.expandedKeys.push('root')
-          if (this.$route.name !== 'ProjectInfo') {
-            this.$router.replace({ name: 'ProjectInfo', params: { projectId: this.root.id }, query: { name: this.name } })
-          }
         })
         .catch(e => e)
         .finally(() => {

diff --git a/src/views/project/ProjectList.vue b/src/views/project/ProjectList.vue
@@ -54,11 +54,7 @@
       showPagination="auto"
       :pageSize="15"
     >
-      <router-link
-        slot="name"
-        slot-scope="text, record"
-        :to="{path: `/project/${record.id}`, query: {name: text}}"
-      >{{text}}</router-link>
+      <router-link slot="name" slot-scope="text, record" :to="`/project/${record.id}`">{{text}}</router-link>
       <span slot="description" slot-scope="text">
         <ellipsis :length="30" tooltip>{{ text }}</ellipsis>
       </span>