File tree Expand file tree Collapse file tree 2 files changed +9
-10
lines changed
Expand file tree Collapse file tree 2 files changed +9
-10
lines changed Original file line number Diff line number Diff line change @@ -15,6 +15,7 @@ export default function ({
1515
1616 watch : {
1717 projectCurrent ( value ) {
18+ if ( ! this . $_restoreRouteReady ) return
1819 this . replaceBaseRoute ( )
1920 }
2021 } ,
@@ -28,6 +29,7 @@ export default function ({
2829 beforeRouteEnter ( to , from , next ) {
2930 if ( lastRoute ) {
3031 if ( ! to . query ) {
32+ console . log ( 'lastRoute' , lastRoute )
3133 const { name, params, query } = lastRoute
3234 next ( { name, params, query } )
3335 return
@@ -42,9 +44,16 @@ export default function ({
4244 next ( )
4345 } ,
4446
47+ mounted ( ) {
48+ this . $nextTick ( ( ) => {
49+ this . $_restoreRouteReady = true
50+ } )
51+ } ,
52+
4553 methods : {
4654 replaceBaseRoute ( ) {
4755 if ( baseRoute && ! isSameRoute ( this . $route , baseRoute , false ) ) {
56+ console . log ( 'replaceBaseRoute' )
4857 this . $router . replace ( baseRoute )
4958 }
5059 }
Original file line number Diff line number Diff line change 1414 <ApolloQuery
1515 :query =" require('../graphql/tasks.gql')"
1616 class =" fill-height"
17- @result =" onResult"
1817 >
1918 <template slot-scope="{ result: { data, loading } }">
2019 <VueLoadingIndicator
@@ -99,15 +98,6 @@ export default {
9998 task
10099 })
101100 )
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- }
111101 }
112102 }
113103}
You can’t perform that action at this time.
0 commit comments