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
cb1ae34f
Commit
cb1ae34f
authored
Nov 12, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: fix notify type error
parent
d9b19600
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
35 deletions
+17
-35
MenuContent.tsx
src/components/Menu/src/MenuContent.tsx
+4
-5
useMessage.tsx
src/hooks/web/useMessage.tsx
+12
-29
index.ts
src/router/index.ts
+1
-1
No files found.
src/components/Menu/src/MenuContent.tsx
View file @
cb1ae34f
...
@@ -40,8 +40,8 @@ export default defineComponent({
...
@@ -40,8 +40,8 @@ export default defineComponent({
}
}
function
renderTag
()
{
function
renderTag
()
{
const
{
item
,
showTitle
}
=
props
;
const
{
item
,
showTitle
,
isTop
}
=
props
;
if
(
!
item
||
showTitle
)
return
null
;
if
(
!
item
||
showTitle
||
isTop
)
return
null
;
const
{
tag
}
=
item
;
const
{
tag
}
=
item
;
if
(
!
tag
)
return
null
;
if
(
!
tag
)
return
null
;
...
@@ -60,16 +60,15 @@ export default defineComponent({
...
@@ -60,16 +60,15 @@ export default defineComponent({
if
(
!
props
.
item
)
{
if
(
!
props
.
item
)
{
return
null
;
return
null
;
}
}
const
{
showTitle
,
isTop
}
=
props
;
const
{
showTitle
}
=
props
;
const
{
name
,
icon
}
=
props
.
item
;
const
{
name
,
icon
}
=
props
.
item
;
const
searchValue
=
props
.
searchValue
||
''
;
const
searchValue
=
props
.
searchValue
||
''
;
const
index
=
name
.
indexOf
(
searchValue
);
const
index
=
name
.
indexOf
(
searchValue
);
const
beforeStr
=
name
.
substr
(
0
,
index
);
const
beforeStr
=
name
.
substr
(
0
,
index
);
const
afterStr
=
name
.
substr
(
index
+
searchValue
.
length
);
const
afterStr
=
name
.
substr
(
index
+
searchValue
.
length
);
le
t
cls
=
showTitle
?
[
'
show-title
'
]
:
[
'
basic-menu__name
'
];
cons
t
cls
=
showTitle
?
[
'
show-title
'
]
:
[
'
basic-menu__name
'
];
isTop
&&
!
showTitle
&&
(
cls
=
[]);
return
(
return
(
<>
<>
{
renderIcon
(
icon
!
)
}
{
renderIcon
(
icon
!
)
}
...
...
src/hooks/web/useMessage.tsx
View file @
cb1ae34f
import
type
{
ModalFunc
,
ModalFuncProps
}
from
'
ant-design-vue/lib/modal/Modal
'
;
import
type
{
ModalFunc
,
ModalFuncProps
}
from
'
ant-design-vue/lib/modal/Modal
'
;
import
type
{
MessageApi
}
from
'
ant-design-vue/lib/message
'
;
import
type
{
MessageApi
}
from
'
ant-design-vue/lib/message
'
;
import
type
{
VNodeTypes
,
CSSProperties
}
from
'
vue
'
;
import
{
Modal
,
message
as
Message
,
notification
}
from
'
ant-design-vue
'
;
import
{
Modal
,
message
as
Message
,
notification
}
from
'
ant-design-vue
'
;
import
{
InfoCircleFilled
,
CheckCircleFilled
,
CloseCircleFilled
}
from
'
@ant-design/icons-vue
'
;
import
{
InfoCircleFilled
,
CheckCircleFilled
,
CloseCircleFilled
}
from
'
@ant-design/icons-vue
'
;
import
{
useSetting
}
from
'
/@/hooks/core/useSetting
'
;
import
{
useSetting
}
from
'
/@/hooks/core/useSetting
'
;
import
{
ArgsProps
,
ConfigProps
}
from
'
ant-design-vue/lib/notification
'
;
export
interface
ArgsProps
{
export
interface
NotifyApi
{
message
:
VNodeTypes
;
info
(
config
:
ArgsProps
):
void
;
description
?:
VNodeTypes
;
success
(
config
:
ArgsProps
):
void
;
btn
?:
VNodeTypes
;
error
(
config
:
ArgsProps
):
void
;
key
?:
string
;
warn
(
config
:
ArgsProps
):
void
;
onClose
?:
()
=>
void
;
warning
(
config
:
ArgsProps
):
void
;
duration
?:
number
|
null
;
open
(
args
:
ArgsProps
):
void
;
icon
?:
VNodeTypes
;
close
(
key
:
String
):
void
;
placement
?:
NotificationPlacement
;
config
(
options
:
ConfigProps
):
void
;
style
?:
CSSProperties
;
destroy
():
void
;
prefixCls
?:
string
;
class
?:
string
;
readonly
type
?:
IconType
;
onClick
?:
()
=>
void
;
top
?:
number
;
bottom
?:
number
;
getContainer
?:
()
=>
HTMLElement
;
closeIcon
?:
VNodeTypes
;
}
}
export
declare
type
NotificationPlacement
=
'
topLeft
'
|
'
topRight
'
|
'
bottomLeft
'
|
'
bottomRight
'
;
export
declare
type
NotificationPlacement
=
'
topLeft
'
|
'
topRight
'
|
'
bottomLeft
'
|
'
bottomRight
'
;
export
declare
type
IconType
=
'
success
'
|
'
info
'
|
'
error
'
|
'
warning
'
;
export
declare
type
IconType
=
'
success
'
|
'
info
'
|
'
error
'
|
'
warning
'
;
export
interface
ConfigProps
{
top
?:
string
|
number
;
bottom
?:
string
|
number
;
duration
?:
number
;
placement
?:
NotificationPlacement
;
getContainer
?:
()
=>
HTMLElement
;
closeIcon
?:
VNodeTypes
;
}
export
interface
ModalOptionsEx
extends
Omit
<
ModalFuncProps
,
'
iconType
'
>
{
export
interface
ModalOptionsEx
extends
Omit
<
ModalFuncProps
,
'
iconType
'
>
{
iconType
:
'
warning
'
|
'
success
'
|
'
error
'
|
'
info
'
;
iconType
:
'
warning
'
|
'
success
'
|
'
error
'
|
'
info
'
;
}
}
...
@@ -118,7 +101,7 @@ notification.config({
...
@@ -118,7 +101,7 @@ notification.config({
export
function
useMessage
()
{
export
function
useMessage
()
{
return
{
return
{
createMessage
:
Message
as
MessageApi
,
createMessage
:
Message
as
MessageApi
,
notification
:
notification
as
(
arg
:
ArgsProps
)
=>
void
,
notification
:
notification
as
NotifyApi
,
createConfirm
:
createConfirm
,
createConfirm
:
createConfirm
,
createSuccessModal
,
createSuccessModal
,
createErrorModal
,
createErrorModal
,
...
...
src/router/index.ts
View file @
cb1ae34f
...
@@ -37,7 +37,7 @@ export function resetRouter() {
...
@@ -37,7 +37,7 @@ export function resetRouter() {
router
.
getRoutes
().
forEach
((
route
)
=>
{
router
.
getRoutes
().
forEach
((
route
)
=>
{
const
{
name
}
=
route
;
const
{
name
}
=
route
;
if
(
name
&&
!
resetWhiteNameList
.
includes
(
name
as
string
))
{
if
(
name
&&
!
resetWhiteNameList
.
includes
(
name
as
string
))
{
router
.
removeRoute
(
name
);
router
.
hasRoute
(
name
)
&&
router
.
removeRoute
(
name
);
}
}
});
});
}
}
...
...
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