marge

package.json

@@ -1,6 +1,6 @@
 {
  "name": "moviepilot",
- "version": "2.0.0-alpha",
+ "version": "1.9.10",
  "private": true,
  "bin": "dist/service.js",
  "scripts": {
@@ -101,4 +101,4 @@
  "resolutions": {
  "postcss": "8"
  }
-}
+}

src/components/cards/SubscribeCard.vue

@@ -182,6 +182,7 @@ watch(
  'outline-dashed outline-1': props.media?.best_version && imageLoaded,
  'transition transform-cpu duration-300 scale-105 shadow-lg': hover.isHovering,
  }"
+ min-height="170"
  @click="editSubscribeDialog"
  >
  <div class="me-n3 absolute top-1 right-2">

src/components/filebrowser/FileList.vue

@@ -116,7 +116,7 @@ const transferItems = ref<FileItem[]>([])
 
 // 大小控制
 const scrollStyle = computed(() => {
- return appMode
+ return appMode.value
  ? 'height: calc(100vh - 15.5rem - env(safe-area-inset-bottom) - 3.5rem)'
  : 'height: calc(100vh - 14.5rem - env(safe-area-inset-bottom)'
 })

src/views/discover/TorrentRowListView.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import type { Context } from '@/api/types'
 import TorrentItem from '@/components/cards/TorrentItem.vue'
+import { list } from 'postcss'
 import { useDisplay } from 'vuetify'
 
 // 显示器宽度
@@ -35,6 +36,13 @@ const filterForm = reactive({
  resolution: [] as string[],
 })
 
+// 列表样式
+const listStyle = computed(() => {
+ return appMode.value
+ ? 'height: calc(100vh - 7.5rem - env(safe-area-inset-bottom) - 3.5rem)'
+ : 'height: calc(100vh - 6.5rem - env(safe-area-inset-bottom)'
+})
+
 // 排序字段
 const sortField = ref('default')
 
@@ -167,26 +175,15 @@ onMounted(() => {
  </VListItem>
  </VList>
  <VList v-if="dataList.length !== 0" lines="three" class="rounded p-0 torrent-list-vscroll shadow-lg">
- <VVirtualScroll
- :items="dataList"
- :style="
- appMode
- ? 'height: calc(100vh - 7.5rem - env(safe-area-inset-bottom) - 3.5rem)'
- : 'height: calc(100vh - 6.5rem - env(safe-area-inset-bottom)'
- "
- >
+ <VVirtualScroll :items="dataList" :style="listStyle">
  <template #default="{ item }">
  <TorrentItem :torrent="item" :key="`${item.torrent_info.page_url}`" />
  </template>
  </VVirtualScroll>
  </VList>
  </VCol>
  <VCol xl="2" md="3" v-if="display.mdAndUp.value">
- <VList
- lines="one"
- class="rounded shadow-lg"
- style="block-size: calc(100vh - 6.5rem - env(safe-area-inset-bottom))"
- >
+ <VList lines="one" class="rounded shadow-lg" :style="listStyle">
  <VListSubheader> 排序 </VListSubheader>
  <VListItem>
  <VChipGroup column v-model="sortField">

src/views/reorganize/TransferHistoryView.vue

@@ -124,6 +124,12 @@ const TransferDict: { [key: string]: string } = {
  rclone_move: 'Rclone移动',
 }
 
+const tableStyle = computed(() => {
+ return appMode.value
+ ? 'height: calc(100vh - 15.5rem - env(safe-area-inset-bottom) - 3.5rem)'
+ : 'height: calc(100vh - 14.5rem - env(safe-area-inset-bottom)'
+})
+
 // 分页提示
 const pageTip = computed(() => {
  const begin = itemsPerPage.value * (currentPage.value - 1) + 1
@@ -394,11 +400,7 @@ onMounted(fetchData)
  show-select
  loading-text="加载中..."
  hover
- :style="
- appMode
- ? 'height: calc(100vh - 15.5rem - env(safe-area-inset-bottom) - 3.5rem)'
- : 'height: calc(100vh - 14.5rem - env(safe-area-inset-bottom)'
- "
+ :style="tableStyle"
  >
  <template #item.title="{ item }">
  <div class="d-flex align-center">