fix: restore select element (config/task)

Guillaume Chau · Guillaume Chau · commit a549d566d632 · 2018-08-31T16:16:03.000+02:00
diff --git a/packages/@vue/cli-ui/src/mixins/RestoreRoute.js b/packages/@vue/cli-ui/src/mixins/RestoreRoute.js
@@ -15,6 +15,7 @@ export default function ({
 
     watch: {
       projectCurrent (value) {
+        if (!this.$_restoreRouteReady) return
         this.replaceBaseRoute()
       }
     },
@@ -28,6 +29,7 @@ export default function ({
     beforeRouteEnter (to, from, next) {
       if (lastRoute) {
         if (!to.query) {
+          console.log('lastRoute', lastRoute)
           const { name, params, query } = lastRoute
           next({ name, params, query })
           return
@@ -42,9 +44,16 @@ export default function ({
       next()
     },
 
+    mounted () {
+      this.$nextTick(() => {
+        this.$_restoreRouteReady = true
+      })
+    },
+
     methods: {
       replaceBaseRoute () {
         if (baseRoute && !isSameRoute(this.$route, baseRoute, false)) {
+          console.log('replaceBaseRoute')
           this.$router.replace(baseRoute)
         }
       }
diff --git a/packages/@vue/cli-ui/src/views/ProjectTasks.vue b/packages/@vue/cli-ui/src/views/ProjectTasks.vue
@@ -14,7 +14,6 @@
       <ApolloQuery
         :query="require('../graphql/tasks.gql')"
         class="fill-height"
-        @result="onResult"
       >
         <template slot-scope="{ result: { data, loading } }">
           <VueLoadingIndicator
@@ -99,15 +98,6 @@ export default {
           task
         })
       )
-    },
-
-    onResult ({ loading }) {
-      if (!loading && this.$route.query.id) {
-        this.$router.replace({
-          name: 'project-task-details',
-          params: { id: this.$route.query.id }
-        })
-      }
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`	`<ApolloQuery`
`15`	`15`	`:query="require('../graphql/tasks.gql')"`
`16`	`16`	`class="fill-height"`
`17`		`- @result="onResult"`
`18`	`17`	`>`
`19`	`18`	`<template slot-scope="{ result: { data, loading } }">`
`20`	`19`	`<VueLoadingIndicator`
`@@ -99,15 +98,6 @@ export default {`
`99`	`98`	`task`
`100`	`99`	`})`
`101`	`100`	`)`
`102`		`- },`
`103`		`-`
`104`		`- onResult ({ loading }) {`
`105`		`- if (!loading && this.$route.query.id) {`
`106`		`- this.$router.replace({`
`107`		`- name: 'project-task-details',`
`108`		`- params: { id: this.$route.query.id }`
`109`		`- })`
`110`		`- }`
`111`	`101`	`}`
`112`	`102`	`}`
`113`	`103`	`}`