diff --git a/src/components/filebrowser/FileList.vue b/src/components/filebrowser/FileList.vue index 79dd98d9..fb1d5fab 100644 --- a/src/components/filebrowser/FileList.vue +++ b/src/components/filebrowser/FileList.vue @@ -15,7 +15,7 @@ import { useDisplay } from 'vuetify' const display = useDisplay() // APP -const appMode = inject('appMode') +const appMode = inject('pwaMode') && display.mdAndDown.value // 输入参数 const inProps = defineProps({ diff --git a/src/layouts/components/DefaultLayout.vue b/src/layouts/components/DefaultLayout.vue index eefe6718..919618a6 100644 --- a/src/layouts/components/DefaultLayout.vue +++ b/src/layouts/components/DefaultLayout.vue @@ -14,7 +14,7 @@ import { NavMenu } from '@/@layouts/types' import { useDisplay } from 'vuetify' const display = useDisplay() -const appMode = inject('appMode') +const appMode = inject('pwaMode') // 是否超级用户 let superUser = store.state.auth.superUser diff --git a/src/layouts/components/Footer.vue b/src/layouts/components/Footer.vue index a667fcf3..470eba10 100644 --- a/src/layouts/components/Footer.vue +++ b/src/layouts/components/Footer.vue @@ -2,7 +2,7 @@ import { useDisplay } from 'vuetify' const display = useDisplay() -const appMode = inject('appMode') && display.mdAndDown +const appMode = inject('pwaMode') && display.mdAndDown.value const route = useRoute() diff --git a/src/main.ts b/src/main.ts index 712d9468..6d5d3d43 100644 --- a/src/main.ts +++ b/src/main.ts @@ -37,8 +37,8 @@ const app = createApp(App) async function initializeApp() { try { // 是否为PWA - const appMode = await isPWA() - app.provide('appMode', appMode) + const pwaMode = await isPWA() + app.provide('pwaMode', pwaMode) // 全局设置 const globalSettings = await fetchGlobalSettings() app.provide('globalSettings', globalSettings) diff --git a/src/pages/dashboard.vue b/src/pages/dashboard.vue index 709cb55b..d798c920 100644 --- a/src/pages/dashboard.vue +++ b/src/pages/dashboard.vue @@ -8,7 +8,8 @@ import DashboardElement from '@/components/misc/DashboardElement.vue' import { useDisplay } from 'vuetify' // APP -const appMode = inject('appMode') +const display = useDisplay() +const appMode = inject('pwaMode') && display.mdAndDown.value // 从Vuex Store中获取superuser信息 const superUser = store.state.auth.superUser @@ -196,7 +197,7 @@ async function saveDashboardConfig() { const orderObj = dashboardConfigs.value.map(item => ({ id: item.id, key: item.key })) const orderString = JSON.stringify(orderObj) localStorage.setItem('MP_DASHBOARD_ORDER', orderString) - + // 是否拉升高度 localStorage.setItem('MP_DASHBOARD_ELEVATED', isElevated.value.toString()) diff --git a/src/pages/resource.vue b/src/pages/resource.vue index 6ecb71bc..3e6b4d83 100644 --- a/src/pages/resource.vue +++ b/src/pages/resource.vue @@ -7,7 +7,8 @@ import TorrentRowListView from '@/views/discover/TorrentRowListView.vue' import { useDisplay } from 'vuetify' // APP -const appMode = inject('appMode') +const display = useDisplay() +const appMode = inject('pwaMode') && display.mdAndDown.value // 路由参数 const route = useRoute() diff --git a/src/views/discover/TorrentRowListView.vue b/src/views/discover/TorrentRowListView.vue index 99b34f50..b3e218d8 100644 --- a/src/views/discover/TorrentRowListView.vue +++ b/src/views/discover/TorrentRowListView.vue @@ -8,7 +8,7 @@ import { useDisplay } from 'vuetify' const display = useDisplay() // APP -const appMode = inject('appMode') +const appMode = inject('pwaMode') && display.mdAndDown.value // 定义输入参数 const props = defineProps({ diff --git a/src/views/plugin/PluginCardListView.vue b/src/views/plugin/PluginCardListView.vue index fe6b0e54..6931b003 100644 --- a/src/views/plugin/PluginCardListView.vue +++ b/src/views/plugin/PluginCardListView.vue @@ -16,7 +16,7 @@ const route = useRoute() const display = useDisplay() // APP -const appMode = inject('appMode') +const appMode = inject('pwaMode') && display.mdAndDown.value // 当前标签 const activeTab = ref(route.query.tab) diff --git a/src/views/reorganize/TransferHistoryView.vue b/src/views/reorganize/TransferHistoryView.vue index 192dbfdc..cb75775e 100644 --- a/src/views/reorganize/TransferHistoryView.vue +++ b/src/views/reorganize/TransferHistoryView.vue @@ -11,7 +11,8 @@ import { useDisplay } from 'vuetify' import { storageDict } from '@/api/constants' // APP -const appMode = inject('appMode') +const display = useDisplay() +const appMode = inject('pwaMode') && display.mdAndDown.value // 提示框 const $toast = useToast() diff --git a/src/views/site/SiteCardListView.vue b/src/views/site/SiteCardListView.vue index 26056704..e37ac143 100644 --- a/src/views/site/SiteCardListView.vue +++ b/src/views/site/SiteCardListView.vue @@ -8,7 +8,8 @@ import SiteAddEditDialog from '@/components/dialog/SiteAddEditDialog.vue' import { useDisplay } from 'vuetify' // APP -const appMode = inject('appMode') +const display = useDisplay() +const appMode = inject('pwaMode') && display.mdAndDown.value // 站点列表 const siteList = ref([]) diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue index b9cddeb6..8036a1e4 100644 --- a/src/views/subscribe/SubscribeListView.vue +++ b/src/views/subscribe/SubscribeListView.vue @@ -10,7 +10,8 @@ import store from '@/store' import { useDisplay } from 'vuetify' // APP -const appMode = inject('appMode') +const display = useDisplay() +const appMode = inject('pwaMode') && display.mdAndDown.value // 输入参数 const props = defineProps({ diff --git a/src/views/user/UserListView.vue b/src/views/user/UserListView.vue index 2562b043..6fcb448e 100644 --- a/src/views/user/UserListView.vue +++ b/src/views/user/UserListView.vue @@ -7,7 +7,8 @@ import UserCard from '@/components/cards/UserCard.vue' import UserAddEditDialog from '@/components/dialog/UserAddEditDialog.vue' // APP -const appMode = inject('appMode') +const display = useDisplay() +const appMode = inject('pwaMode') && display.mdAndDown.value // 是否刷新过 const isRefreshed = ref(false)