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

Getting client side block search fields working with searching formulas.

This commit is contained in:
mike12345567 2022-01-25 18:28:55 +00:00
parent 1fade3404f
commit 5bbe667ea9
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/client/src/components/app/blocks/CardsBlock.svelte
View File

@ -39,6 +39,7 @@
number: "numberfield", number: "numberfield",
datetime: "datetimefield", datetime: "datetimefield",
boolean: "booleanfield", boolean: "booleanfield",
formula: "stringfield",
} }
let formId let formId

6
packages/client/src/components/app/blocks/TableBlock.svelte
View File

@ -35,6 +35,7 @@
number: "numberfield", number: "numberfield",
datetime: "datetimefield", datetime: "datetimefield",
boolean: "booleanfield", boolean: "booleanfield",
formula: "stringfield",
} }
let formId let formId
@ -60,10 +61,11 @@
let enrichedFilter = [...(filter || [])] let enrichedFilter = [...(filter || [])]
columns?.forEach(column => { columns?.forEach(column => {
const safePath = column.name.split(".").map(safe).join(".") const safePath = column.name.split(".").map(safe).join(".")
const stringType = column.type === "string" || column.type === "formula"
enrichedFilter.push({ enrichedFilter.push({
field: column.name, field: column.name,
operator: column.type === "string" ? "string" : "equal", operator: stringType ? "string" : "equal",
type: column.type === "string" ? "string" : "number", type: stringType ? "string" : "number",
valueType: "Binding", valueType: "Binding",
value: `{{ ${safe(formId)}.${safePath} }}`, value: `{{ ${safe(formId)}.${safePath} }}`,
}) })

3
packages/client/src/components/app/forms/Field.svelte
View File

@ -32,6 +32,7 @@
validation, validation,
formStep formStep
) )
$: schemaType = fieldSchema?.type !== "formula" ? fieldSchema?.type : "string"
// Focus label when editing // Focus label when editing
let labelNode let labelNode
@ -72,7 +73,7 @@
<Placeholder <Placeholder
text="Add the Field setting to start using your component" text="Add the Field setting to start using your component"
/> />
{:else if fieldSchema?.type && fieldSchema?.type !== type && type !== "options"} {:else if schemaType && schemaType !== type && type !== "options"}
<Placeholder <Placeholder
text="This Field setting is the wrong data type for this component" text="This Field setting is the wrong data type for this component"
/> />