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

Merge branch 'develop' into budi-6922-the-number-0-cannot-be-displayed-on-input-number-fields-when

This commit is contained in:
melohagan 2023-09-25 10:22:44 +01:00 committed by GitHub
parent bb6bf65c0f 799f62d218
commit 05aa725b2a
4 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.10.12-alpha.4", "version": "2.10.12-alpha.5",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*" "packages/*"

10
packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
View File

@ -61,10 +61,12 @@
key: "_css", key: "_css",
type: "text", type: "text",
}) })
$: settingOptions = settings.map(setting => ({ $: settingOptions = settings
label: makeLabel(setting), .filter(setting => setting.supportsConditions !== false)
value: setting.key, .map(setting => ({
})) label: makeLabel(setting),
value: setting.key,
}))
$: conditions.forEach(link => { $: conditions.forEach(link => {
if (!link.id) { if (!link.id) {
link.id = generate() link.id = generate()

12
packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
View File

@ -36,10 +36,7 @@
</script> </script>
<DetailSummary name={"Conditions"} collapsible={false}> <DetailSummary name={"Conditions"} collapsible={false}>
<div class="conditionCount">{conditionText}</div> <ActionButton on:click={openDrawer}>{conditionText}</ActionButton>
<div>
<ActionButton on:click={openDrawer}>Configure conditions</ActionButton>
</div>
</DetailSummary> </DetailSummary>
<Drawer bind:this={drawer} title="Conditions"> <Drawer bind:this={drawer} title="Conditions">
<svelte:fragment slot="description"> <svelte:fragment slot="description">
@ -48,10 +45,3 @@
<Button cta slot="buttons" on:click={() => save()}>Save</Button> <Button cta slot="buttons" on:click={() => save()}>Save</Button>
<ConditionalUIDrawer slot="body" bind:conditions={tempValue} {bindings} /> <ConditionalUIDrawer slot="body" bind:conditions={tempValue} {bindings} />
</Drawer> </Drawer>
<style>
.conditionCount {
font-weight: 600;
margin-top: -5px;
}
</style>

36
packages/client/manifest.json
View File

@ -2539,7 +2539,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",
@ -2629,7 +2630,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",
@ -2685,7 +2687,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",
@ -2736,7 +2739,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",
@ -2841,7 +2845,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "boolean", "type": "boolean",
@ -2960,7 +2965,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",
@ -3143,7 +3149,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",
@ -3200,7 +3207,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",
@ -3301,7 +3309,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",
@ -3355,7 +3364,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "boolean", "type": "boolean",
@ -3622,7 +3632,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",
@ -3689,7 +3700,8 @@
{ {
"type": "text", "type": "text",
"label": "Default value", "label": "Default value",
"key": "defaultValue" "key": "defaultValue",
"supportsConditions": false
}, },
{ {
"type": "event", "type": "event",