CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-08-07 22:28:15 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into budi-7589/user-column-multi-user-filtering-support

Browse source
This commit is contained in:
Adria Navarro 2023-10-09 09:37:44 +02:00 committed by GitHub
commit cd5835bfeb
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lerna.json
View file

@ -1,5 +1,5 @@
{
"version": "2.11.15",
"version": "2.11.16",
"npmClient": "yarn",
"packages": [
"packages/*"

7
packages/builder/src/builderStore/dataBinding.js
View file

@ -948,12 +948,15 @@ export const buildFormSchema = (component, asset) => {
if (component._component.endsWith("formblock")) {
let schema = {}
const datasource = getDatasourceForProvider(asset, component)
const info = getSchemaForDatasource(component, datasource)
if (!info?.schema) {
return schema
}
if (!component.fields) {
Object.values(info?.schema)
Object.values(info.schema)
.filter(
({ autocolumn, name }) =>
!autocolumn && !["_rev", "_id"].includes(name)

2
packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
View file

@ -37,7 +37,7 @@
}
$: datasource = getDatasourceForProvider($currentAsset, componentInstance)
$: resourceId = datasource.resourceId || datasource.tableId
$: resourceId = datasource?.resourceId || datasource?.tableId
$: if (!isEqual(value, cachedValue)) {
cachedValue = cloneDeep(value)