From 367f4236ad7767e1136c955f6016d9affce2e964 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Tue, 2 Apr 2024 08:26:58 +0800
Subject: [PATCH] fix #92

---
 src/components/form/SubscribeEditForm.vue | 70 +++++++++++------------
 src/views/subscribe/SubscribeListView.vue | 18 +++---
 2 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/src/components/form/SubscribeEditForm.vue b/src/components/form/SubscribeEditForm.vue
index 2226acac..875aca44 100644
--- a/src/components/form/SubscribeEditForm.vue
+++ b/src/components/form/SubscribeEditForm.vue
@@ -7,7 +7,7 @@ import type { Site, Subscribe } from '@/api/types'
 // 输入参数
 const props = defineProps({
   subid: Number,
-  default_config: Boolean,
+  default: Boolean,
   type: String,
 })
 
@@ -68,42 +68,41 @@ async function updateSubscribeInfo() {
 // 设置用户设置的默认订阅规则
 async function saveDefaultSubscribeConfig() {
   try {
-      let subscribe_config_url = ""
-      if (props.type == "电影") {
-        subscribe_config_url = 'system/setting/DefaultMovieSubscribeConfig'
-      } else {
-        subscribe_config_url = 'system/setting/DefaultTvSubscribeConfig'
-      }
-      const result: { [key: string]: any } = await api.post(
-        subscribe_config_url,
-        subscribeForm.value)
-      if (result.success) {
-        $toast.success(props.type + '订阅默认规则保存成功')
-      } else {
-        $toast.error(props.type + '订阅默认规则保存失败！')
-      }
-      // 通知父组件刷新
-      emit('default_config')
-    }
-    catch (error) {
-      console.log(error)
-    }
+    let subscribe_config_url = ''
+    if (props.type === '电影')
+      subscribe_config_url = 'system/setting/DefaultMovieSubscribeConfig'
+    else
+      subscribe_config_url = 'system/setting/DefaultTvSubscribeConfig'
+
+    const result: { [key: string]: any } = await api.post(
+      subscribe_config_url,
+      subscribeForm.value)
+    if (result.success)
+      $toast.success(`${props.type}订阅默认规则保存成功`)
+    else
+      $toast.error(`${props.type}订阅默认规则保存失败！`)
+
+    // 通知父组件刷新
+    emit('save')
+  }
+  catch (error) {
+    console.log(error)
+  }
 }
 
 // 查询用户设置的默认订阅规则
 async function queryDefaultSubscribeConfig() {
   try {
-    let subscribe_config_url = ""
-    if (props.type == "电影") {
+    let subscribe_config_url = ''
+    if (props.type === '电影')
       subscribe_config_url = 'system/setting/DefaultMovieSubscribeConfig'
-    } else {
+    else
       subscribe_config_url = 'system/setting/DefaultTvSubscribeConfig'
-    }
+
     const result: { [key: string]: any } = await api.get(subscribe_config_url)
 
-    if (result.data.value) {
+    if (result.data.value)
       subscribeForm.value = result.data?.value ?? ''
-    }
   }
   catch (error) {
     console.log(error)
@@ -256,13 +255,12 @@ const effectOptions = ref([
 ])
 
 watchEffect(() => {
-  if (props.subid) {
-    getSiteList()
+  getSiteList()
+  if (props.subid)
     getSubscribeInfo()
-  }
-  if (props.default_config) {
+
+  if (props.default)
     queryDefaultSubscribeConfig()
-  }
 })
 </script>
 
@@ -272,7 +270,7 @@ watchEffect(() => {
     max-width="60rem"
   >
     <VCard
-      :title="`${props.default_config ? `设置${props.type}默认订阅规则` : `编辑订阅 - ${subscribeForm.name} ${subscribeForm.season ? `第 ${subscribeForm.season} 季` : ''}`}`"
+      :title="`${props.default ? `设置${props.type}默认订阅规则` : `编辑订阅 - ${subscribeForm.name} ${subscribeForm.season ? `第 ${subscribeForm.season} 季` : ''}`}`"
       class="rounded-t"
     >
       <VCardText class="pt-2">
@@ -284,7 +282,7 @@ watchEffect(() => {
               md="8"
             >
               <VTextField
-                v-if="!props.default_config"
+                v-if="!props.default"
                 v-model="subscribeForm.keyword"
                 label="搜索关键词"
                 hint="设定搜索关键词后，将使用此关键词搜索站点资源，否则自动使用themoviedb中的名称搜索"
@@ -419,13 +417,13 @@ watchEffect(() => {
       </VCardText>
 
       <VCardActions>
-        <VBtn v-if="!props.default_config" color="error" @click="removeSubscribe">
+        <VBtn v-if="!props.default" color="error" @click="removeSubscribe">
           取消订阅
         </VBtn>
         <VSpacer />
         <VBtn
           variant="tonal"
-          @click="`${props.default_config ? saveDefaultSubscribeConfig() : updateSubscribeInfo()}`"
+          @click="`${props.default ? saveDefaultSubscribeConfig() : updateSubscribeInfo()}`"
         >
           保存
         </VBtn>
diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue
index 9c4ecb83..c4c418b4 100644
--- a/src/views/subscribe/SubscribeListView.vue
+++ b/src/views/subscribe/SubscribeListView.vue
@@ -18,9 +18,6 @@ const isRefreshed = ref(false)
 // 数据列表
 const dataList = ref<Subscribe[]>([])
 
-// 定义触发的自定义事件
-const emit = defineEmits(['default_config'])
-
 // 弹窗
 const subscribeEditDialog = ref(false)
 
@@ -97,14 +94,17 @@ const filteredDataList = computed(() => {
   </PullRefresh>
   <!-- 底部操作按钮 -->
   <span class="fixed right-5 bottom-5">
-    <VBtn icon="mdi-view-dashboard-edit" class="me-2" color="primary" size="x-large" @click="subscribeEditDialog = true" />
-  </span>
-    <!-- 订阅编辑弹窗 -->
+    <VTooltip text="设置默认订阅规则">
+      <template #activator="{ props }">
+        <VBtn v-bind="props" icon="mdi-file-document-edit" class="me-2" color="primary" size="x-large" @click="subscribeEditDialog = true" />
+      </template>
+    </vtooltip></span>
+  <!-- 订阅编辑弹窗 -->
   <SubscribeEditForm
     v-model="subscribeEditDialog"
-    :default_config=true
-    :type=props.type
-    @default_config="() => { emit('default_config');subscribeEditDialog = false; }"
+    :default="true"
+    :type="props.type"
+    @save="subscribeEditDialog = false"
     @close="subscribeEditDialog = false"
   />
 </template>