add support for query options when using path syntax in v-link and router.go (close #205)

Author: yyx990803

lib/route-recognizer.js

@@ -415,13 +415,13 @@ RouteRecognizer.prototype = {
     if (output.charAt(0) !== '/') { output = '/' + output; }
 
     if (params && params.queryParams) {
-      output += this.generateQueryString(params.queryParams, route.handlers);
+      output += this.generateQueryString(params.queryParams);
     }
 
     return output;
   },
 
-  generateQueryString: function(params, handlers) {
+  generateQueryString: function(params) {
     var pairs = [];
     var keys = [];
     for(var key in params) {

src/index.js

@@ -530,13 +530,22 @@ class Router {
   _stringifyPath (path) {
     if (path && typeof path === 'object') {
       if (path.name) {
-        var params = path.params || {}
+        const params = path.params || {}
         if (path.query) {
           params.queryParams = path.query
         }
         return this._recognizer.generate(path.name, params)
       } else if (path.path) {
-        return path.path
+        let fullPath = path.path
+        if (path.query) {
+          const query = this._recognizer.generateQueryString(path.query)
+          if (fullPath.indexOf('?') > -1) {
+            fullPath += '&' + query.slice(1)
+          } else {
+            fullPath += query
+          }
+        }
+        return fullPath
       } else {
         return ''
       }

test/unit/specs/core.js

@@ -244,18 +244,18 @@ describe('Core', function () {
         component: {
           template:
             '<div>' +
-              '<a id="link-a" v-link="{ path: \'b\' }">Link A</a>' +
+              '<a id="link-a" v-link="{ path: \'b\', query: { id: 123 }}">Link A</a>' +
             '</div>'
         }
       },
       '/b': {
         component: {
           data: function () {
-            return { a: 'a' }
+            return { a: 'a?a=1' }
           },
           template:
             '<div>' +
-              '<a id="link-b" v-link="{ path: \'/\' + a }">Link B</a>' +
+              '<a id="link-b" v-link="{ path: \'/\' + a, query: { b: 2 }}">Link B</a>' +
               '<a id="link-c" v-link="{ path: c }"></c>' +
             '</div>'
         }
@@ -283,12 +283,12 @@ describe('Core', function () {
     nextTick(function () {
       expect(el.textContent).toBe('Link A')
       var link = el.querySelector('#link-a')
-      expect(link.getAttribute('href')).toBe('b')
+      expect(link.getAttribute('href')).toBe('b?id=123')
       click(link)
       nextTick(function () {
         expect(el.textContent).toBe('Link B')
         var link = el.querySelector('#link-b')
-        expect(link.getAttribute('href')).toBe('/a')
+        expect(link.getAttribute('href')).toBe('/a?a=1&b=2')
         // falsy expressions should not set href
         expect(el.querySelector('#link-c').hasAttribute('href')).toBe(false)
         click(link)