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
c7de65eb
Commit
c7de65eb
authored
Jun 28, 2021
by
无木
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(modal): `setModalProps` support `defaultFullscreen`
修复setModalProps不支持设置defaultFullscreen的问题
parent
829b366c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
BasicModal.vue
src/components/Modal/src/BasicModal.vue
+6
-2
typing.ts
src/components/Modal/src/typing.ts
+1
-0
No files found.
src/components/Modal/src/BasicModal.vue
View file @
c7de65eb
...
...
@@ -187,9 +187,13 @@
function
setModalProps
(
props
:
Partial
<
ModalProps
>
):
void
{
// Keep the last setModalProps
propsRef
.
value
=
deepMerge
(
unref
(
propsRef
)
||
({}
as
any
),
props
);
if
(
!
Reflect
.
has
(
props
,
'
visible
'
))
return
;
if
(
Reflect
.
has
(
props
,
'
visible
'
))
{
visibleRef
.
value
=
!!
props
.
visible
;
}
if
(
Reflect
.
has
(
props
,
'
defaultFullscreen
'
))
{
fullScreenRef
.
value
=
!!
props
.
defaultFullscreen
;
}
}
function
handleOk
(
e
:
Event
)
{
emit
(
'
ok
'
,
e
);
...
...
src/components/Modal/src/typing.ts
View file @
c7de65eb
...
...
@@ -39,6 +39,7 @@ export interface ModalProps {
// 是否可以进行全屏
canFullscreen
?:
boolean
;
defaultFullscreen
?:
boolean
;
visible
?:
boolean
;
// 温馨提醒信息
helpMessage
:
string
|
string
[];
...
...
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