Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix : cell edit menu stying issue for foreign key values (#1535) (#10029)

Browse source 
Co-authored-by: Syed Abdul Rahman <137684137+S-Abdul-Rahman@users.noreply.github.com>
This commit is contained in:
Akshay 2024-06-11 11:09:49 +05:30 committed by GitHub
parent 20c0f4918a
commit 42f3dd8aea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/Editor/QueryManager/QueryEditors/TooljetDatabase/DropDownSelect.jsx
View file

@ -242,7 +242,7 @@ const DropDownSelect = ({
style={{
position: 'relative',
left: '-10px',
top: selected.label === null || selected.label === undefined ? '0px' : '2px',
top: selected.label === null || selected.label === undefined || isCellEdit ? '0px' : '2px',
paddingLeft: '10px',
paddingBottom: '4px',
}}
@ -251,10 +251,11 @@ const DropDownSelect = ({
setShowMenu(true);
}}
>
<span
<p
className={cx({
'd-flex align-items-center justify-content-center':
'd-flex align-items-center justify-content-center m-0':
selected.label === null || selected.label === undefined,
'cell-menu-text m-0': selected.label !== null || selected.label !== undefined,
})}
style={{
color: darkMode ? '#fff' : '',
@ -263,7 +264,7 @@ const DropDownSelect = ({
}}
>
{selected.label === null || selected.label === undefined ? 'Null' : selected.label}
</span>
</p>
</div>
) : (
<div className={`col-auto ${buttonClasses}`} id={popoverBtnId.current}>

16
frontend/src/TooljetDatabase/Table/styles.scss
View file

@ -171,15 +171,15 @@
div {
padding-bottom: 0px !important;
span {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 85%;
.cell-menu-text {
white-space: nowrap ;
overflow: hidden ;
text-overflow: ellipsis ;
width: 85% ;
color: var(--slate11) !important;
cursor: default;
border-radius: 6px;
height: 20px;
// height: 20px;
font-size: 12px;
}
}
@ -190,7 +190,7 @@
.tjdb-td-wrapper {
div {
padding-bottom: 0px !important;
span {
.cell-menu-text {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
@ -198,7 +198,7 @@
color: var(--slate11) !important;
cursor: default;
border-radius: 6px;
height: 20px;
// height: 20px;
font-size: 12px;
}
}