Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FLIPPED-AURORA
gin-vue-admin
提交
4e8966e2
G
gin-vue-admin
项目概览
FLIPPED-AURORA
/
gin-vue-admin
大约 1 年 前同步成功
通知
332
Star
18154
Fork
5505
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gin-vue-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4e8966e2
编写于
3月 01, 2022
作者:
Mr.奇淼(
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复keepalive问题 #934 #903,调整刷新功能,增加页面跳转动画。
上级
573ae689
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
45 addition
and
14 deletion
+45
-14
web/src/pinia/modules/router.js
web/src/pinia/modules/router.js
+10
-0
web/src/view/error/reload.vue
web/src/view/error/reload.vue
+14
-0
web/src/view/example/index.vue
web/src/view/example/index.vue
+2
-1
web/src/view/layout/aside/historyComponent/history.vue
web/src/view/layout/aside/historyComponent/history.vue
+1
-4
web/src/view/layout/index.vue
web/src/view/layout/index.vue
+12
-6
web/src/view/routerHolder.vue
web/src/view/routerHolder.vue
+2
-1
web/src/view/superAdmin/index.vue
web/src/view/superAdmin/index.vue
+2
-1
web/src/view/systemTools/index.vue
web/src/view/systemTools/index.vue
+2
-1
未找到文件。
web/src/pinia/modules/router.js
浏览文件 @
4e8966e2
...
...
@@ -57,8 +57,18 @@ export const useRouterStore = defineStore('router', () => {
hidden
:
true
,
meta
:
{
title
:
'
迷路了*。*
'
,
closeTab
:
true
,
},
component
:
'
view/error/index.vue
'
},
{
path
:
'
reload
'
,
name
:
'
Reload
'
,
hidden
:
true
,
meta
:
{
title
:
''
,
closeTab
:
true
,
},
component
:
'
view/error/reload.vue
'
})
formatRouter
(
asyncRouter
,
routeMap
)
baseRouter
[
0
].
children
=
asyncRouter
...
...
web/src/view/error/reload.vue
0 → 100644
浏览文件 @
4e8966e2
<
template
>
<div
/>
</
template
>
<
script
>
import
{
useRouter
}
from
'
vue-router
'
export
default
{
name
:
'
Reload
'
}
</
script
>
<
script
setup
>
const
router
=
useRouter
()
router
.
go
(
-
1
)
</
script
>
web/src/view/example/index.vue
浏览文件 @
4e8966e2
...
...
@@ -2,7 +2,7 @@
<div>
<router-view
v-slot=
"
{ Component }">
<transition
mode=
"out-in"
name=
"el-fade-in-linear"
>
<keep-alive
:include=
"
useR
outerStore.keepAliveRouters"
>
<keep-alive
:include=
"
r
outerStore.keepAliveRouters"
>
<component
:is=
"Component"
/>
</keep-alive>
</transition>
...
...
@@ -17,4 +17,5 @@ export default {
</
script
>
<
script
setup
>
import
{
useRouterStore
}
from
'
@/pinia/modules/router
'
const
routerStore
=
useRouterStore
()
</
script
>
web/src/view/layout/aside/historyComponent/history.vue
浏览文件 @
4e8966e2
...
...
@@ -247,16 +247,13 @@ watch(contextMenuVisible, () => {
})
watch
(
route
,
(
to
,
now
)
=>
{
if
(
to
.
name
===
'
Login
'
)
{
if
(
to
.
name
===
'
Login
'
||
to
.
name
===
'
Reload
'
)
{
return
}
historys
.
value
=
historys
.
value
.
filter
((
item
)
=>
!
item
.
meta
.
closeTab
)
setTab
(
to
)
sessionStorage
.
setItem
(
'
historys
'
,
JSON
.
stringify
(
historys
.
value
))
activeValue
.
value
=
window
.
sessionStorage
.
getItem
(
'
activeValue
'
)
if
(
now
&&
to
&&
now
.
name
===
to
.
name
)
{
emitter
.
emit
(
'
reload
'
)
}
})
const
initPage
=
()
=>
{
...
...
web/src/view/layout/index.vue
浏览文件 @
4e8966e2
...
...
@@ -34,7 +34,7 @@
<el-breadcrumb-item
v-for=
"item in matched.slice(1,matched.length)"
:key=
"item.path"
>
{{
item
.
meta
.
title
}}
</el-breadcrumb-item>
>
{{
route
.
params
.
title
||
item
.
meta
.
title
}}
</el-breadcrumb-item>
</el-breadcrumb>
</el-col>
<el-col
:xs=
"12"
:lg=
"9"
:md=
"9"
:sm=
"14"
:xl=
"9"
>
...
...
@@ -83,7 +83,7 @@
</transition>
<router-view
v-if=
"reloadFlag"
v-slot=
"{ Component }"
v-loading=
"loadingFlag"
element-loading-text=
"正在加载中"
class=
"admin-box"
>
<transition
mode=
"out-in"
name=
"el-fade-in-linear"
>
<keep-alive
:include=
"
useR
outerStore.keepAliveRouters"
>
<keep-alive
:include=
"
r
outerStore.keepAliveRouters"
>
<component
:is=
"Component"
/>
</keep-alive>
</transition>
...
...
@@ -118,7 +118,8 @@ import { useRouterStore } from '@/pinia/modules/router'
const
router
=
useRouter
()
const
route
=
useRoute
()
const
routerStore
=
useRouterStore
()
console
.
log
(
routerStore
.
keepAliveRouters
)
// 三种窗口适配
const
isCollapse
=
ref
(
false
)
const
isSider
=
ref
(
true
)
...
...
@@ -201,9 +202,14 @@ const changeUserAuth = async(id) => {
const
reloadFlag
=
ref
(
true
)
const
reload
=
async
()
=>
{
reloadFlag
.
value
=
false
await
nextTick
()
reloadFlag
.
value
=
true
if
(
route
.
meta
.
keepAlive
)
{
reloadFlag
.
value
=
false
await
nextTick
()
reloadFlag
.
value
=
true
}
else
{
const
title
=
route
.
meta
.
title
router
.
push
({
name
:
'
Reload
'
,
params
:
{
title
}})
}
}
const
isShadowBg
=
ref
(
false
)
...
...
web/src/view/routerHolder.vue
浏览文件 @
4e8966e2
...
...
@@ -3,7 +3,7 @@
<div>
<router-view
v-slot=
"
{ Component }">
<transition
mode=
"out-in"
name=
"el-fade-in-linear"
>
<keep-alive
:include=
"
useR
outerStore.keepAliveRouters"
>
<keep-alive
:include=
"
r
outerStore.keepAliveRouters"
>
<component
:is=
"Component"
/>
</keep-alive>
</transition>
...
...
@@ -19,4 +19,5 @@ export default {
<
script
setup
>
import
{
useRouterStore
}
from
'
@/pinia/modules/router
'
const
routerStore
=
useRouterStore
()
</
script
>
web/src/view/superAdmin/index.vue
浏览文件 @
4e8966e2
...
...
@@ -2,7 +2,7 @@
<div>
<router-view
v-slot=
"
{ Component }">
<transition
mode=
"out-in"
name=
"el-fade-in-linear"
>
<keep-alive
:include=
"
useR
outerStore.keepAliveRouters"
>
<keep-alive
:include=
"
r
outerStore.keepAliveRouters"
>
<component
:is=
"Component"
/>
</keep-alive>
</transition>
...
...
@@ -17,4 +17,5 @@ export default {
</
script
>
<
script
setup
>
import
{
useRouterStore
}
from
'
@/pinia/modules/router
'
const
routerStore
=
useRouterStore
()
</
script
>
web/src/view/systemTools/index.vue
浏览文件 @
4e8966e2
...
...
@@ -2,7 +2,7 @@
<div>
<router-view
v-slot=
"
{ Component }">
<transition
mode=
"out-in"
name=
"el-fade-in-linear"
>
<keep-alive
:include=
"
useR
outerStore.keepAliveRouters"
>
<keep-alive
:include=
"
r
outerStore.keepAliveRouters"
>
<component
:is=
"Component"
/>
</keep-alive>
</transition>
...
...
@@ -17,4 +17,5 @@ export default {
</
script
>
<
script
setup
>
import
{
useRouterStore
}
from
'
@/pinia/modules/router
'
const
routerStore
=
useRouterStore
()
</
script
>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录