Skip to content

BUGFIX: исправление бага с возвратом из карты обратно в расписание #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BatuevIO merged 5 commits into from
Oct 27, 2025
Merged

BUGFIX: исправление бага с возвратом из карты обратно в расписание #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c728b5e
При переходе из расписания в карту явно передаем информацию об этом. …
Dmatrushka19 Oct 24, 2025
c9b394b
Прописал функцию определения поведения кнопки "назад".
Dmatrushka19 Oct 24, 2025
98009f7
упростил логику. Убрал передачу state
Dmatrushka19 Oct 26, 2025
b5c8de4
поправил стили вручную. Какой-то косяк
Dmatrushka19 Oct 26, 2025
80a19a1
еще поправил стили вручную
Dmatrushka19 Oct 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/views/apps/ApplicationFrame.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ const scopes: Ref<string[]> = ref([]);
const scopeNamesToRequest: Ref<string[]> = ref([]);

toolbar.setup({
backUrl: '/apps',
backUrl: undefined,
backable: true,
});

const composeUrl = async (url: URL, token: string | null, scopes: string[]) => {
Expand Down Expand Up @@ -144,7 +145,12 @@ const openApp = async (data: ServiceData) => {
}

url.value = new URL(data.link);
toolbar.title = data.name ?? 'Ошибка';

toolbar.setup({
title: data.name ?? 'Ошибка',
backUrl: undefined,
backable: true,
});

scopes.value = data.scopes ? data.scopes : [];

Expand Down
23 changes: 14 additions & 9 deletions src/views/timetable/room/TimetableRoomView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ const toolbar = useToolbar();

toolbar.setup({
title: 'Аудитория',
backUrl:
router.options.history.state.back &&
router.options.history.state.back.toString().startsWith('/timetable/event')
? undefined
: '/timetable',
backable: true,
backUrl: undefined,
share: true,
});

const goToMap = () => {
router.push('/apps/2');
};
</script>

<template>
Expand All @@ -28,19 +28,21 @@ toolbar.setup({
<Suspense>
<AsyncRoomInfo :id="+route.params.id" />

<template #fallback> <FullscreenLoader /> </template>
<template #fallback>
<FullscreenLoader />
</template>
</Suspense>
</section>

<section class="section">
<h3 class="h3">Карта этажа</h3>

<RouterLink to="/apps/2" class="map">
<div class="map" @click="goToMap">
<span class="text">
Посмотреть на карте
<v-icon icon="open_in_new" />
</span>
</RouterLink>
</div>
</section>

<section class="section">
Expand All @@ -49,7 +51,9 @@ toolbar.setup({
</p>
<Suspense>
<AsyncRoomSchedule :id="+route.params.id" />
<template #fallback><FullscreenLoader /></template>
<template #fallback>
<FullscreenLoader />
</template>
</Suspense>
</section>
</IrdomLayout>
Expand Down Expand Up @@ -79,6 +83,7 @@ toolbar.setup({
justify-content: center;
align-items: center;
text-decoration: none;
cursor: pointer;
}

.text {
Expand Down