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

Merge pull request #1014 from Budibase/fix/chart-field-settings 

Fix settings to select fields and fix chart settings not showing fields
This commit is contained in:
Andrew Kingston 2021-01-26 11:20:41 +00:00 committed by GitHub
parent 6663306ca3 9e29b33055
commit 40d8d9a5fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/builderStore/dataBinding.js
View File

@ -46,7 +46,7 @@ export const getDatasourceForProvider = component => {
// Extract datasource from component instance // Extract datasource from component instance
const datasourceSetting = def.settings.find(setting => { const datasourceSetting = def.settings.find(setting => {
return setting.key === def.datasourceSetting return setting.type === "datasource" || setting.type === "table"
}) })
if (!datasourceSetting) { if (!datasourceSetting) {
return null return null

2
packages/builder/src/components/design/PropertiesPanel/PropertyControls/TableViewFieldSelect.svelte
View File

@ -12,7 +12,7 @@
export let multiselect = false export let multiselect = false
$: datasource = getDatasourceForProvider(componentInstance) $: datasource = getDatasourceForProvider(componentInstance)
$: schema = getSchemaForDatasource(datasource) $: schema = getSchemaForDatasource(datasource).schema
$: options = Object.keys(schema || {}) $: options = Object.keys(schema || {})
</script> </script>

3
packages/standard-components/manifest.json
View File

@ -106,7 +106,6 @@
"styleable": true, "styleable": true,
"hasChildren": true, "hasChildren": true,
"dataProvider": true, "dataProvider": true,
"datasourceSetting": "datasource",
"settings": [ "settings": [
{ {
"type": "datasource", "type": "datasource",
@ -418,7 +417,6 @@
"styleable": true, "styleable": true,
"hasChildren": true, "hasChildren": true,
"dataProvider": true, "dataProvider": true,
"datasourceSetting": "table",
"settings": [ "settings": [
{ {
"type": "table", "type": "table",
@ -434,7 +432,6 @@
"hasChildren": true, "hasChildren": true,
"styleable": true, "styleable": true,
"dataProvider": true, "dataProvider": true,
"datasourceSetting": "table",
"settings": [ "settings": [
{ {
"type": "table", "type": "table",