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

Only allow bindings type for Is In Conditional UI

This commit is contained in:
Mel O'Hagan 2022-08-16 13:36:48 +01:00
parent 9287d48ccf
commit c5196c7a37
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/builder/src/pages/builder/app/[application]/design/[screenId]/components/[componentId]/_components/settings/ConditionalUIDrawer.svelte
View File

@ -112,7 +112,7 @@
Constants.OperatorOptions.NotEmpty.value, Constants.OperatorOptions.NotEmpty.value,
] ]
condition.noValue = noValueOptions.includes(newOperator) condition.noValue = noValueOptions.includes(newOperator)
if (condition.noValue) { if (condition.noValue || condition.operator === "oneOf") {
condition.referenceValue = null condition.referenceValue = null
condition.valueType = "string" condition.valueType = "string"
} }
@ -207,7 +207,14 @@
/> />
<Select <Select
disabled={condition.noValue} disabled={condition.noValue}
options={valueTypeOptions} options={condition.operator === "oneOf"
? [
{
value: "string",
label: "Binding",
},
]
: valueTypeOptions}
bind:value={condition.valueType} bind:value={condition.valueType}
placeholder={null} placeholder={null}
on:change={e => onValueTypeChange(condition, e.detail)} on:change={e => onValueTypeChange(condition, e.detail)}

2
packages/frontend-core/src/utils/lucene.js
View File

@ -114,7 +114,7 @@ export const buildLuceneQuery = filter => {
return return
} }
} }
if (type === "number" && !Array.isArray(value)) { if (type === "number" && typeof value === "string") {
if (operator === "oneOf") { if (operator === "oneOf") {
value = value.split(",").map(item => parseFloat(item)) value = value.split(",").map(item => parseFloat(item))
} else if (!isHbs) { } else if (!isHbs) {