diff --git a/lerna.json b/lerna.json index e3afa83e45..664712d568 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.6.8-alpha.10", + "version": "2.6.8-alpha.11", "npmClient": "yarn", "packages": [ "packages/backend-core", diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte index 5dc2e6f83a..23e62fb1df 100644 --- a/packages/builder/src/components/backend/DataTable/Table.svelte +++ b/packages/builder/src/components/backend/DataTable/Table.svelte @@ -22,7 +22,11 @@ export let rowCount export let disableSorting = false export let customPlaceholder = false +<<<<<<< HEAD export let allowEditing = true +======= + export let allowClickRows +>>>>>>> origin/develop const dispatch = createEventDispatcher() @@ -112,6 +116,7 @@ {customPlaceholder} {allowEditing} showAutoColumns={!hideAutocolumns} + {allowClickRows} on:clickrelationship={e => selectRelationship(e.detail)} on:sort > diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte index 9a6d9ea1d3..be8237f616 100644 --- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte +++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte @@ -555,7 +555,7 @@ {#if filteredUsers?.length}