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

Settings Props for Pages and Screens

This commit is contained in:
Conor_Mack 2020-06-03 19:46:41 +01:00
parent ca0d1b6b2b
commit 2aaec0222c
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/builder/src/components/userInterface/ComponentPropertiesPanel.svelte
View File

@ -31,7 +31,6 @@
let selectedCategory = categories[0] let selectedCategory = categories[0]
$: components = $store.components $: components = $store.components
$: componentInstance = $store.currentComponentInfo
$: componentDefinition = $store.components[componentInstance._component] $: componentDefinition = $store.components[componentInstance._component]
$: componentPropDefinition = $: componentPropDefinition =
flattenedPanel.find( flattenedPanel.find(
@ -39,35 +38,32 @@
c => c._component === componentInstance._component c => c._component === componentInstance._component
) || {} ) || {}
$: panelDefinition = componentPropDefinition.properties
? componentPropDefinition.properties[selectedCategory.value]
: {}
let panelDefNew = {} let panelDefinition = {}
$: { $: {
if(componentPropDefinition.properties) { if(componentPropDefinition.properties) {
if(selectedCategory.value === "design") { if(selectedCategory.value === "design") {
panelDefNew = componentPropDefinition.properties["design"] panelDefinition = componentPropDefinition.properties["design"]
}else{ }else{
let panelDef = componentPropDefinition.properties["settings"] let panelDef = componentPropDefinition.properties["settings"]
if($store.currentFrontEndType === "page") { if($store.currentFrontEndType === "page") {
panelDefNew = [...page,...panelDef] panelDefinition = [...page,...panelDef]
}else if($store.currentFrontEndType === "screen" && $store.currentView !== "component") { }else if($store.currentFrontEndType === "screen" && $store.currentView !== "component") {
panelDefNew = [...screen, ...panelDef] panelDefinition = [...screen, ...panelDef]
}else { }else {
panelDefNew = panelDef panelDefinition = panelDef
} }
} }
} }
} }
let componentInstanceNew = {} let componentInstance = {}
$: { $: {
if(($store.currentFrontEndType === "screen" || $store.currentFrontEndType === "page") && $store.currentView !== "component") { if(($store.currentFrontEndType === "screen" || $store.currentFrontEndType === "page") && $store.currentView !== "component") {
componentInstanceNew = {...$store.currentPreviewItem, ...$store.currentComponentInfo} componentInstance = {...$store.currentPreviewItem, ...$store.currentComponentInfo}
}else { }else {
componentInstanceNew = $store.currentComponentInfo componentInstance = $store.currentComponentInfo
} }
} }
@ -117,10 +113,10 @@
<div class="component-props-container"> <div class="component-props-container">
{#if selectedCategory.value === 'design'} {#if selectedCategory.value === 'design'}
<DesignView panelDefinition={panelDefNew} {componentInstance} {onStyleChanged} /> <DesignView {panelDefinition} {componentInstance} {onStyleChanged} />
{:else if selectedCategory.value === 'settings'} {:else if selectedCategory.value === 'settings'}
<SettingsView <SettingsView
panelDefinition={panelDefNew} {panelDefinition}
{componentInstance} {componentInstance}
{componentDefinition} {componentDefinition}
onChange={onPropChanged} /> onChange={onPropChanged} />