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
a07ab6d7
Commit
a07ab6d7
authored
Jul 24, 2021
by
无木
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(table): component shown in `fullscreen` mode
修复表格在全屏模式下编辑组件弹出层的显示问题
parent
9b8f165a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
6 deletions
+11
-6
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
TableAction.vue
src/components/Table/src/components/TableAction.vue
+7
-6
EditableCell.vue
...components/Table/src/components/editable/EditableCell.vue
+1
-0
EditRowTable.vue
src/views/demo/table/EditRowTable.vue
+2
-0
No files found.
CHANGELOG.zh_CN.md
View file @
a07ab6d7
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
-
**BasicTable**
修复可编辑单元格不支持
`ellipsis`
配置的问题
-
**BasicTable**
修复可编辑单元格不支持
`ellipsis`
配置的问题
-
**ImgRotateDragVerify**
修复组件
`resume`
方法无法调用的问题
-
**ImgRotateDragVerify**
修复组件
`resume`
方法无法调用的问题
-
**TableAction**
修复 stopButtonPropagation 属性某些情况下不起作用的问题
-
**TableAction**
修复 stopButtonPropagation 属性某些情况下不起作用的问题
-
**BasicTable**
修复全屏模式下看不到子组件弹出层(popconfirm 以及 select、treeSelect 等编辑组件)的问题
-
**Dark Theme**
黑暗主题下的配色问题修正
-
**Dark Theme**
黑暗主题下的配色问题修正
-
修复
`Tree`
组件被选中节点的背景颜色
-
修复
`Tree`
组件被选中节点的背景颜色
-
修复
`Alert`
组件的颜色配置
-
修复
`Alert`
组件的颜色配置
...
...
src/components/Table/src/components/TableAction.vue
View file @
a07ab6d7
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
</div>
</div>
</template>
</template>
<
script
lang=
"ts"
>
<
script
lang=
"ts"
>
import
{
defineComponent
,
PropType
,
computed
,
toRaw
}
from
'
vue
'
;
import
{
defineComponent
,
PropType
,
computed
,
toRaw
,
unref
}
from
'
vue
'
;
import
{
MoreOutlined
}
from
'
@ant-design/icons-vue
'
;
import
{
MoreOutlined
}
from
'
@ant-design/icons-vue
'
;
import
{
Divider
,
Tooltip
,
TooltipProps
}
from
'
ant-design-vue
'
;
import
{
Divider
,
Tooltip
,
TooltipProps
}
from
'
ant-design-vue
'
;
import
Icon
from
'
/@/components/Icon/index
'
;
import
Icon
from
'
/@/components/Icon/index
'
;
...
@@ -95,6 +95,7 @@
...
@@ -95,6 +95,7 @@
.
map
((
action
)
=>
{
.
map
((
action
)
=>
{
const
{
popConfirm
}
=
action
;
const
{
popConfirm
}
=
action
;
return
{
return
{
getPopupContainer
:
()
=>
unref
(
table
?.
wrapRef
.
value
)
??
document
.
body
,
type
:
'
link
'
,
type
:
'
link
'
,
size
:
'
small
'
,
size
:
'
small
'
,
...
action
,
...
action
,
...
@@ -131,11 +132,11 @@
...
@@ -131,11 +132,11 @@
});
});
function
getTooltip
(
data
:
string
|
TooltipProps
):
TooltipProps
{
function
getTooltip
(
data
:
string
|
TooltipProps
):
TooltipProps
{
if
(
isString
(
data
))
{
return
{
return
{
title
:
data
,
placement
:
'
bottom
'
};
getPopupContainer
:
()
=>
unref
(
table
?.
wrapRef
.
value
)
??
document
.
body
,
}
else
{
placement
:
'
bottom
'
,
return
Object
.
assign
({
placement
:
'
bottom
'
},
data
);
...(
isString
(
data
)
?
{
title
:
data
}
:
data
),
}
}
;
}
}
function
onCellClick
(
e
:
MouseEvent
)
{
function
onCellClick
(
e
:
MouseEvent
)
{
...
...
src/components/Table/src/components/editable/EditableCell.vue
View file @
a07ab6d7
...
@@ -113,6 +113,7 @@
...
@@ -113,6 +113,7 @@
const
value
=
isCheckValue
?
(
isNumber
(
val
)
&&
isBoolean
(
val
)
?
val
:
!!
val
)
:
val
;
const
value
=
isCheckValue
?
(
isNumber
(
val
)
&&
isBoolean
(
val
)
?
val
:
!!
val
)
:
val
;
return
{
return
{
getPopupContainer
:
()
=>
unref
(
table
?.
wrapRef
.
value
)
??
document
.
body
,
placeholder
:
createPlaceholderMessage
(
unref
(
getComponent
)),
placeholder
:
createPlaceholderMessage
(
unref
(
getComponent
)),
...
apiSelectProps
,
...
apiSelectProps
,
...
omit
(
compProps
,
'
onChange
'
),
...
omit
(
compProps
,
'
onChange
'
),
...
...
src/views/demo/table/EditRowTable.vue
View file @
a07ab6d7
...
@@ -171,6 +171,8 @@
...
@@ -171,6 +171,8 @@
api
:
demoListApi
,
api
:
demoListApi
,
columns
:
columns
,
columns
:
columns
,
showIndexColumn
:
false
,
showIndexColumn
:
false
,
showTableSetting
:
true
,
tableSetting
:
{
fullScreen
:
true
},
actionColumn
:
{
actionColumn
:
{
width
:
160
,
width
:
160
,
title
:
'
Action
'
,
title
:
'
Action
'
,
...
...
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