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
a5a9b3fb
Commit
a5a9b3fb
authored
Jul 24, 2021
by
无木
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(table): fix `dataPicker` show in `fullscreen` mode
修复basicTable编辑组件的校验提示以及日期选择框的弹出层在全屏模式下的显示问题
parent
a07ab6d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
CellComponent.ts
...components/Table/src/components/editable/CellComponent.ts
+13
-2
EditableCell.vue
...components/Table/src/components/editable/EditableCell.vue
+1
-0
No files found.
src/components/Table/src/components/editable/CellComponent.ts
View file @
a5a9b3fb
...
@@ -10,10 +10,17 @@ export interface ComponentProps {
...
@@ -10,10 +10,17 @@ export interface ComponentProps {
rule
:
boolean
;
rule
:
boolean
;
popoverVisible
:
boolean
;
popoverVisible
:
boolean
;
ruleMessage
:
string
;
ruleMessage
:
string
;
getPopupContainer
?:
Fn
;
}
}
export
const
CellComponent
:
FunctionalComponent
=
(
export
const
CellComponent
:
FunctionalComponent
=
(
{
component
=
'
Input
'
,
rule
=
true
,
ruleMessage
,
popoverVisible
}:
ComponentProps
,
{
component
=
'
Input
'
,
rule
=
true
,
ruleMessage
,
popoverVisible
,
getPopupContainer
,
}:
ComponentProps
,
{
attrs
}
{
attrs
}
)
=>
{
)
=>
{
const
Comp
=
componentMap
.
get
(
component
)
as
typeof
defineComponent
;
const
Comp
=
componentMap
.
get
(
component
)
as
typeof
defineComponent
;
...
@@ -24,7 +31,11 @@ export const CellComponent: FunctionalComponent = (
...
@@ -24,7 +31,11 @@ export const CellComponent: FunctionalComponent = (
}
}
return
h
(
return
h
(
Popover
,
Popover
,
{
overlayClassName
:
'
edit-cell-rule-popover
'
,
visible
:
!!
popoverVisible
},
{
overlayClassName
:
'
edit-cell-rule-popover
'
,
visible
:
!!
popoverVisible
,
...(
getPopupContainer
?
{
getPopupContainer
}
:
{}),
},
{
{
default
:
()
=>
DefaultComp
,
default
:
()
=>
DefaultComp
,
content
:
()
=>
ruleMessage
,
content
:
()
=>
ruleMessage
,
...
...
src/components/Table/src/components/editable/EditableCell.vue
View file @
a5a9b3fb
...
@@ -114,6 +114,7 @@
...
@@ -114,6 +114,7 @@
return
{
return
{
getPopupContainer
:
()
=>
unref
(
table
?.
wrapRef
.
value
)
??
document
.
body
,
getPopupContainer
:
()
=>
unref
(
table
?.
wrapRef
.
value
)
??
document
.
body
,
getCalendarContainer
:
()
=>
unref
(
table
?.
wrapRef
.
value
)
??
document
.
body
,
placeholder
:
createPlaceholderMessage
(
unref
(
getComponent
)),
placeholder
:
createPlaceholderMessage
(
unref
(
getComponent
)),
...
apiSelectProps
,
...
apiSelectProps
,
...
omit
(
compProps
,
'
onChange
'
),
...
omit
(
compProps
,
'
onChange
'
),
...
...
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