Skip to content

fix(normalizeLocation): add a copy for params with named locations (fix #2800) #2802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 23, 2019
Merged

fix(normalizeLocation): add a copy for params with named locations (fix #2800) #2802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fe3cef
fix(normalizeLocation): add a copy for params with named locations
zrh122 Jun 5, 2019
e0dcda8
test: add test case for #2938
posva Sep 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ <h1>Vue Router Examples</h1>
<li><a href="redirect">Redirect</a></li>
<li><a href="route-props">Route Props</a></li>
<li><a href="route-alias">Route Alias</a></li>
<li><a href="route-params">Route Params</a></li>
<li><a href="transitions">Transitions</a></li>
<li><a href="data-fetching">Data Fetching</a></li>
<li><a href="navigation-guards">Navigation Guards</a></li>
Expand Down
58 changes: 58 additions & 0 deletions examples/route-params/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import Vue from 'vue'
import VueRouter from 'vue-router'

Vue.use(VueRouter)

const Log = {
template: `<div class="log">id: {{ $route.params.id }}, type: {{ $route.params.type }}</div>`
}

const Logs = {
template: `
<div>
<pre id="params">{{ to.params }}</pre>
<router-link :to="to" class="child-link">{{ to.params.type }}</router-link>
<router-view></router-view>
</div>
`,
data () {
return {
to: {
name: 'items.logs.type',
params: { type: 'info' }
}
}
}
}

const router = new VueRouter({
mode: 'history',
base: __dirname,
routes: [
{
path: '/items/:id/logs',
component: Logs,
children: [
{
path: ':type',
name: 'items.logs.type',
component: Log
}
]
}
]
})

new Vue({
router,
template: `
<div id="app">
<h1>Route params</h1>
<ul>
<li><router-link to="/items/1/logs">item #1</router-link></li>
<li><router-link to="/items/2/logs">item #2</router-link></li>
</ul>
<router-view class="view"></router-view>
</div>
`
}).$mount('#app')
6 changes: 6 additions & 0 deletions examples/route-params/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!DOCTYPE html>
<link rel="stylesheet" href="/global.css">
<a href="/">&larr; Examples index</a>
<div id="app"></div>
<script src="/__build__/shared.chunk.js"></script>
<script src="/__build__/route-params.js"></script>
7 changes: 6 additions & 1 deletion src/util/location.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ export function normalizeLocation (
if (next._normalized) {
return next
} else if (next.name) {
return extend({}, raw)
next = extend({}, raw)
const params = next.params
if (params && typeof params === 'object') {
next.params = extend({}, params)
}
return next
}

// relative params
Expand Down
26 changes: 26 additions & 0 deletions test/e2e/specs/route-params.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
module.exports = {
'route-params': function (browser) {
browser
.url('http://localhost:8080/route-params/')
.waitForElementVisible('#app', 1000)
.assert.count('li a', 2)

// https://github.com/vuejs/vue-router/issues/2800
.click('li:nth-child(1) a')
.assert.urlEquals('http://localhost:8080/route-params/items/1/logs')
.assert.containsText('#params', JSON.stringify({ type: 'info' }, null, 2))
.click('.child-link')
.assert.urlEquals('http://localhost:8080/route-params/items/1/logs/info')
.assert.containsText('.log', 'id: 1, type: info')
// https://github.com/vuejs/vue-router/issues/2938
.assert.containsText('#params', JSON.stringify({ type: 'info' }, null, 2))

.click('li:nth-child(2) a')
.assert.urlEquals('http://localhost:8080/route-params/items/2/logs')
.click('.child-link')
.assert.urlEquals('http://localhost:8080/route-params/items/2/logs/info')
.assert.containsText('.log', 'id: 2, type: info')

.end()
}
}