Skip to content

Commit 35b64d2

Browse files
author
Geode-solutions robot
committed
Merge remote-tracking branch 'origin/next'
2 parents 85f4153 + 4b5388b commit 35b64d2

File tree

85 files changed

+2898
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+2898
-575
lines changed

.github/workflows/config.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"node": true,
3+
"integration": true,
4+
"microservices": "tests/integration/microservices"
5+
}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ logs
2121
.env
2222
.env.*
2323
!.env.example
24+
venv
2425

2526
# Other
2627
.pytest_cache

components/FeedBack/ErrorBanner.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
</template>
4444

4545
<script setup>
46-
const feedback_store = use_feedback_store()
46+
const feedback_store = useFeedbackStore()
4747
4848
function reload() {
4949
window.location.reload()

components/FeedBack/Snackers.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</template>
6262

6363
<script setup>
64-
const feedback_store = use_feedback_store()
64+
const feedback_store = useFeedbackStore()
6565
const show = true
6666
6767
function calc_margin(index) {

components/HybridRenderingView.vue

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,64 @@
11
<template>
22
<ClientOnly>
3-
<div style="position: relative; width: 100%; height: calc(100vh - 75px)">
3+
<div class="fill-height" style="position: relative">
44
<VeaseViewToolbar />
55
<slot name="ui"></slot>
66
<v-col
7-
ref="viewer"
8-
style="
9-
overflow: hidden;
10-
position: relative;
11-
z-index: 0;
12-
height: 100%;
13-
width: 100%;
14-
"
157
class="pa-0"
8+
ref="viewer"
9+
style="height: 100%; overflow: hidden; position: relative; z-index: 0"
1610
@click="get_x_y"
17-
@keydown.esc="viewer_store.toggle_picking_mode(false)"
11+
@keydown.esc="viewerStore.toggle_picking_mode(false)"
1812
/>
1913
</div>
2014
</ClientOnly>
2115
</template>
2216

2317
<script setup>
18+
const emit = defineEmits(["click"])
19+
2420
const container = useTemplateRef("viewer")
2521
const hybridViewerStore = useHybridViewerStore()
26-
22+
const viewerStore = useViewerStore()
2723
const { windowWidth, windowHeight } = useWindowSize()
2824
const { width, height } = useElementSize(container)
2925
30-
watch([windowWidth, windowHeight, height, width], () => {
26+
const debouncedResize = debounce(() => {
3127
hybridViewerStore.resize(width.value, height.value)
28+
}, 100)
29+
30+
watch([windowWidth, windowHeight, width, height], () => {
31+
debouncedResize()
3232
})
3333
3434
onMounted(async () => {
3535
if (import.meta.client) {
3636
await hybridViewerStore.initHybridViewer()
3737
await nextTick()
3838
hybridViewerStore.setContainer(container)
39+
debouncedResize()
3940
}
4041
})
42+
43+
function debounce(func, wait) {
44+
let timeout
45+
return function executedFunction(...args) {
46+
const later = () => {
47+
clearTimeout(timeout)
48+
func(...args)
49+
}
50+
clearTimeout(timeout)
51+
timeout = setTimeout(later, wait)
52+
}
53+
}
54+
55+
function get_x_y(event) {
56+
emit("click", event)
57+
}
4158
</script>
59+
60+
<style>
61+
img {
62+
pointer-events: none;
63+
}
64+
</style>

components/Launcher.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<script setup>
2222
import Status from "@ogw_f/utils/status.js"
2323
24-
const infra_store = use_infra_store()
24+
const infra_store = useInfraStore()
2525
const site_key = useRuntimeConfig().public.RECAPTCHA_SITE_KEY
2626
2727
watch(

components/PackagesVersions.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
schema: { type: Object, required: true },
2626
})
2727
28-
const geode_store = use_geode_store()
28+
const geode_store = useGeodeStore()
2929
const packages_versions = ref([])
3030
3131
async function get_packages_versions() {

components/Recaptcha.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<script setup>
1515
import { VueRecaptcha } from "vue-recaptcha"
16-
const infra_store = use_infra_store()
16+
const infra_store = useInfraStore()
1717
1818
const props = defineProps({
1919
site_key: { type: String, required: true },

components/RemoteRenderingView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
viewId: { type: String, default: "-1" },
3131
})
3232
33-
const viewer_store = use_viewer_store()
33+
const viewer_store = useViewerStore()
3434
const viewer = useTemplateRef("viewer")
3535
const { width, height } = useElementSize(viewer)
3636

components/Viewer/BreadCrumb.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</template>
3838

3939
<script setup>
40-
const treeviewStore = use_treeview_store()
40+
const treeviewStore = useTreeviewStore()
4141
4242
const selectedTree = computed(() => treeviewStore.selectedTree)
4343

0 commit comments

Comments
 (0)