Zengtudor/Nuxt
1
0
Fork 0
mirror of https://github.com/nuxt/nuxt.git synced 2024-11-23 22:25:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bug routes and add _.vue support (all)

Browse Source
This commit is contained in:
Alexandre Chopin 2017-02-03 20:23:28 +01:00
parent 17650c25e0
commit e233c5def8
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/build.js
View File

@ -234,6 +234,7 @@ function createRoutes (files, srcDir) {
let parent = routes let parent = routes
keys.forEach((key, i) => { keys.forEach((key, i) => {
route.name = route.name ? route.name + '-' + key.replace('_', '') : key.replace('_', '') route.name = route.name ? route.name + '-' + key.replace('_', '') : key.replace('_', '')
route.name += (key === '_') ? 'all' : ''
let child = _.find(parent, { name: route.name }) let child = _.find(parent, { name: route.name })
if (child) { if (child) {
if (!child.children) { if (!child.children) {
@ -245,8 +246,8 @@ function createRoutes (files, srcDir) {
if (key === 'index' && (i + 1) === keys.length) { if (key === 'index' && (i + 1) === keys.length) {
route.path += (i > 0 ? '' : '/') route.path += (i > 0 ? '' : '/')
} else { } else {
route.path += '/' + key.replace('_', ':') route.path += '/' + (key === '_' ? '*' : key.replace('_', ':'))
if (key.includes('_')) { if (key !== '_' && key.indexOf('_') !== -1) {
route.path += '?' route.path += '?'
} }
} }
@ -255,9 +256,22 @@ function createRoutes (files, srcDir) {
// Order Routes path // Order Routes path
parent.push(route) parent.push(route)
parent.sort((a, b) => { parent.sort((a, b) => {
var isA = (a.path[0] === ':' || a.path[1] === ':') ? 1 : 0 var res = 0
var isB = (b.path[0] === ':' || b.path[1] === ':') ? 1 : 0 var _a = a.path.split('/')
return (isA - isB === 0) ? a.path.length - b.path.length : isA - isB var _b = b.path.split('/')
var _max = _b.length - 1
_a.forEach((s, i) => {
if (i <= _max) {
if (res === 0) {
var y = (s.indexOf('*') > -1) ? 2 : (s.indexOf(':') > -1 ? 1 : 0)
var z = (_b[i].indexOf('*') > -1) ? 2 : (_b[i].indexOf(':') > -1 ? 1 : 0)
res = y - z
}
} else {
res = (res === 0) ? 1 : res
}
})
return res === 0 ? ((_a.length === _b.length) ? _a[_max].length - _b[_max].length : -1) : res
}) })
}) })
return cleanChildrenRoutes(routes) return cleanChildrenRoutes(routes)