Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
261d5fe5
提交
261d5fe5
authored
7月 29, 2021
作者:
fit2cloud-chenyw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: 消息跳转到无权限路由,显示空白
上级
4a5f8680
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
84 行增加
和
9 行删除
+84
-9
index.vue
frontend/src/components/Notification/index.vue
+16
-3
en.js
frontend/src/lang/en.js
+1
-0
tw.js
frontend/src/lang/tw.js
+1
-0
zh.js
frontend/src/lang/zh.js
+1
-0
all.vue
frontend/src/views/msg/all.vue
+21
-2
readed.vue
frontend/src/views/msg/readed.vue
+21
-1
unread.vue
frontend/src/views/msg/unread.vue
+23
-3
没有找到文件。
frontend/src/components/Notification/index.vue
浏览文件 @
261d5fe5
...
@@ -120,17 +120,30 @@ export default {
...
@@ -120,17 +120,30 @@ export default {
if
(
this
.
$route
&&
this
.
$route
.
name
&&
this
.
$route
.
name
===
row
.
router
)
{
if
(
this
.
$route
&&
this
.
$route
.
name
&&
this
.
$route
.
name
===
row
.
router
)
{
// 如果当前路由就是目标路由 那么使用router.push页面不会刷新 这时候要使用事件方式
// 如果当前路由就是目标路由 那么使用router.push页面不会刷新 这时候要使用事件方式
row
.
callback
&&
bus
.
$emit
(
row
.
callback
,
param
)
row
.
callback
&&
bus
.
$emit
(
row
.
callback
,
param
)
row
.
status
||
this
.
setReaded
(
row
.
msgId
)
}
else
{
}
else
{
this
.
$router
.
push
({
name
:
row
.
router
,
params
:
param
})
if
(
this
.
hasPermissionRoute
(
row
.
router
))
{
this
.
$router
.
push
({
name
:
row
.
router
,
params
:
param
})
row
.
status
||
this
.
setReaded
(
row
.
msgId
)
return
}
this
.
$warning
(
this
.
$t
(
'commons.no_target_permission'
))
}
}
row
.
status
||
this
.
setReaded
(
row
.
msgId
)
},
},
remove
(
row
)
{
remove
(
row
)
{
},
},
msgSetting
()
{
msgSetting
()
{
},
hasPermissionRoute
(
name
,
permission_routes
)
{
permission_routes
=
permission_routes
||
this
.
permission_routes
for
(
let
index
=
0
;
index
<
permission_routes
.
length
;
index
++
)
{
const
route
=
permission_routes
[
index
]
if
(
route
.
name
&&
route
.
name
===
name
)
return
true
if
(
route
.
children
&&
this
.
hasPermissionRoute
(
name
,
route
.
children
))
return
true
}
return
false
},
},
showMore
()
{
showMore
()
{
const
routerName
=
'sys-msg-web-all'
const
routerName
=
'sys-msg-web-all'
...
...
frontend/src/lang/en.js
浏览文件 @
261d5fe5
...
@@ -129,6 +129,7 @@ export default {
...
@@ -129,6 +129,7 @@ export default {
password_error
:
'The password can not be less than 8 digits'
password_error
:
'The password can not be less than 8 digits'
},
},
commons
:
{
commons
:
{
no_target_permission
:
'No permission'
,
success
:
'Success'
,
success
:
'Success'
,
switch_lang
:
'Switch Language Success'
,
switch_lang
:
'Switch Language Success'
,
close
:
'Close'
,
close
:
'Close'
,
...
...
frontend/src/lang/tw.js
浏览文件 @
261d5fe5
...
@@ -129,6 +129,7 @@ export default {
...
@@ -129,6 +129,7 @@ export default {
password_error
:
'密碼不小於 8 位'
password_error
:
'密碼不小於 8 位'
},
},
commons
:
{
commons
:
{
no_target_permission
:
'沒有權限'
,
success
:
'成功'
,
success
:
'成功'
,
switch_lang
:
'切換語言成功'
,
switch_lang
:
'切換語言成功'
,
close
:
'關閉'
,
close
:
'關閉'
,
...
...
frontend/src/lang/zh.js
浏览文件 @
261d5fe5
...
@@ -129,6 +129,7 @@ export default {
...
@@ -129,6 +129,7 @@ export default {
password_error
:
'密码不小于 8 位'
password_error
:
'密码不小于 8 位'
},
},
commons
:
{
commons
:
{
no_target_permission
:
'没有权限'
,
success
:
'成功'
,
success
:
'成功'
,
switch_lang
:
'切换语言成功'
,
switch_lang
:
'切换语言成功'
,
close
:
'关闭'
,
close
:
'关闭'
,
...
...
frontend/src/views/msg/all.vue
浏览文件 @
261d5fe5
...
@@ -55,6 +55,7 @@ import { query, updateStatus } from '@/api/system/msg'
...
@@ -55,6 +55,7 @@ import { query, updateStatus } from '@/api/system/msg'
import
{
msgTypes
,
getTypeName
,
loadMsgTypes
}
from
'@/utils/webMsg'
import
{
msgTypes
,
getTypeName
,
loadMsgTypes
}
from
'@/utils/webMsg'
import
bus
from
'@/utils/bus'
import
bus
from
'@/utils/bus'
import
{
addOrder
,
formatOrders
}
from
'@/utils/index'
import
{
addOrder
,
formatOrders
}
from
'@/utils/index'
import
{
mapGetters
}
from
'vuex'
export
default
{
export
default
{
components
:
{
components
:
{
LayoutContent
,
LayoutContent
,
...
@@ -82,6 +83,11 @@ export default {
...
@@ -82,6 +83,11 @@ export default {
orderConditions
:
[]
orderConditions
:
[]
}
}
},
},
computed
:
{
...
mapGetters
([
'permission_routes'
])
},
mounted
()
{
mounted
()
{
this
.
search
()
this
.
search
()
},
},
...
@@ -120,8 +126,21 @@ export default {
...
@@ -120,8 +126,21 @@ export default {
},
},
toDetail
(
row
)
{
toDetail
(
row
)
{
const
param
=
{
...{
msgNotification
:
true
,
msgType
:
row
.
typeId
,
sourceParam
:
row
.
param
}}
const
param
=
{
...{
msgNotification
:
true
,
msgType
:
row
.
typeId
,
sourceParam
:
row
.
param
}}
this
.
$router
.
push
({
name
:
row
.
router
,
params
:
param
})
if
(
this
.
hasPermissionRoute
(
row
.
router
))
{
row
.
status
||
this
.
setReaded
(
row
)
this
.
$router
.
push
({
name
:
row
.
router
,
params
:
param
})
row
.
status
||
this
.
setReaded
(
row
)
return
}
this
.
$warning
(
this
.
$t
(
'commons.no_target_permission'
))
},
hasPermissionRoute
(
name
,
permission_routes
)
{
permission_routes
=
permission_routes
||
this
.
permission_routes
for
(
let
index
=
0
;
index
<
permission_routes
.
length
;
index
++
)
{
const
route
=
permission_routes
[
index
]
if
(
route
.
name
&&
route
.
name
===
name
)
return
true
if
(
route
.
children
&&
this
.
hasPermissionRoute
(
name
,
route
.
children
))
return
true
}
return
false
},
},
// 设置已读
// 设置已读
setReaded
(
row
)
{
setReaded
(
row
)
{
...
...
frontend/src/views/msg/readed.vue
浏览文件 @
261d5fe5
...
@@ -60,6 +60,7 @@ import ComplexTable from '@/components/business/complex-table'
...
@@ -60,6 +60,7 @@ import ComplexTable from '@/components/business/complex-table'
import
{
query
}
from
'@/api/system/msg'
import
{
query
}
from
'@/api/system/msg'
import
{
msgTypes
,
getTypeName
,
loadMsgTypes
}
from
'@/utils/webMsg'
import
{
msgTypes
,
getTypeName
,
loadMsgTypes
}
from
'@/utils/webMsg'
import
{
addOrder
,
formatOrders
}
from
'@/utils/index'
import
{
addOrder
,
formatOrders
}
from
'@/utils/index'
import
{
mapGetters
}
from
'vuex'
export
default
{
export
default
{
components
:
{
components
:
{
LayoutContent
,
LayoutContent
,
...
@@ -87,6 +88,11 @@ export default {
...
@@ -87,6 +88,11 @@ export default {
}
}
}
}
},
},
computed
:
{
...
mapGetters
([
'permission_routes'
])
},
mounted
()
{
mounted
()
{
this
.
search
()
this
.
search
()
},
},
...
@@ -125,7 +131,21 @@ export default {
...
@@ -125,7 +131,21 @@ export default {
},
},
toDetail
(
row
)
{
toDetail
(
row
)
{
const
param
=
{
...{
msgNotification
:
true
,
msgType
:
row
.
typeId
,
sourceParam
:
row
.
param
}}
const
param
=
{
...{
msgNotification
:
true
,
msgType
:
row
.
typeId
,
sourceParam
:
row
.
param
}}
this
.
$router
.
push
({
name
:
row
.
router
,
params
:
param
})
// this.$router.push({ name: row.router, params: param })
if
(
this
.
hasPermissionRoute
(
row
.
router
))
{
this
.
$router
.
push
({
name
:
row
.
router
,
params
:
param
})
return
}
this
.
$warning
(
this
.
$t
(
'commons.no_target_permission'
))
},
hasPermissionRoute
(
name
,
permission_routes
)
{
permission_routes
=
permission_routes
||
this
.
permission_routes
for
(
let
index
=
0
;
index
<
permission_routes
.
length
;
index
++
)
{
const
route
=
permission_routes
[
index
]
if
(
route
.
name
&&
route
.
name
===
name
)
return
true
if
(
route
.
children
&&
this
.
hasPermissionRoute
(
name
,
route
.
children
))
return
true
}
return
false
},
},
sortChange
({
column
,
prop
,
order
})
{
sortChange
({
column
,
prop
,
order
})
{
this
.
orderConditions
=
[]
this
.
orderConditions
=
[]
...
...
frontend/src/views/msg/unread.vue
浏览文件 @
261d5fe5
...
@@ -65,7 +65,7 @@ import { query, updateStatus, batchRead } from '@/api/system/msg'
...
@@ -65,7 +65,7 @@ import { query, updateStatus, batchRead } from '@/api/system/msg'
import
{
msgTypes
,
getTypeName
,
loadMsgTypes
}
from
'@/utils/webMsg'
import
{
msgTypes
,
getTypeName
,
loadMsgTypes
}
from
'@/utils/webMsg'
import
bus
from
'@/utils/bus'
import
bus
from
'@/utils/bus'
import
{
addOrder
,
formatOrders
}
from
'@/utils/index'
import
{
addOrder
,
formatOrders
}
from
'@/utils/index'
import
{
mapGetters
}
from
'vuex'
export
default
{
export
default
{
components
:
{
components
:
{
LayoutContent
,
LayoutContent
,
...
@@ -98,6 +98,11 @@ export default {
...
@@ -98,6 +98,11 @@ export default {
orderConditions
:
[]
orderConditions
:
[]
}
}
},
},
computed
:
{
...
mapGetters
([
'permission_routes'
])
},
mounted
()
{
mounted
()
{
this
.
search
()
this
.
search
()
},
},
...
@@ -136,8 +141,23 @@ export default {
...
@@ -136,8 +141,23 @@ export default {
},
},
toDetail
(
row
)
{
toDetail
(
row
)
{
const
param
=
{
...{
msgNotification
:
true
,
msgType
:
row
.
typeId
,
sourceParam
:
row
.
param
}}
const
param
=
{
...{
msgNotification
:
true
,
msgType
:
row
.
typeId
,
sourceParam
:
row
.
param
}}
this
.
$router
.
push
({
name
:
row
.
router
,
params
:
param
})
// this.$router.push({ name: row.router, params: param })
this
.
setReaded
(
row
)
// this.setReaded(row)
if
(
this
.
hasPermissionRoute
(
row
.
router
))
{
this
.
$router
.
push
({
name
:
row
.
router
,
params
:
param
})
this
.
setReaded
(
row
)
return
}
this
.
$warning
(
this
.
$t
(
'commons.no_target_permission'
))
},
hasPermissionRoute
(
name
,
permission_routes
)
{
permission_routes
=
permission_routes
||
this
.
permission_routes
for
(
let
index
=
0
;
index
<
permission_routes
.
length
;
index
++
)
{
const
route
=
permission_routes
[
index
]
if
(
route
.
name
&&
route
.
name
===
name
)
return
true
if
(
route
.
children
&&
this
.
hasPermissionRoute
(
name
,
route
.
children
))
return
true
}
return
false
},
},
// 设置已读
// 设置已读
setReaded
(
row
)
{
setReaded
(
row
)
{
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论