fix: restore select element (config/task)

This commit is contained in:
Guillaume Chau
2018-08-31 16:16:03 +02:00
parent de73414724
commit a549d566d6
2 changed files with 9 additions and 10 deletions

View File

@@ -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)
}
}

View File

@@ -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 }
})
}
}
}
}