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
0f28e803
Commit
0f28e803
authored
Jul 12, 2021
by
无木
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(table-action): incorrect button color of `disabled` state
修复表格操作列的按钮在disabled状态下的颜色显示 fixed: #891
parent
cad021c3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
PopConfirmButton.vue
src/components/Button/src/PopConfirmButton.vue
+5
-4
No files found.
CHANGELOG.zh_CN.md
View file @
0f28e803
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
-
修复滚动条样式问题
-
修复滚动条样式问题
-
修复树形表格的带有展开图标的单元格的内容对齐问题
-
修复树形表格的带有展开图标的单元格的内容对齐问题
-
新增
`headerTop`
插槽
-
新增
`headerTop`
插槽
-
修复操作列的按钮在 disabled 状态下的颜色显示
-
**AppSearch**
修复可能会搜索隐藏菜单的问题
-
**AppSearch**
修复可能会搜索隐藏菜单的问题
-
**TableAction**
仅在 action.tooltip 存在的情况下 才包裹 Tooltip 组件
-
**TableAction**
仅在 action.tooltip 存在的情况下 才包裹 Tooltip 组件
-
**BasicUpload**
修复处理非
`array`
值时报错的问题
-
**BasicUpload**
修复处理非
`array`
值时报错的问题
...
...
src/components/Button/src/PopConfirmButton.vue
View file @
0f28e803
<
script
lang=
"ts"
>
<
script
lang=
"ts"
>
import
{
defineComponent
,
h
,
unref
,
computed
}
from
'
vue
'
;
import
{
computed
,
defineComponent
,
h
,
unref
}
from
'
vue
'
;
import
BasicButton
from
'
./BasicButton.vue
'
;
import
BasicButton
from
'
./BasicButton.vue
'
;
import
{
Popconfirm
}
from
'
ant-design-vue
'
;
import
{
Popconfirm
}
from
'
ant-design-vue
'
;
import
{
extendSlots
}
from
'
/@/utils/helper/tsxHelper
'
;
import
{
extendSlots
}
from
'
/@/utils/helper/tsxHelper
'
;
...
@@ -29,19 +29,20 @@
...
@@ -29,19 +29,20 @@
// get inherit binding value
// get inherit binding value
const
getBindValues
=
computed
(()
=>
{
const
getBindValues
=
computed
(()
=>
{
const
popValues
=
Object
.
assign
(
return
Object
.
assign
(
{
{
okText
:
t
(
'
common.okText
'
),
okText
:
t
(
'
common.okText
'
),
cancelText
:
t
(
'
common.cancelText
'
),
cancelText
:
t
(
'
common.cancelText
'
),
},
},
{
...
props
,
...
unref
(
attrs
)
}
{
...
props
,
...
unref
(
attrs
)
}
);
);
return
popValues
;
});
});
return
()
=>
{
return
()
=>
{
const
bindValues
=
omit
(
unref
(
getBindValues
),
'
icon
'
);
const
bindValues
=
omit
(
unref
(
getBindValues
),
'
icon
'
);
const
Button
=
h
(
BasicButton
,
omit
(
bindValues
,
'
title
'
),
extendSlots
(
slots
));
const
btnBind
=
omit
(
bindValues
,
'
title
'
);
if
(
btnBind
.
disabled
)
btnBind
.
color
=
''
;
const
Button
=
h
(
BasicButton
,
btnBind
,
extendSlots
(
slots
));
// If it is not enabled, it is a normal button
// If it is not enabled, it is a normal button
if
(
!
props
.
enable
)
{
if
(
!
props
.
enable
)
{
...
...
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