Merge pull request #13669 from Budibase/budi-8123/fix-binding-panel
Fix binding panel
This commit is contained in:
commit
c6c306e3ad
2 changed files with 4 additions and 2 deletions
|
@ -492,7 +492,7 @@ const generateComponentContextBindings = (asset, componentContext) => {
|
||||||
icon: bindingCategory.icon,
|
icon: bindingCategory.icon,
|
||||||
display: {
|
display: {
|
||||||
name: `${fieldSchema.name || key}`,
|
name: `${fieldSchema.name || key}`,
|
||||||
type: fieldSchema.type,
|
type: fieldSchema.display?.type || fieldSchema.type,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -1030,12 +1030,13 @@ export const getSchemaForDatasource = (asset, datasource, options) => {
|
||||||
fixedSchema[fieldName] = {
|
fixedSchema[fieldName] = {
|
||||||
type: fieldSchema,
|
type: fieldSchema,
|
||||||
name: fieldName,
|
name: fieldName,
|
||||||
|
display: { type: fieldSchema },
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
fixedSchema[fieldName] = {
|
fixedSchema[fieldName] = {
|
||||||
...fieldSchema,
|
...fieldSchema,
|
||||||
type: field?.name || fieldSchema.name,
|
|
||||||
name: fieldName,
|
name: fieldName,
|
||||||
|
display: { type: field?.name || fieldSchema.type },
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
@ -125,6 +125,7 @@
|
||||||
filter.type = fieldSchema?.type
|
filter.type = fieldSchema?.type
|
||||||
filter.subtype = fieldSchema?.subtype
|
filter.subtype = fieldSchema?.subtype
|
||||||
filter.formulaType = fieldSchema?.formulaType
|
filter.formulaType = fieldSchema?.formulaType
|
||||||
|
filter.constraints = fieldSchema?.constraints
|
||||||
|
|
||||||
// Update external type based on field
|
// Update external type based on field
|
||||||
filter.externalType = getSchema(filter)?.externalType
|
filter.externalType = getSchema(filter)?.externalType
|
||||||
|
|
Loading…
Reference in a new issue