Merge commit
This commit is contained in:
parent
12ce3291eb
commit
e3dadaa22c
|
@ -1,5 +1,5 @@
|
||||||
<script>
|
<script>
|
||||||
import { goto, beforeUrlChange } from "@roxi/routify"
|
import { goto, beforeUrlChange, route, getDirection } from "@roxi/routify"
|
||||||
import {
|
import {
|
||||||
Icon,
|
Icon,
|
||||||
Select,
|
Select,
|
||||||
|
@ -29,6 +29,11 @@
|
||||||
import { fieldsToSchema, schemaToFields } from "helpers/data/utils"
|
import { fieldsToSchema, schemaToFields } from "helpers/data/utils"
|
||||||
import AccessLevelSelect from "./AccessLevelSelect.svelte"
|
import AccessLevelSelect from "./AccessLevelSelect.svelte"
|
||||||
|
|
||||||
|
// $: lastRoute = $route.last
|
||||||
|
// $: console.log("lastRoute", lastRoute)
|
||||||
|
// $: direction = getDirection($route, lastRoute)
|
||||||
|
// $: console.log("directioon ", direction)
|
||||||
|
|
||||||
export let query
|
export let query
|
||||||
|
|
||||||
const transformerDocs = "https://docs.budibase.com/docs/transformers"
|
const transformerDocs = "https://docs.budibase.com/docs/transformers"
|
||||||
|
@ -46,13 +51,16 @@
|
||||||
$: console.log("GO ", navigateTo)
|
$: console.log("GO ", navigateTo)
|
||||||
$: console.log("DISCARD ", discard)
|
$: console.log("DISCARD ", discard)
|
||||||
|
|
||||||
$beforeUrlChange(event => {
|
$beforeUrlChange((event, route) => {
|
||||||
const updated = JSON.stringify(query)
|
const updated = JSON.stringify(query)
|
||||||
if (updated !== queryStr && !discard) {
|
console.log("route ", route)
|
||||||
navigateTo = event.url
|
console.log("event ", event)
|
||||||
saveModal.show()
|
// if (updated !== queryStr && !discard) {
|
||||||
return false
|
// navigateTo = event.url
|
||||||
} else return true
|
// saveModal.show()
|
||||||
|
// return false
|
||||||
|
// } else return true
|
||||||
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
$: datasource = $datasources.list.find(ds => ds._id === query.datasourceId)
|
$: datasource = $datasources.list.find(ds => ds._id === query.datasourceId)
|
||||||
|
|
Loading…
Reference in New Issue