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

Merge branch 'main' into develop

Browse source
This commit is contained in:
Sherfin Shamsudeen 2022-03-02 21:57:11 +05:30
commit 7b840b7eb3
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.version
View file

@ -1 +1 @@
1.2.2
1.2.4

8
frontend/src/Editor/Components/Table/Table.jsx
View file

@ -49,10 +49,12 @@ export function Table({
const actions = component.definition.properties.actions || { value: [] };
const serverSidePaginationProperty = component.definition.properties.serverSidePagination;
const serverSidePagination = serverSidePaginationProperty
let serverSidePagination = serverSidePaginationProperty
? resolveWidgetFieldValue(serverSidePaginationProperty.value, currentState)
: false;
if (typeof serverSidePagination !== 'boolean') serverSidePagination = false;
const serverSideSearchProperty = component.definition.properties.serverSideSearch;
const serverSideSearch = serverSideSearchProperty
? resolveWidgetFieldValue(serverSideSearchProperty.value, currentState)
@ -79,9 +81,11 @@ export function Table({
const highlightSelectedRow = resolveWidgetFieldValue(highlightSelectedRowProperty, currentState) ?? false; // default is false for backward compatibility
const clientSidePaginationProperty = component.definition.properties.clientSidePagination?.value;
const clientSidePagination =
let clientSidePagination =
resolveWidgetFieldValue(clientSidePaginationProperty, currentState) ?? !serverSidePagination; // default is true for backward compatibility
if (typeof clientSidePagination !== 'boolean') clientSidePagination = true;
const tableTypeProperty = component.definition.styles.tableType;
let tableType = tableTypeProperty ? tableTypeProperty.value : 'table-bordered';
tableType = tableType === '' ? 'table-bordered' : tableType;

4
frontend/src/Editor/SubContainer.jsx
View file

@ -364,9 +364,9 @@ export const SubContainer = ({
[optionName]: value,
},
};
onComponentOptionChanged(parentComponent, 'data', newData);
return onComponentOptionChanged(parentComponent, 'data', newData);
} else {
onComponentOptionChanged(component, optionName, value, extraProps);
return onComponentOptionChanged(component, optionName, value, extraProps);
}
}