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
37508ca4
Commit
37508ca4
authored
Feb 26, 2021
by
Vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(modal): ensure that the height is correct in the modal full screen state close #308
parent
ec7bef79
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
3 deletions
+15
-3
BasicModal.vue
src/components/Modal/src/BasicModal.vue
+15
-3
No files found.
src/components/Modal/src/BasicModal.vue
View file @
37508ca4
...
...
@@ -32,7 +32,7 @@
ref=
"modalWrapperRef"
:loading=
"getProps.loading"
:minHeight=
"getProps.minHeight"
:height=
"get
Props.h
eight"
:height=
"get
WrapperH
eight"
:visible=
"visibleRef"
:modalFooterHeight=
"footer !== undefined && !footer ? 0 : undefined"
v-bind=
"omit(getProps.wrapperProps, 'visible', 'height')"
...
...
@@ -136,8 +136,19 @@
}
);
const
getBindValue
=
computed
(():
any
=>
{
return
{
...
attrs
,
...
unref
(
getProps
)
};
const
getBindValue
=
computed
(
():
Recordable
=>
{
const
attr
=
{
...
attrs
,
...
unref
(
getProps
)
};
if
(
unref
(
fullScreenRef
))
{
return
omit
(
attr
,
'
height
'
);
}
return
attr
;
}
);
const
getWrapperHeight
=
computed
(()
=>
{
if
(
unref
(
fullScreenRef
))
return
undefined
;
return
unref
(
getProps
).
height
;
});
watchEffect
(()
=>
{
...
...
@@ -217,6 +228,7 @@
handleExtHeight
,
handleHeightChange
,
handleTitleDbClick
,
getWrapperHeight
,
};
},
});
...
...
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