MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/signature-field-and-component

This commit is contained in:
deanhannigan 2024-04-10 10:51:20 +01:00 committed by GitHub
parent e1c69429c8 25a6b76667
commit 6a3b52f3a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
View File

@ -34,7 +34,7 @@
$selectedScreen, $selectedScreen,
datasource datasource
)?.table?.primaryDisplay )?.table?.primaryDisplay
$: schema = getSchema(selectedScreen, datasource) $: schema = getSchema($selectedScreen, datasource)
$: columns = getColumns({ $: columns = getColumns({
columns: value, columns: value,
schema, schema,

2
packages/client/manifest.json
View File

@ -6060,7 +6060,7 @@
"block": true, "block": true,
"name": "Repeater Block", "name": "Repeater Block",
"icon": "ViewList", "icon": "ViewList",
"illegalChildren": ["section"], "illegalChildren": ["section", "rowexplorer"],
"hasChildren": true, "hasChildren": true,
"size": { "size": {
"width": 400, "width": 400,

3
packages/client/src/components/app/GridBlock.svelte
View File

@ -150,7 +150,8 @@
border: 1px solid var(--spectrum-global-color-gray-300); border: 1px solid var(--spectrum-global-color-gray-300);
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
min-height: 410px; min-height: 230px;
height: 410px;
} }
div.in-builder :global(*) { div.in-builder :global(*) {
pointer-events: none; pointer-events: none;