From b0f28b7e7c3105981fcafd2813754ac3907692e4 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 18 Apr 2024 22:33:03 +0800
Subject: [PATCH] fix

---
 src/components/form/ImportCodeForm.vue    |  40 +--
 src/components/form/SubscribeEditForm.vue | 321 +++++++++++-----------
 src/components/misc/SubscribeHistory.vue  | 178 ++++++------
 src/views/subscribe/SubscribeListView.vue |  30 +-
 4 files changed, 288 insertions(+), 281 deletions(-)

diff --git a/src/components/form/ImportCodeForm.vue b/src/components/form/ImportCodeForm.vue
index 1346f657..bc723628 100644
--- a/src/components/form/ImportCodeForm.vue
+++ b/src/components/form/ImportCodeForm.vue
@@ -18,22 +18,28 @@ function handleImport() {
 </script>
 
 <template>
-  <VCard
-    :title="props.title"
-    class="rounded-t"
+  <VDialog
+    width="40rem"
+    scrollable
+    max-height="85vh"
   >
-    <DialogCloseBtn @click="emit('close')" />
-    <VCardText class="pt-2">
-      <VTextarea v-model="codeString" />
-    </VCardText>
-    <VCardActions>
-      <VSpacer />
-      <VBtn
-        variant="tonal"
-        @click="handleImport"
-      >
-        导入
-      </VBtn>
-    </VCardActions>
-  </VCard>
+    <VCard
+      :title="props.title"
+      class="rounded-t"
+    >
+      <DialogCloseBtn @click="emit('close')" />
+      <VCardText class="pt-2">
+        <VTextarea v-model="codeString" />
+      </VCardText>
+      <VCardActions>
+        <VSpacer />
+        <VBtn
+          variant="tonal"
+          @click="handleImport"
+        >
+          导入
+        </VBtn>
+      </VCardActions>
+    </VCard>
+  </VDialog>
 </template>
diff --git a/src/components/form/SubscribeEditForm.vue b/src/components/form/SubscribeEditForm.vue
index 04ae8167..d0708c16 100644
--- a/src/components/form/SubscribeEditForm.vue
+++ b/src/components/form/SubscribeEditForm.vue
@@ -266,164 +266,169 @@ onMounted(() => {
 </script>
 
 <template>
-  <VCard
-    :title="`${props.default ? `${props.type}默认订阅规则` : `编辑订阅 - ${subscribeForm.name} ${subscribeForm.season ? `第 ${subscribeForm.season} 季` : ''}`}`"
-    class="rounded-t"
+  <VDialog
+    scrollable
+    max-width="60rem"
   >
-    <VCardText class="pt-2">
-      <DialogCloseBtn @click="emit('close')" />
-      <VForm @submit.prevent="() => {}">
-        <VRow>
-          <VCol
-            cols="12"
-            md="8"
-          >
-            <VTextField
-              v-if="!props.default"
-              v-model="subscribeForm.keyword"
-              label="搜索关键词"
-              hint="设定搜索关键词后，将使用此关键词搜索站点资源，否则自动使用themoviedb中的名称搜索"
-            />
-          </VCol>
-          <VCol
-            v-if="subscribeForm.type === '电视剧'"
-            cols="12"
-            md="2"
-          >
-            <VTextField
-              v-model="subscribeForm.total_episode"
-              label="总集数"
-              :rules="[numberValidator]"
-              hint="设定剧集的总集数，以应对themoviedb中剧集信息未维护完整，导致提前结束订阅的情况"
-            />
-          </VCol>
-          <VCol
-            v-if="subscribeForm.type === '电视剧'"
-            cols="12"
-            md="2"
-          >
-            <VTextField
-              v-model="subscribeForm.start_episode"
-              label="开始集数"
-              :rules="[numberValidator]"
-              hint="只订阅下载此集数及之后的剧集"
-            />
-          </VCol>
-        </VRow>
-        <VRow>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSelect
-              v-model="subscribeForm.quality"
-              label="质量"
-              :items="qualityOptions"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSelect
-              v-model="subscribeForm.resolution"
-              label="分辨率"
-              :items="resolutionOptions"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSelect
-              v-model="subscribeForm.effect"
-              label="特效"
-              :items="effectOptions"
-            />
-          </VCol>
-        </VRow>
-        <VRow>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VTextField
-              v-model="subscribeForm.include"
-              label="包含（关键字、正则式）"
-              hint="支持正则表达式，多个关键字用 | 分隔表示或"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VTextField
-              v-model="subscribeForm.exclude"
-              label="排除（关键字、正则式）"
-              hint="支持正则表达式，多个关键字用 | 分隔表示或"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSelect
-              v-model="subscribeForm.sites"
-              :items="selectSitesOptions"
-              chips
-              label="订阅站点"
-              multiple
-              hint="只订阅选中的订阅站点，不选则订阅所有可订阅站点"
-            />
-          </VCol>
-        </VRow>
-        <VRow>
-          <VCol
-            cols="12"
-          >
-            <VTextField
-              v-model="subscribeForm.save_path"
-              label="保存路径"
-              hint="指定该订阅的下载保存路径，留空自动使用设定的下载目录"
-            />
-          </VCol>
-        </VRow>
-        <VRow>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSwitch
-              v-model="subscribeForm.best_version"
-              label="洗版"
-              hint="开启后不管媒体库是否存在，均会根据洗版优先级进行过滤下载，直到下载到了最高优先级的资源为止"
-            />
-          </VCol>
-          <VCol
-            cols="12"
-            md="4"
-          >
-            <VSwitch
-              v-model="subscribeForm.search_imdbid"
-              label="使用 ImdbID 搜索"
-              hint="开启后将使用 ImdbID 搜索资源，搜索结果更精确，但不是所有站点都支持"
-            />
-          </VCol>
-        </VRow>
-      </VForm>
-    </VCardText>
+    <VCard
+      :title="`${props.default ? `${props.type}默认订阅规则` : `编辑订阅 - ${subscribeForm.name} ${subscribeForm.season ? `第 ${subscribeForm.season} 季` : ''}`}`"
+      class="rounded-t"
+    >
+      <VCardText class="pt-2">
+        <DialogCloseBtn @click="emit('close')" />
+        <VForm @submit.prevent="() => {}">
+          <VRow>
+            <VCol
+              cols="12"
+              md="8"
+            >
+              <VTextField
+                v-if="!props.default"
+                v-model="subscribeForm.keyword"
+                label="搜索关键词"
+                hint="设定搜索关键词后，将使用此关键词搜索站点资源，否则自动使用themoviedb中的名称搜索"
+              />
+            </VCol>
+            <VCol
+              v-if="subscribeForm.type === '电视剧'"
+              cols="12"
+              md="2"
+            >
+              <VTextField
+                v-model="subscribeForm.total_episode"
+                label="总集数"
+                :rules="[numberValidator]"
+                hint="设定剧集的总集数，以应对themoviedb中剧集信息未维护完整，导致提前结束订阅的情况"
+              />
+            </VCol>
+            <VCol
+              v-if="subscribeForm.type === '电视剧'"
+              cols="12"
+              md="2"
+            >
+              <VTextField
+                v-model="subscribeForm.start_episode"
+                label="开始集数"
+                :rules="[numberValidator]"
+                hint="只订阅下载此集数及之后的剧集"
+              />
+            </VCol>
+          </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.quality"
+                label="质量"
+                :items="qualityOptions"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.resolution"
+                label="分辨率"
+                :items="resolutionOptions"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.effect"
+                label="特效"
+                :items="effectOptions"
+              />
+            </VCol>
+          </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VTextField
+                v-model="subscribeForm.include"
+                label="包含（关键字、正则式）"
+                hint="支持正则表达式，多个关键字用 | 分隔表示或"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VTextField
+                v-model="subscribeForm.exclude"
+                label="排除（关键字、正则式）"
+                hint="支持正则表达式，多个关键字用 | 分隔表示或"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.sites"
+                :items="selectSitesOptions"
+                chips
+                label="订阅站点"
+                multiple
+                hint="只订阅选中的订阅站点，不选则订阅所有可订阅站点"
+              />
+            </VCol>
+          </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+            >
+              <VTextField
+                v-model="subscribeForm.save_path"
+                label="保存路径"
+                hint="指定该订阅的下载保存路径，留空自动使用设定的下载目录"
+              />
+            </VCol>
+          </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSwitch
+                v-model="subscribeForm.best_version"
+                label="洗版"
+                hint="开启后不管媒体库是否存在，均会根据洗版优先级进行过滤下载，直到下载到了最高优先级的资源为止"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSwitch
+                v-model="subscribeForm.search_imdbid"
+                label="使用 ImdbID 搜索"
+                hint="开启后将使用 ImdbID 搜索资源，搜索结果更精确，但不是所有站点都支持"
+              />
+            </VCol>
+          </VRow>
+        </VForm>
+      </VCardText>
 
-    <VCardActions>
-      <VBtn v-if="!props.default" color="error" @click="removeSubscribe">
-        取消订阅
-      </VBtn>
-      <VSpacer />
-      <VBtn
-        variant="tonal"
-        @click="`${props.default ? saveDefaultSubscribeConfig() : updateSubscribeInfo()}`"
-      >
-        保存
-      </VBtn>
-    </VCardActions>
-  </VCard>
+      <VCardActions>
+        <VBtn v-if="!props.default" color="error" @click="removeSubscribe">
+          取消订阅
+        </VBtn>
+        <VSpacer />
+        <VBtn
+          variant="tonal"
+          @click="`${props.default ? saveDefaultSubscribeConfig() : updateSubscribeInfo()}`"
+        >
+          保存
+        </VBtn>
+      </VCardActions>
+    </VCard>
+  </VDialog>
 </template>
diff --git a/src/components/misc/SubscribeHistory.vue b/src/components/misc/SubscribeHistory.vue
index e71a6983..92af0b34 100644
--- a/src/components/misc/SubscribeHistory.vue
+++ b/src/components/misc/SubscribeHistory.vue
@@ -105,93 +105,99 @@ const dropdownItems = ref([
 </script>
 
 <template>
- <VCard
-    class="mx-auto"
-    width="100%"
-    :title = "props.type + '订阅历史'"
+  <VDialog
+    scrollable
+    max-width="50rem"
   >
-    <DialogCloseBtn @click="() => { emit('close') }" />
-    <div
-      v-if="!isRefreshed"
-      class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
+  <VCard
+      class="mx-auto"
+      width="100%"
+      :title = "props.type + '订阅历史'"
     >
-      <VProgressCircular
-        size="48"
-        indeterminate
-        color="primary"
-      />
-    </div>
-    <VList
-      lines="two"
-    >
-      <VInfiniteScroll
-        mode="intersect"
-        side="end"
-        :items="historyList"
-        class="overflow-hidden"
-        @load="loadHistory"
+      <DialogCloseBtn @click="() => { emit('close') }" />
+      <div
+        v-if="!isRefreshed"
+        class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
       >
-        <template #loading />
-          <template v-for="(item, i) in historyList" :key="i">
-            <VListItem>
-              <template #prepend>
-                <VImg
-                  height="75"
-                  width="50"
-                  :src="item.poster"
-                  aspect-ratio="2/3"
-                  class="object-cover rounded shadow ring-gray-500 me-3"
-                  cover
-                >
-                  <template #placeholder>
-                    <div class="w-full h-full">
-                      <VSkeletonLoader class="object-cover aspect-w-2 aspect-h-3" />
-                    </div>
-                  </template>
-                </VImg>
-              </template>
-              <VListItemTitle v-if="item.type == '电视剧'">
-                {{ item.name }} <span class="text-sm">第 {{ item.season }} 季</span>
-              </VListItemTitle>
-              <VListItemTitle v-else>
-                {{ item.name }}
-              </VListItemTitle>
-              <VListItemSubtitle class="mt-2">{{ formatDateDifference(item.date) }}</VListItemSubtitle>
-              <VListItemSubtitle class="mt-2">{{ item.description }}</VListItemSubtitle>
-              <template #append>
-                <div class="me-n3">
-                  <IconBtn>
-                    <VIcon
-                      icon="mdi-dots-vertical"
-                    />
-                    <VMenu
-                      activator="parent"
-                      close-on-content-click
-                    >
-                      <VList>
-                        <VListItem
-                          v-for="(item, i) in dropdownItems"
-                          :key="i"
-                          variant="plain"
-                          :base-color="item.color"
-                          @click="item.props.click"
-                        >
-                          <template #prepend>
-                            <VIcon :icon="item.props.prependIcon" />
-                          </template>
-                          <VListItemTitle v-text="item.title" />
-                        </VListItem>
-                      </VList>
-                    </VMenu>
-                  </IconBtn>
-                </div>
-              </template>
-            </VListItem>
-          </template>
-        </VInfiniteScroll>
-      </VList>
-    <VCardText v-if="historyList.length == 0 && isRefreshed" class="text-center">
-      没有数据
-    </VCardText>
-  </VCard>
+        <VProgressCircular
+          size="48"
+          indeterminate
+          color="primary"
+        />
+      </div>
+      <VList
+        lines="two"
+      >
+        <VInfiniteScroll
+          v-if="historyList.length > 0"
+          mode="intersect"
+          side="end"
+          :items="historyList"
+          class="overflow-hidden"
+          @load="loadHistory"
+        >
+          <template #loading />
+            <template v-for="(item, i) in historyList" :key="i">
+              <VListItem>
+                <template #prepend>
+                  <VImg
+                    height="75"
+                    width="50"
+                    :src="item.poster"
+                    aspect-ratio="2/3"
+                    class="object-cover rounded shadow ring-gray-500 me-3"
+                    cover
+                  >
+                    <template #placeholder>
+                      <div class="w-full h-full">
+                        <VSkeletonLoader class="object-cover aspect-w-2 aspect-h-3" />
+                      </div>
+                    </template>
+                  </VImg>
+                </template>
+                <VListItemTitle v-if="item.type == '电视剧'">
+                  {{ item.name }} <span class="text-sm">第 {{ item.season }} 季</span>
+                </VListItemTitle>
+                <VListItemTitle v-else>
+                  {{ item.name }}
+                </VListItemTitle>
+                <VListItemSubtitle class="mt-2">{{ formatDateDifference(item.date) }}</VListItemSubtitle>
+                <VListItemSubtitle class="mt-2">{{ item.description }}</VListItemSubtitle>
+                <template #append>
+                  <div class="me-n3">
+                    <IconBtn>
+                      <VIcon
+                        icon="mdi-dots-vertical"
+                      />
+                      <VMenu
+                        activator="parent"
+                        close-on-content-click
+                      >
+                        <VList>
+                          <VListItem
+                            v-for="(item, i) in dropdownItems"
+                            :key="i"
+                            variant="plain"
+                            :base-color="item.color"
+                            @click="item.props.click"
+                          >
+                            <template #prepend>
+                              <VIcon :icon="item.props.prependIcon" />
+                            </template>
+                            <VListItemTitle v-text="item.title" />
+                          </VListItem>
+                        </VList>
+                      </VMenu>
+                    </IconBtn>
+                  </div>
+                </template>
+              </VListItem>
+            </template>
+          </VInfiniteScroll>
+        </VList>
+      <VCardText v-if="historyList.length == 0 && isRefreshed" class="text-center">
+        没有数据
+      </VCardText>
+    </VCard>
+  </VDialog>
 </template>
diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue
index 2affe976..d1f05e3c 100644
--- a/src/views/subscribe/SubscribeListView.vue
+++ b/src/views/subscribe/SubscribeListView.vue
@@ -118,31 +118,21 @@ const filteredDataList = computed(() => {
     @click="historyDialog = true"
   />
   <!-- 订阅编辑弹窗 -->
-  <VDialog
+  <SubscribeEditForm
     v-if="subscribeEditDialog"
     v-model="subscribeEditDialog"
-    scrollable
-    max-width="60rem"
-  >
-    <SubscribeEditForm
-      :default="true"
-      :type="props.type"
-      @save="subscribeEditDialog = false"
-      @close="subscribeEditDialog = false"
-    />
-  </VDialog>
+    :default="true"
+    :type="props.type"
+    @save="subscribeEditDialog = false"
+    @close="subscribeEditDialog = false"
+  />
   <!-- 历史记录弹窗 -->
-  <VDialog
+  <SubscribeHistory   
     v-if="historyDialog"
     v-model="historyDialog"
-    scrollable
-    max-width="50rem"
-  >
-    <SubscribeHistory
-      :type="props.type"
-      @close="historyDialog = false"
-    />
-  </VDialog>
+    :type="props.type"
+    @close="historyDialog = false"
+  />
 </template>
 
 <style lang="scss">