Skip to content

fix(frame): 修复内嵌网页不能正常显示的问题 #851

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
uyarn merged 2 commits into from
Jun 15, 2025
Merged

fix(frame): 修复内嵌网页不能正常显示的问题 #851

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
f7b3d2e
fix(frame): 修复内嵌网页不能正常显示的问题
timi137137 Jun 14, 2025
dca3666
chore(deps): 重新配置lock文件
timi137137 Jun 14, 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
105 changes: 44 additions & 61 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 18 additions & 8 deletions src/layouts/components/Content.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,23 @@
<template>
<router-view v-if="!isRefreshing" v-slot="{ Component }">
<transition name="fade" mode="out-in">
<keep-alive :include="aliveViews">
<component :is="Component" />
</keep-alive>
</transition>
</router-view>
<frame-page />
<div v-if="!isRefreshing">
<router-view v-if="!isFramePage" v-slot="{ Component }">
<transition name="fade" mode="out-in">
<keep-alive :include="aliveViews">
<component :is="Component" />
</keep-alive>
</transition>
</router-view>
<frame-page v-else />
</div>

<t-loading v-else />
</template>
<script setup lang="ts">
import isBoolean from 'lodash/isBoolean';
import isUndefined from 'lodash/isUndefined';
import type { ComputedRef } from 'vue';
import { computed } from 'vue';
import { useRoute } from 'vue-router';

import FramePage from '@/layouts/frame/index.vue';
import { useTabsRouterStore } from '@/store';
Expand Down Expand Up @@ -46,6 +51,11 @@ const isRefreshing = computed(() => {
const { refreshing } = tabsRouterStore;
return refreshing;
});

const route = useRoute(); // 这个不能放到computed中，切换页面时会导致被缓存
const isFramePage = computed(() => {
return !!route.meta?.frameSrc;
});
</script>
<style lang="less" scoped>
.fade-leave-active,
Expand Down