Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
Starter Web Vue
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
product
kim3-web-vue
Starter Web Vue
Commits
6764e9f3
Commit
6764e9f3
authored
Jul 03, 2021
by
水落(YangLei)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 去掉无用代码
parent
54e23abb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
144 deletions
+40
-144
src/router/async/config.async.js
src/router/async/config.async.js
+0
-24
src/router/async/router.map.js
src/router/async/router.map.js
+0
-56
src/router/config.js
src/router/config.js
+5
-5
src/utils/routerUtil.js
src/utils/routerUtil.js
+35
-59
No files found.
src/router/async/config.async.js
deleted
100644 → 0
View file @
54e23abb
import
routerMap
from
'
./router.map
'
import
{
parseRoutes
}
from
'
@/utils/routerUtil
'
// 异步路由配置
const
routesConfig
=
[
'
login
'
,
'
root
'
,
{
router
:
'
exp404
'
,
path
:
'
*
'
,
name
:
'
404
'
},
{
router
:
'
exp403
'
,
path
:
'
/403
'
,
name
:
'
403
'
}
]
const
options
=
{
routes
:
parseRoutes
(
routesConfig
,
routerMap
)
}
export
default
options
src/router/async/router.map.js
deleted
100644 → 0
View file @
54e23abb
// 视图组件
const
view
=
{
tabs
:
()
=>
import
(
'
@/pages/frame/view/template/TabsTemplateView
'
),
page
:
()
=>
import
(
'
@/pages/frame/view/template/PageTemplateView
'
),
};
// 路由组件注册
const
routerMap
=
{
login
:
{
authority
:
'
*
'
,
path
:
'
/login
'
,
component
:
()
=>
import
(
'
@/pages/frame/view/login
'
),
},
root
:
{
path
:
'
/
'
,
name
:
'
首页
'
,
redirect
:
'
/login
'
,
component
:
view
.
tabs
,
},
exp403
:
{
authority
:
'
*
'
,
name
:
'
403错误
'
,
path
:
'
403
'
,
component
:
()
=>
import
(
'
@/pages/frame/view/exception/403
'
),
},
exp404
:
{
name
:
'
404错误
'
,
path
:
'
404
'
,
component
:
()
=>
import
(
'
@/pages/frame/view/exception/404
'
),
},
exp500
:
{
name
:
'
500错误
'
,
path
:
'
500
'
,
component
:
()
=>
import
(
'
@/pages/frame/view/exception/500
'
),
},
dashboard
:
{
name
:
'
Dashboard
'
,
},
workbench
:
{
name
:
'
工作台
'
,
component
:
()
=>
import
(
'
@/pages/dashboard/workbench
'
),
},
analysis
:
{
name
:
'
分析页
'
,
component
:
()
=>
import
(
'
@/pages/dashboard/analysis
'
),
},
system_management
:
{
name
:
'
系统管理
'
,
component
:
view
.
page
,
},
menu_management
:
{
name
:
'
菜单管理
'
,
component
:
()
=>
import
(
'
@/pages/system/view/menu
'
),
},
};
export
default
routerMap
;
src/router/config.js
View file @
6764e9f3
...
@@ -9,11 +9,6 @@ const options = {
...
@@ -9,11 +9,6 @@ const options = {
name
:
'
登录页
'
,
name
:
'
登录页
'
,
component
:
()
=>
import
(
'
@/pages/frame/view/login
'
),
component
:
()
=>
import
(
'
@/pages/frame/view/login
'
),
},
},
{
path
:
'
*
'
,
name
:
'
404
'
,
component
:
()
=>
import
(
'
@/pages/frame/view/exception/404
'
),
},
{
{
path
:
'
/403
'
,
path
:
'
/403
'
,
name
:
'
403
'
,
name
:
'
403
'
,
...
@@ -154,6 +149,11 @@ const options = {
...
@@ -154,6 +149,11 @@ const options = {
},
},
],
],
},
},
{
path
:
'
*
'
,
name
:
'
404
'
,
component
:
()
=>
import
(
'
@/pages/frame/view/exception/404
'
),
},
],
],
};
};
...
...
src/utils/routerUtil.js
View file @
6764e9f3
import
routerMap
from
"
@/router/async/router.map
"
;
import
{
mergeI18nFromRoutes
}
from
'
@/utils/i18nUtil
'
;
import
{
mergeI18nFromRoutes
}
from
"
@/utils/i18nUtil
"
;
import
deepMerge
from
'
deepmerge
'
;
import
Router
from
"
vue-router
"
;
import
deepMerge
from
"
deepmerge
"
;
import
basicOptions
from
"
@/router/async/config.async
"
;
//应用配置
//应用配置
let
appOptions
=
{
let
appOptions
=
{
...
@@ -29,20 +26,20 @@ function setAppOptions(options) {
...
@@ -29,20 +26,20 @@ function setAppOptions(options) {
*/
*/
function
parseRoutes
(
routesConfig
,
routerMap
)
{
function
parseRoutes
(
routesConfig
,
routerMap
)
{
let
routes
=
[];
let
routes
=
[];
routesConfig
.
forEach
(
(
item
)
=>
{
routesConfig
.
forEach
(
item
=>
{
// 获取注册在 routerMap 中的 router,初始化 routeCfg
// 获取注册在 routerMap 中的 router,初始化 routeCfg
let
router
=
undefined
,
let
router
=
undefined
,
routeCfg
=
{};
routeCfg
=
{};
if
(
typeof
item
===
"
string
"
)
{
if
(
typeof
item
===
'
string
'
)
{
router
=
routerMap
[
item
];
router
=
routerMap
[
item
];
routeCfg
=
{
path
:
(
router
&&
router
.
path
)
||
item
,
router
:
item
};
routeCfg
=
{
path
:
(
router
&&
router
.
path
)
||
item
,
router
:
item
};
}
else
if
(
typeof
item
===
"
object
"
)
{
}
else
if
(
typeof
item
===
'
object
'
)
{
router
=
routerMap
[
item
.
router
];
router
=
routerMap
[
item
.
router
];
routeCfg
=
item
;
routeCfg
=
item
;
}
}
if
(
!
router
)
{
if
(
!
router
)
{
console
.
warn
(
`can't find register for router
${
routeCfg
.
router
}
, please register it in advance.`
);
console
.
warn
(
`can't find register for router
${
routeCfg
.
router
}
, please register it in advance.`
);
router
=
typeof
item
===
"
string
"
?
{
path
:
item
,
name
:
item
}
:
item
;
router
=
typeof
item
===
'
string
'
?
{
path
:
item
,
name
:
item
}
:
item
;
}
}
// 从 router 和 routeCfg 解析路由
// 从 router 和 routeCfg 解析路由
const
route
=
{
const
route
=
{
...
@@ -52,7 +49,11 @@ function parseRoutes(routesConfig, routerMap) {
...
@@ -52,7 +49,11 @@ function parseRoutes(routesConfig, routerMap) {
redirect
:
routeCfg
.
redirect
||
router
.
redirect
,
redirect
:
routeCfg
.
redirect
||
router
.
redirect
,
meta
:
{
meta
:
{
authority
:
authority
:
routeCfg
.
authority
||
router
.
authority
||
routeCfg
.
meta
?.
authority
||
router
.
meta
?.
authority
||
"
*
"
,
routeCfg
.
authority
||
router
.
authority
||
routeCfg
.
meta
?.
authority
||
router
.
meta
?.
authority
||
'
*
'
,
icon
:
routeCfg
.
icon
||
router
.
icon
||
routeCfg
.
meta
?.
icon
||
router
.
meta
?.
icon
,
icon
:
routeCfg
.
icon
||
router
.
icon
||
routeCfg
.
meta
?.
icon
||
router
.
meta
?.
icon
,
page
:
routeCfg
.
page
||
router
.
page
||
routeCfg
.
meta
?.
page
||
router
.
meta
?.
page
,
page
:
routeCfg
.
page
||
router
.
page
||
routeCfg
.
meta
?.
page
||
router
.
meta
?.
page
,
link
:
routeCfg
.
link
||
router
.
link
||
routeCfg
.
meta
?.
link
||
router
.
meta
?.
link
,
link
:
routeCfg
.
link
||
router
.
link
||
routeCfg
.
meta
?.
link
||
router
.
meta
?.
link
,
...
@@ -74,51 +75,26 @@ function parseRoutes(routesConfig, routerMap) {
...
@@ -74,51 +75,26 @@ function parseRoutes(routesConfig, routerMap) {
* @param routesConfig {RouteConfig[]} 路由配置
* @param routesConfig {RouteConfig[]} 路由配置
*/
*/
function
loadRoutes
(
routesConfig
)
{
function
loadRoutes
(
routesConfig
)
{
// 应用配置
// 应用配置
const
{
router
,
store
,
i18n
}
=
appOptions
;
const
{
router
,
store
,
i18n
}
=
appOptions
;
// 如果 routesConfig 有值,则更新到本地,否则从本地获取
// 如果 routesConfig 有值,则更新到本地,否则从本地获取
if
(
routesConfig
)
{
if
(
routesConfig
)
{
store
.
commit
(
"
accountModule/setRoutesConfig
"
,
routesConfig
);
store
.
commit
(
'
accountModule/setRoutesConfig
'
,
routesConfig
);
}
else
{
}
else
{
routesConfig
=
store
.
getters
[
"
accountModule/routesConfig
"
];
routesConfig
=
store
.
getters
[
'
accountModule/routesConfig
'
];
}
// 如果开启了异步路由,则加载异步路由配置
const
asyncRoutes
=
store
.
state
.
settingModule
.
asyncRoutes
;
if
(
asyncRoutes
)
{
if
(
routesConfig
&&
routesConfig
.
length
>
0
)
{
const
routes
=
parseRoutes
(
routesConfig
,
routerMap
);
const
finalRoutes
=
mergeRoutes
(
basicOptions
.
routes
,
routes
);
formatRoutes
(
finalRoutes
);
router
.
options
=
{
...
router
.
options
,
routes
:
finalRoutes
};
router
.
matcher
=
new
Router
({
...
router
.
options
,
routes
:
[]
}).
matcher
;
router
.
addRoutes
(
finalRoutes
);
}
}
}
// 提取路由国际化数据
// 提取路由国际化数据
mergeI18nFromRoutes
(
i18n
,
router
.
options
.
routes
);
mergeI18nFromRoutes
(
i18n
,
router
.
options
.
routes
);
// 初始化Admin后台菜单数据
// 初始化Admin后台菜单数据
const
rootRoute
=
router
.
options
.
routes
.
find
(
(
item
)
=>
item
.
path
===
"
/
"
);
const
rootRoute
=
router
.
options
.
routes
.
find
(
item
=>
item
.
path
===
'
/
'
);
const
menuRoutes
=
rootRoute
&&
rootRoute
.
children
;
const
menuRoutes
=
rootRoute
&&
rootRoute
.
children
;
if
(
menuRoutes
)
{
if
(
menuRoutes
)
{
store
.
commit
(
"
settingModule/setMenuData
"
,
menuRoutes
);
store
.
commit
(
'
settingModule/setMenuData
'
,
menuRoutes
);
}
}
}
}
/**
* 合并路由
* @param target {Route[]}
* @param source {Route[]}
* @returns {Route[]}
*/
function
mergeRoutes
(
target
,
source
)
{
const
routesMap
=
{};
target
.
forEach
((
item
)
=>
(
routesMap
[
item
.
path
]
=
item
));
source
.
forEach
((
item
)
=>
(
routesMap
[
item
.
path
]
=
item
));
return
Object
.
values
(
routesMap
);
}
/**
/**
* 深度合并路由
* 深度合并路由
* @param target {Route[]}
* @param target {Route[]}
...
@@ -127,9 +103,9 @@ function mergeRoutes(target, source) {
...
@@ -127,9 +103,9 @@ function mergeRoutes(target, source) {
*/
*/
function
deepMergeRoutes
(
target
,
source
)
{
function
deepMergeRoutes
(
target
,
source
)
{
// 映射路由数组
// 映射路由数组
const
mapRoutes
=
(
routes
)
=>
{
const
mapRoutes
=
routes
=>
{
const
routesMap
=
{};
const
routesMap
=
{};
routes
.
forEach
(
(
item
)
=>
{
routes
.
forEach
(
item
=>
{
routesMap
[
item
.
path
]
=
{
routesMap
[
item
.
path
]
=
{
...
item
,
...
item
,
children
:
item
.
children
?
mapRoutes
(
item
.
children
)
:
undefined
,
children
:
item
.
children
?
mapRoutes
(
item
.
children
)
:
undefined
,
...
@@ -144,8 +120,8 @@ function deepMergeRoutes(target, source) {
...
@@ -144,8 +120,8 @@ function deepMergeRoutes(target, source) {
const
merge
=
deepMerge
(
tarMap
,
srcMap
);
const
merge
=
deepMerge
(
tarMap
,
srcMap
);
// 转换为 routes 数组
// 转换为 routes 数组
const
parseRoutesMap
=
(
routesMap
)
=>
{
const
parseRoutesMap
=
routesMap
=>
{
return
Object
.
values
(
routesMap
).
map
(
(
item
)
=>
{
return
Object
.
values
(
routesMap
).
map
(
item
=>
{
if
(
item
.
children
)
{
if
(
item
.
children
)
{
item
.
children
=
parseRoutesMap
(
item
.
children
);
item
.
children
=
parseRoutesMap
(
item
.
children
);
}
else
{
}
else
{
...
@@ -162,10 +138,10 @@ function deepMergeRoutes(target, source) {
...
@@ -162,10 +138,10 @@ function deepMergeRoutes(target, source) {
* @param routes 路由配置
* @param routes 路由配置
*/
*/
function
formatRoutes
(
routes
)
{
function
formatRoutes
(
routes
)
{
routes
.
forEach
(
(
route
)
=>
{
routes
.
forEach
(
route
=>
{
const
{
path
}
=
route
;
const
{
path
}
=
route
;
if
(
!
path
.
startsWith
(
"
/
"
)
&&
path
!==
"
*
"
)
{
if
(
!
path
.
startsWith
(
'
/
'
)
&&
path
!==
'
*
'
)
{
route
.
path
=
"
/
"
+
path
;
route
.
path
=
'
/
'
+
path
;
}
}
});
});
formatAuthority
(
routes
);
formatAuthority
(
routes
);
...
@@ -177,19 +153,19 @@ function formatRoutes(routes) {
...
@@ -177,19 +153,19 @@ function formatRoutes(routes) {
* @param pAuthorities 父级路由权限配置集合
* @param pAuthorities 父级路由权限配置集合
*/
*/
function
formatAuthority
(
routes
,
pAuthorities
=
[])
{
function
formatAuthority
(
routes
,
pAuthorities
=
[])
{
routes
.
forEach
(
(
route
)
=>
{
routes
.
forEach
(
route
=>
{
const
meta
=
route
.
meta
;
const
meta
=
route
.
meta
;
const
defaultAuthority
=
pAuthorities
[
pAuthorities
.
length
-
1
]
||
{
permission
:
"
*
"
};
const
defaultAuthority
=
pAuthorities
[
pAuthorities
.
length
-
1
]
||
{
permission
:
'
*
'
};
if
(
meta
)
{
if
(
meta
)
{
let
authority
=
{};
let
authority
=
{};
if
(
!
meta
.
authority
)
{
if
(
!
meta
.
authority
)
{
authority
=
defaultAuthority
;
authority
=
defaultAuthority
;
}
else
if
(
typeof
meta
.
authority
===
"
string
"
)
{
}
else
if
(
typeof
meta
.
authority
===
'
string
'
)
{
authority
.
permission
=
meta
.
authority
;
authority
.
permission
=
meta
.
authority
;
}
else
if
(
typeof
meta
.
authority
===
"
object
"
)
{
}
else
if
(
typeof
meta
.
authority
===
'
object
'
)
{
authority
=
meta
.
authority
;
authority
=
meta
.
authority
;
const
{
role
}
=
authority
;
const
{
role
}
=
authority
;
if
(
typeof
role
===
"
string
"
)
{
if
(
typeof
role
===
'
string
'
)
{
authority
.
role
=
[
role
];
authority
.
role
=
[
role
];
}
}
if
(
!
authority
.
permission
&&
!
authority
.
role
)
{
if
(
!
authority
.
permission
&&
!
authority
.
role
)
{
...
@@ -214,9 +190,9 @@ function formatAuthority(routes, pAuthorities = []) {
...
@@ -214,9 +190,9 @@ function formatAuthority(routes, pAuthorities = []) {
* @returns {*}
* @returns {*}
*/
*/
function
getI18nKey
(
path
)
{
function
getI18nKey
(
path
)
{
const
keys
=
path
.
split
(
"
/
"
).
filter
((
item
)
=>
!
item
.
startsWith
(
"
:
"
)
&&
item
!=
""
);
const
keys
=
path
.
split
(
'
/
'
).
filter
(
item
=>
!
item
.
startsWith
(
'
:
'
)
&&
item
!=
''
);
keys
.
push
(
"
name
"
);
keys
.
push
(
'
name
'
);
return
keys
.
join
(
"
.
"
);
return
keys
.
join
(
'
.
'
);
}
}
/**
/**
...
@@ -227,13 +203,13 @@ function getI18nKey(path) {
...
@@ -227,13 +203,13 @@ function getI18nKey(path) {
function
loadGuards
(
guards
,
options
)
{
function
loadGuards
(
guards
,
options
)
{
const
{
beforeEach
,
afterEach
}
=
guards
;
const
{
beforeEach
,
afterEach
}
=
guards
;
const
{
router
}
=
options
;
const
{
router
}
=
options
;
beforeEach
.
forEach
(
(
guard
)
=>
{
beforeEach
.
forEach
(
guard
=>
{
if
(
guard
&&
typeof
guard
===
"
function
"
)
{
if
(
guard
&&
typeof
guard
===
'
function
'
)
{
router
.
beforeEach
((
to
,
from
,
next
)
=>
guard
(
to
,
from
,
next
,
options
));
router
.
beforeEach
((
to
,
from
,
next
)
=>
guard
(
to
,
from
,
next
,
options
));
}
}
});
});
afterEach
.
forEach
(
(
guard
)
=>
{
afterEach
.
forEach
(
guard
=>
{
if
(
guard
&&
typeof
guard
===
"
function
"
)
{
if
(
guard
&&
typeof
guard
===
'
function
'
)
{
router
.
afterEach
((
to
,
from
)
=>
guard
(
to
,
from
,
options
));
router
.
afterEach
((
to
,
from
)
=>
guard
(
to
,
from
,
options
));
}
}
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment