Skip to content

Batuevio/hotfix #364

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 2 commits into from
Sep 4, 2026
Merged

Batuevio/hotfix #364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1975b21
fix ci
BatuevIO Sep 4, 2026
147aa8e
Revert "Чиним высоту айфрейма (#362)"
BatuevIO Sep 4, 2026
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
4 changes: 2 additions & 2 deletions deployment/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18 AS build
FROM node:22 AS build

ARG BUILD_MODE=production
ARG LAUNCH_MODE=production
Expand All @@ -9,7 +9,7 @@ ENV VITE_APP_VERSION=${APP_VERSION}

WORKDIR /app
ADD ./package.json ./pnpm-lock.yaml /app/
RUN npm i -g pnpm && pnpm install
RUN npm i -g pnpm@9.15.9 && pnpm install --frozen-lockfile
ADD . /app
RUN pnpm build --mode ${BUILD_MODE}

Expand Down
30 changes: 16 additions & 14 deletions src/views/apps/ApplicationFrame.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,16 +192,29 @@ onMounted(async () => {
appState.value = AppState.Error;
}
});

function addIframeStyles() {
const iframeDoc = ref();
const style = iframeDoc.value.createElement('style');
style.textContent = `
main, .container, #app > div {
min-height: 100vh;
}
`;
iframeDoc.value.head.appendChild(style);
}
</script>

<template>
<v-main class="application-frame">
<v-main>
<iframe
v-if="appState == AppState.Show && url"
ref="iframe"
:src="url.toString()"
frameborder="0"
class="iframe"
allow="camera; clipboard-write"
@load="addIframeStyles()"
/>
<FullscreenLoader v-else-if="appState == AppState.WaitLoad" />
<!-- Раскомментить, если появятся приложения от сторонних разработчиков -->
Expand All @@ -226,20 +239,9 @@ onMounted(async () => {
</template>

<style scoped>
.application-frame {
box-sizing: border-box;
height: 100vh;
min-height: 0;
}

@supports (height: 100dvh) {
.application-frame {
height: 100dvh;
}
}

v-main,
.iframe {
display: block;
flex: 1;
width: 100%;
height: 100%;
}
Expand Down
Loading