bx-1379-redesign #15

Merged
ksenia_mikhailova merged 124 commits from bx-1379-redesign into dev 2024-09-06 15:39:13 +03:00
4 changed files with 5 additions and 6 deletions
Showing only changes of commit fb4f5bd02a - Show all commits

View File

@ -53,8 +53,7 @@ watch(() => route.params.target, () => {
source.value = t source.value = t
sidebar.close() sidebar.close()
} }
},) })
const sidebarFunc = () => { const sidebarFunc = () => {
if (sidebar.is_open) { if (sidebar.is_open) {
sidebar.close() sidebar.close()
@ -76,7 +75,7 @@ const sidebarFunc = () => {
<TresPerspectiveCamera :position="cameraPosition" ref="camera" /> <TresPerspectiveCamera :position="cameraPosition" ref="camera" />
<OrbitControls v-bind="controlsState" @change="onChange" make-default /> <OrbitControls v-bind="controlsState" @change="onChange" make-default />
<Suspense> <Suspense>
<LoadModels :source="source" :loaded_pan="loadedPan" /> <LoadModels :source="source" :loaded_pan="loadedPan" v-if="route.name == 'scene'" :key="source as string" />
</Suspense> </Suspense>
</TresCanvas> </TresCanvas>
<div class="homelink" :class="[{ open: sidebar.is_open }]"> <div class="homelink" :class="[{ open: sidebar.is_open }]">

View File

@ -134,6 +134,7 @@ const clearValues = () => {
sidebar_visible = [] sidebar_visible = []
} }
const loadModels = async () => { const loadModels = async () => {
console.log(`load models ${props.source} ${process_loading.value}`)
clearValues() clearValues()
loading_store.status = 'loading' loading_store.status = 'loading'
@ -428,6 +429,8 @@ onMounted(() => {
} }
}) })
onUnmounted(() => { onUnmounted(() => {
console.log('unmount load models')
clearValues()
document.removeEventListener('click', clickEvent) document.removeEventListener('click', clickEvent)
timerEvent.map((event: string) => { timerEvent.map((event: string) => {
document.removeEventListener(event, stopTimer) document.removeEventListener(event, stopTimer)

View File

@ -6,7 +6,6 @@ const page = useItem()
const route = useRoute() const route = useRoute()
await page.load(route.params) await page.load(route.params)
console.log(page)
</script> </script>
<template> <template>
{{ route.params }} {{ route.params }}

View File

@ -7,8 +7,6 @@ const route = useRoute()
const router = useRouter() const router = useRouter()
const pageStore = useItem() const pageStore = useItem()
console.log(router)
</script> </script>
<template> <template>
<div class="nav"> <div class="nav">