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

Merge branch 'master' of github.com:Budibase/budibase into form-builder

This commit is contained in:
Andrew Kingston 2021-01-26 11:21:20 +00:00
parent 2d0a7d825c af675a621d
commit efbb599f02
4 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -103,13 +103,9 @@ The Budibase builder runs in Electron, on Mac, PC and Linux. Follow the steps be
## 🤖 Self-hosting ## 🤖 Self-hosting
<p align="center">
<img src="https://i.imgur.com/Z52cEvT.png?1" />
</p>
Budibase wants to make sure anyone can use the tools we develop and we know a lot of people need to be able to host the apps they make on their own systems - that is why we've decided to try and make self hosting as easy as possible! Budibase wants to make sure anyone can use the tools we develop and we know a lot of people need to be able to host the apps they make on their own systems - that is why we've decided to try and make self hosting as easy as possible!
Currently, you can host your apps using Docker. The documentation for self-hosting can be found [here](https://docs.budibase.com/self-hosting/introduction-to-self-hosting). Currently, you can host your apps using Docker or Digital Ocean. The documentation for self-hosting can be found [here](https://docs.budibase.com/self-hosting/introduction-to-self-hosting).
## 🎓 Learning Budibase ## 🎓 Learning Budibase

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",
@ -439,7 +438,6 @@
"styleable": true, "styleable": true,
"hasChildren": true, "hasChildren": true,
"dataProvider": true, "dataProvider": true,
"datasourceSetting": "table",
"settings": [ "settings": [
{ {
"type": "table", "type": "table",
@ -455,7 +453,6 @@
"hasChildren": true, "hasChildren": true,
"styleable": true, "styleable": true,
"dataProvider": true, "dataProvider": true,
"datasourceSetting": "table",
"settings": [ "settings": [
{ {
"type": "table", "type": "table",