Fix new layouts having bad styling

This commit is contained in:
Andrew Kingston 2020-12-23 09:23:03 +00:00
parent b9453545d2
commit d730967945
3 changed files with 25 additions and 6 deletions

View File

@ -41,7 +41,7 @@
{ key: "layoutId", label: "Layout", control: LayoutSelect }, { key: "layoutId", label: "Layout", control: LayoutSelect },
] ]
const layoutDefinition = [{ key: "title", label: "Title", control: Input }] const layoutDefinition = []
const canRenderControl = (key, dependsOn) => { const canRenderControl = (key, dependsOn) => {
let test = !isEmpty(componentInstance[dependsOn]) let test = !isEmpty(componentInstance[dependsOn])
@ -119,7 +119,7 @@
{/if} {/if}
{/if} {/if}
{#if panelDefinition && panelDefinition.length > 0} {#if !isLayout && panelDefinition && panelDefinition.length > 0}
{#each panelDefinition as definition} {#each panelDefinition as definition}
{#if canRenderControl(definition.key, definition.dependsOn)} {#if canRenderControl(definition.key, definition.dependsOn)}
<PropertyControl <PropertyControl

View File

@ -8,8 +8,8 @@ exports.save = async function(ctx) {
if (!layout.props) { if (!layout.props) {
layout = { layout = {
...layout,
...EMPTY_LAYOUT, ...EMPTY_LAYOUT,
...layout,
} }
} }
@ -34,7 +34,7 @@ exports.destroy = async function(ctx) {
) )
).rows.map(element => element.doc.layoutId) ).rows.map(element => element.doc.layoutId)
if (layoutsUsedByScreens.includes(layoutId)) { if (layoutsUsedByScreens.includes(layoutId)) {
ctx.throw(400, "Cannot delete a base layout") ctx.throw(400, "Cannot delete a layout that's being used by a screen")
} }
await db.remove(layoutId, layoutRev) await db.remove(layoutId, layoutRev)

View File

@ -16,7 +16,17 @@ const EMPTY_LAYOUT = {
_id: "7fcf11e4-6f5b-4085-8e0d-9f3d44c98967", _id: "7fcf11e4-6f5b-4085-8e0d-9f3d44c98967",
_component: "##builtin/screenslot", _component: "##builtin/screenslot",
_styles: { _styles: {
normal: {}, normal: {
flex: "1 1 auto",
display: "flex",
"flex-direction": "column",
"justify-content": "flex-start",
"align-items": "stretch",
"max-width": "100%",
"margin-left": "20px",
"margin-right": "20px",
width: "1400px",
},
hover: {}, hover: {},
active: {}, active: {},
selected: {}, selected: {},
@ -28,7 +38,16 @@ const EMPTY_LAYOUT = {
_styles: { _styles: {
active: {}, active: {},
hover: {}, hover: {},
normal: {}, normal: {
display: "flex",
"flex-direction": "column",
"align-items": "center",
"justify-content": "flex-start",
"margin-right": "auto",
"margin-left": "auto",
"min-height": "100%",
"background-image": "#f5f5f5",
},
selected: {}, selected: {},
}, },
className: "", className: "",