Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
b8353fe1
Commit
b8353fe1
authored
Oct 14, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fix menu permission failure
parent
9abba7af
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
index.ts
src/router/menus/index.ts
+9
-3
feat.ts
src/router/routes/modules/demo/feat.ts
+1
-0
types.d.ts
src/router/types.d.ts
+3
-1
No files found.
src/router/menus/index.ts
View file @
b8353fe1
...
@@ -6,6 +6,7 @@ import { transformMenuModule, flatMenus, getAllParentPath } from '/@/utils/helpe
...
@@ -6,6 +6,7 @@ import { transformMenuModule, flatMenus, getAllParentPath } from '/@/utils/helpe
import
{
filter
}
from
'
/@/utils/helper/treeHelper
'
;
import
{
filter
}
from
'
/@/utils/helper/treeHelper
'
;
import
router
from
'
/@/router
'
;
import
router
from
'
/@/router
'
;
import
{
PermissionModeEnum
}
from
'
/@/enums/appEnum
'
;
import
{
PermissionModeEnum
}
from
'
/@/enums/appEnum
'
;
import
{
pathToRegexp
}
from
'
path-to-regexp
'
;
// ===========================
// ===========================
// ==========module import====
// ==========module import====
...
@@ -106,9 +107,14 @@ export async function getFlatChildrenMenus(children: Menu[]) {
...
@@ -106,9 +107,14 @@ export async function getFlatChildrenMenus(children: Menu[]) {
// 通用过滤方法
// 通用过滤方法
function
basicFilter
(
routes
:
RouteRecordNormalized
[])
{
function
basicFilter
(
routes
:
RouteRecordNormalized
[])
{
return
(
menu
:
Menu
)
=>
{
return
(
menu
:
Menu
)
=>
{
const
matchRoute
=
routes
.
find
((
route
)
=>
route
.
path
===
menu
.
path
);
const
matchRoute
=
routes
.
find
((
route
)
=>
{
if
(
route
.
meta
&&
route
.
meta
.
carryParam
)
{
return
pathToRegexp
(
route
.
path
).
test
(
menu
.
path
);
}
return
route
.
path
===
menu
.
path
;
});
if
(
!
matchRoute
)
return
tru
e
;
if
(
!
matchRoute
)
return
fals
e
;
menu
.
icon
=
menu
.
icon
||
matchRoute
.
meta
.
icon
;
menu
.
icon
=
menu
.
icon
||
matchRoute
.
meta
.
icon
;
menu
.
meta
=
matchRoute
.
meta
;
menu
.
meta
=
matchRoute
.
meta
;
return
true
;
return
true
;
...
...
src/router/routes/modules/demo/feat.ts
View file @
b8353fe1
...
@@ -102,6 +102,7 @@ export default {
...
@@ -102,6 +102,7 @@ export default {
component
:
()
=>
import
(
'
/@/views/demo/feat/tab-params/index.vue
'
),
component
:
()
=>
import
(
'
/@/views/demo/feat/tab-params/index.vue
'
),
meta
:
{
meta
:
{
title
:
'
Tab带参
'
,
title
:
'
Tab带参
'
,
carryParam
:
true
,
},
},
},
},
],
],
...
...
src/router/types.d.ts
View file @
b8353fe1
...
@@ -29,8 +29,10 @@ export interface RouteMeta {
...
@@ -29,8 +29,10 @@ export interface RouteMeta {
// close loading
// close loading
afterCloseLoading
?:
boolean
;
afterCloseLoading
?:
boolean
;
// Is it in the tab
inTab
?:
boolean
;
inTab
?:
boolean
;
// Carrying parameters
carryParam
?:
boolean
;
}
}
export
interface
AppRouteRecordRaw
extends
Omit
<
RouteRecordRaw
,
'
meta
'
>
{
export
interface
AppRouteRecordRaw
extends
Omit
<
RouteRecordRaw
,
'
meta
'
>
{
...
...
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