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
67a7a76b
Commit
67a7a76b
authored
Apr 08, 2021
by
Vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(table-action): ensure that the click event is not triggered, fix #441
parent
64b6313b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
Dropdown.vue
src/components/Dropdown/src/Dropdown.vue
+2
-2
BasicForm.vue
src/components/Form/src/BasicForm.vue
+8
-1
TableAction.vue
src/components/Table/src/components/TableAction.vue
+2
-0
No files found.
src/components/Dropdown/src/Dropdown.vue
View file @
67a7a76b
...
...
@@ -11,7 +11,7 @@
@
click=
"handleClickMenu(item)"
:disabled=
"item.disabled"
>
<Popconfirm
v-if=
"popconfirm"
v-bind=
"item"
>
<Popconfirm
v-if=
"popconfirm
&& item.popConfirm
"
v-bind=
"item"
>
<Icon
:icon=
"item.icon"
v-if=
"item.icon"
/>
<span
class=
"ml-1"
>
{{
item
.
text
}}
</span>
</Popconfirm>
...
...
@@ -59,7 +59,7 @@
},
},
dropMenuList
:
{
type
:
Array
as
PropType
<
DropMenu
[]
>
,
type
:
Array
as
PropType
<
(
DropMenu
&
Recordable
)
[]
>
,
default
:
()
=>
[],
},
selectedKeys
:
{
...
...
src/components/Form/src/BasicForm.vue
View file @
67a7a76b
...
...
@@ -285,9 +285,16 @@
display: flex;
}
.ant-form-item-control {
margin-top: 4px;
}
.suffix {
display: inline-
block
;
display: inline-
flex
;
padding-left: 6px;
margin-top: 1px;
line-height: 1;
align-items: center;
}
}
}
...
...
src/components/Table/src/components/TableAction.vue
View file @
67a7a76b
...
...
@@ -82,6 +82,8 @@
return
{
...
action
,
...
popConfirm
,
onConfirm
:
popConfirm
?.
confirm
,
onCancel
:
popConfirm
?.
cancel
,
text
:
label
,
divider
:
index
<
props
.
dropDownActions
.
length
-
1
?
props
.
divider
:
false
,
};
...
...
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