Merge branch 'cheeks-lab-day-binding-eval' of github.com:Budibase/budibase into cheeks-snippets-poc
This commit is contained in:
commit
1a8a649be4
|
@ -9,7 +9,6 @@
|
|||
} from "@budibase/bbui"
|
||||
import { createEventDispatcher, onMount } from "svelte"
|
||||
import {
|
||||
isValid,
|
||||
decodeJSBinding,
|
||||
encodeJSBinding,
|
||||
processStringSync,
|
||||
|
@ -35,7 +34,6 @@
|
|||
|
||||
export let bindings = []
|
||||
export let value = ""
|
||||
export let valid = true
|
||||
export let allowHBS = true
|
||||
export let allowJS = false
|
||||
export let allowHelpers = true
|
||||
|
@ -174,11 +172,16 @@
|
|||
|
||||
const updateValue = val => {
|
||||
const runtimeExpression = readableToRuntimeBinding(enrichedBindings, val)
|
||||
<<<<<<< HEAD
|
||||
valid = isValid(runtimeExpression)
|
||||
if (valid) {
|
||||
dispatch("change", val)
|
||||
requestEval(runtimeExpression, context, snippets)
|
||||
}
|
||||
=======
|
||||
dispatch("change", val)
|
||||
requestUpdateEvaluation(runtimeExpression, context)
|
||||
>>>>>>> fe12a8606438d41437e21729068b91038ba6df37
|
||||
}
|
||||
|
||||
const onSelectHelper = (helper, js) => {
|
||||
|
@ -229,6 +232,7 @@
|
|||
jsValue = encodeJSBinding(e.detail)
|
||||
updateValue(jsValue)
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
onMount(() => {
|
||||
// Set the initial mode appropriately
|
||||
|
@ -245,6 +249,8 @@
|
|||
// Determine if our initial value is valid
|
||||
valid = isValid(readableToRuntimeBinding(enrichedBindings, value))
|
||||
})
|
||||
=======
|
||||
>>>>>>> fe12a8606438d41437e21729068b91038ba6df37
|
||||
</script>
|
||||
|
||||
<DrawerContent padding={false}>
|
||||
|
|
Loading…
Reference in New Issue