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
6e53962f
Commit
6e53962f
authored
Jul 07, 2021
by
水落(YangLei)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 修复部分bug
parent
e2f99216
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
15 deletions
+4
-15
src/components/menu/menu.js
src/components/menu/menu.js
+3
-5
src/pages/frame/layouts/AdminLayout.vue
src/pages/frame/layouts/AdminLayout.vue
+1
-4
src/pages/frame/store/settingModule.js
src/pages/frame/store/settingModule.js
+0
-1
src/pages/frame/view/template/TabsTemplateView.vue
src/pages/frame/view/template/TabsTemplateView.vue
+0
-5
No files found.
src/components/menu/menu.js
View file @
6e53962f
...
...
@@ -188,18 +188,16 @@ export default {
updateMenu
()
{
this
.
selectedKeys
=
this
.
getSelectedKey
();
// 混合模式 不管
if
(
this
.
layout
!==
'
mix
'
)
this
.
sOpenKeys
=
this
.
getOpenKeysByPath
(
this
.
$route
.
path
);
if
(
this
.
mode
!==
'
horizontal
'
)
this
.
sOpenKeys
=
this
.
getOpenKeysByPath
(
this
.
$route
.
path
);
},
getSelectedKey
()
{
const
{
path
}
=
this
.
$route
;
let
routeToMenu
=
this
.
menuData
.
find
(
m
=>
m
.
menuUrl
===
path
);
if
(
this
.
layout
!==
'
mix
'
)
return
[
routeToMenu
.
menuId
];
let
parentMenuId
=
routeToMenu
.
parentMenuId
;
// 说明这是头部菜单
if
(
this
.
mode
===
'
horizontal
'
)
{
let
parentMenuId
=
routeToMenu
.
parentMenuId
;
while
(
parentMenuId
!==
0
)
{
routeToMenu
=
this
.
allMenuList
.
find
(
m
=>
m
.
menuId
===
parentMenuId
);
parentMenuId
=
routeToMenu
.
parentMenuId
;
...
...
@@ -207,7 +205,7 @@ export default {
return
[
routeToMenu
.
menuId
];
}
return
[];
return
[
routeToMenu
.
menuId
];
},
getOpenKeysByPath
(
path
)
{
...
...
src/pages/frame/layouts/AdminLayout.vue
View file @
6e53962f
...
...
@@ -128,12 +128,10 @@ export default {
},
headMenuData
()
{
const
{
layout
,
menuData
,
firstMenu
}
=
this
;
console
.
log
(
'
first
'
,
firstMenu
);
return
layout
===
'
mix
'
?
firstMenu
:
menuData
;
},
sideMenuData
()
{
const
{
layout
,
menuData
,
subMenu
}
=
this
;
console
.
log
(
'
sub
'
,
subMenu
);
return
layout
===
'
mix
'
?
subMenu
:
menuData
;
},
},
...
...
@@ -161,7 +159,6 @@ export default {
},
menuSelect
(
obj
)
{
console
.
log
(
'
切换
'
,
obj
);
// 拿到 菜单id
const
menuId
=
obj
.
key
;
const
currentMenu
=
this
.
menuList
.
find
(
i
=>
i
.
menuId
===
menuId
);
...
...
@@ -177,7 +174,6 @@ export default {
created
()
{
this
.
correctPageMinHeight
(
this
.
minHeight
-
24
);
const
{
menuList
}
=
getUserInfo
();
console
.
log
(
menuList
);
const
menuData
=
convertListToTree
(
menuList
||
[],
false
,
true
);
this
.
menuData
=
menuData
;
this
.
menuList
=
menuList
;
...
...
@@ -185,6 +181,7 @@ export default {
delete
i
.
children
;
return
i
;
});
this
.
updateSildeMenu
(
this
.
layout
);
},
beforeDestroy
()
{
this
.
correctPageMinHeight
(
-
this
.
minHeight
+
24
);
...
...
src/pages/frame/store/settingModule.js
View file @
6e53962f
...
...
@@ -51,7 +51,6 @@ export default {
state
.
theme
=
theme
;
},
setLayout
(
state
,
layout
)
{
console
.
log
(
layout
);
state
.
layout
=
layout
;
},
setMultiPage
(
state
,
multiPage
)
{
...
...
src/pages/frame/view/template/TabsTemplateView.vue
View file @
6e53962f
...
...
@@ -85,11 +85,6 @@ export default {
$route
:
function
(
newRoute
)
{
this
.
activePage
=
newRoute
.
fullPath
;
console
.
log
(
'
#################################
'
);
console
.
log
(
this
.
pageList
);
console
.
log
(
newRoute
);
console
.
log
(
'
#################################
'
);
if
(
this
.
pageList
.
findIndex
(
item
=>
item
.
fullPath
===
newRoute
.
fullPath
)
===
-
1
)
{
if
(
!
this
.
multiPage
)
{
this
.
pageList
=
[
this
.
createPage
(
newRoute
)];
...
...
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