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
a579b845
Unverified
Commit
a579b845
authored
May 09, 2021
by
Netfan
Committed by
GitHub
May 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(modal): proptype conflict with ant design modal(fixed: #545) (#575)
parent
43e4c219
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
BasicModal.vue
src/components/Modal/src/BasicModal.vue
+3
-1
No files found.
src/components/Modal/src/BasicModal.vue
View file @
a579b845
...
@@ -122,12 +122,14 @@
...
@@ -122,12 +122,14 @@
wrapClassName
:
toRef
(
getMergeProps
.
value
,
'
wrapClassName
'
),
wrapClassName
:
toRef
(
getMergeProps
.
value
,
'
wrapClassName
'
),
});
});
// modal component does not need title
// modal component does not need title
and origin buttons
const
getProps
=
computed
(
const
getProps
=
computed
(
():
ModalProps
=>
{
():
ModalProps
=>
{
const
opt
=
{
const
opt
=
{
...
unref
(
getMergeProps
),
...
unref
(
getMergeProps
),
visible
:
unref
(
visibleRef
),
visible
:
unref
(
visibleRef
),
okButtonProps
:
undefined
,
cancelButtonProps
:
undefined
,
title
:
undefined
,
title
:
undefined
,
};
};
return
{
return
{
...
...
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