diff --git a/packages/web/src/designer/DesignerTable.svelte b/packages/web/src/designer/DesignerTable.svelte index 4459f6ce6..c1c0a4403 100644 --- a/packages/web/src/designer/DesignerTable.svelte +++ b/packages/web/src/designer/DesignerTable.svelte @@ -302,11 +302,11 @@
tick().then(onMoveReferences)} class:scroll={settings?.allowScrollColumns}> {#each flatColumns || [] as column} x.getChildColumns)} - isExpandable={!!column.getChildColumns} - isExpanded={column.isExpanded} - expandLevel={column.expandLevel} - toggleExpanded={column.toggleExpanded} + nestingSupported={!!settings?.isColumnExpandable && columns.find(x => settings?.isColumnExpandable(x))} + isExpandable={settings?.isColumnExpandable && settings?.isColumnExpandable(column)} + isExpanded={settings?.isColumnExpanded && settings?.isColumnExpanded(column)} + expandLevel={settings?.columnExpandLevel ? settings?.columnExpandLevel(column) : 0} + toggleExpanded={value => settings?.toggleExpandedColumn(column, value)} {column} {table} {designer} diff --git a/packages/web/src/perspectives/PerspectiveDesigner.svelte b/packages/web/src/perspectives/PerspectiveDesigner.svelte index 873d1590a..fb5aa9308 100644 --- a/packages/web/src/perspectives/PerspectiveDesigner.svelte +++ b/packages/web/src/perspectives/PerspectiveDesigner.svelte @@ -327,6 +327,10 @@ return false; }, onClickTableHeader, + isColumnExpandable: column => !!column.getChildColumns, + isColumnExpanded: column => column.isExpanded, + columnExpandLevel: column => column.expandLevel, + toggleExpandedColumn: (column, value) => column.toggleExpanded(value), }} referenceComponent={QueryDesignerReference} value={createDesignerModel(config, dbInfos, dataPatterns)}