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

Add JSON in column type dropdown.

Browse source
This commit is contained in:
devanshu052000 2025-01-06 02:59:50 +05:30
parent 94594463d4
commit 868b36ebcb
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/AppBuilder/RightSideBar/Inspector/Components/Table/ColumnManager/PropertiesTabElements.jsx
View file

@ -52,6 +52,7 @@ export const PropertiesTabElements = ({
{ label: 'Boolean', value: 'boolean' },
{ label: 'Image', value: 'image' },
{ label: 'Link', value: 'link' },
{ label: 'JSON', value: 'json' },
// Following column types are deprecated
{ label: 'Default', value: 'default' },
{ label: 'Dropdown', value: 'dropdown' },

15
frontend/src/AppBuilder/RightSideBar/Inspector/Components/Table/ColumnManager/StylesTabElements.jsx
View file

@ -122,9 +122,18 @@ export const StylesTabElements = ({
</div>
)}
{['string', 'default', undefined, 'number', 'boolean', 'select', 'text', 'newMultiSelect', 'datepicker'].includes(
column.columnType
) && (
{[
'string',
'default',
undefined,
'number',
'json',
'boolean',
'select',
'text',
'newMultiSelect',
'datepicker',
].includes(column.columnType) && (
<>
{column.columnType !== 'boolean' && (
<div data-cy={`input-and-label-text-color`} className="field px-3">

2
frontend/src/AppBuilder/RightSideBar/Inspector/Components/Table/Table.jsx
View file

@ -624,6 +624,8 @@ class TableComponent extends React.Component {
return 'Select';
case 'newMultiSelect':
return 'Multiselect';
case 'json':
return 'JSON';
default:
capitalize(text ?? '');
}

2
frontend/src/AppBuilder/Widgets/Table/GenerateEachCellValue.jsx
View file

@ -29,7 +29,7 @@ export default function GenerateEachCellValue({
const [showHighlightedCells, setHighlighterCells] = React.useState(globalFilter ? true : false);
// const [isNullCellClicked, setIsNullCellClicked] = React.useState(false);
const columnTypeAllowToRenderMarkElement = ['text', 'string', 'default', 'number', undefined];
const columnTypeAllowToRenderMarkElement = ['text', 'string', 'default', 'number', 'json', undefined];
const ref = useRef();
const [showOverlay, setShowOverlay] = useState(false);
const [hovered, setHovered] = useState(false);