From 43a6ddf4c040d0f7b9daabc8a779ba66f665e727 Mon Sep 17 00:00:00 2001
From: Aresn <admin@aresn.com>
Date: Fri, 31 May 2024 11:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/i/library/Select.vue     |  9 +++------
 composables/useCollectionRequest.js | 17 ++---------------
 pages/library/[id].vue              | 12 +++++-------
 pages/library/index.vue             | 13 ++++---------
 stores/library.js                   | 11 ++++++++++-
 5 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/components/i/library/Select.vue b/components/i/library/Select.vue
index ae9104d..dea5e52 100644
--- a/components/i/library/Select.vue
+++ b/components/i/library/Select.vue
@@ -50,8 +50,8 @@
 </template>
 <script setup>
 const { $isLibrarySelectOpen, $selectCollectionId, $selectThreadId } = storeToRefs(useLibraryStore())
-const { $openLibrarySelect, $closeLibrarySelect, $openLibraryCreate, $setSelectCollectionId } = useLibraryStore()
-const { getCollection, saveCollection, deleteCollectionRecord } = useCollectionRequest()
+const { $openLibrarySelect, $closeLibrarySelect, $openLibraryCreate, $setSelectCollectionId, $getCollection } = useLibraryStore()
+const { saveCollection, deleteCollectionRecord } = useCollectionRequest()
 // 合集列表
 const collection = ref([])
 const selected = ref([])
@@ -66,9 +66,6 @@ function handleOpenCreate () {
     handleClose()
     $openLibraryCreate()
 }
-async function getCollectionData () {
-    collection.value = await getCollection()    
-}
 async function handleSelected(id) {
     selected.value = [id]
 }
@@ -94,6 +91,6 @@ async function handleSave() {
 }
 watch(() => $isLibrarySelectOpen.value, () => {
     selected.value = [...$selectCollectionId.value]
-    getCollectionData()
+    $getCollection()
 })
 </script>
diff --git a/composables/useCollectionRequest.js b/composables/useCollectionRequest.js
index 0558317..cf43a34 100644
--- a/composables/useCollectionRequest.js
+++ b/composables/useCollectionRequest.js
@@ -14,16 +14,6 @@ export default () => {
         })
         return { data, error }
     }
-    // 合集列表
-    const getCollection = async () => {
-        const { data, error } = await useRequest('/v1/collection/list', { 
-            method: 'get'
-        })
-        if (error.value) {
-            return []
-        }
-        return data.value.data || []
-    }
     // 删除收藏夹
     const deleteCollection = async (collection_id) => {
         const {data, error} = await useRequest(`/v1/collection/${collection_id}/remove`, {
@@ -43,7 +33,7 @@ export default () => {
     }
     // 查询收藏夹会话列表
     const findCollection = async (collection_id) => {
-        const {data, error} = await useRequest(`/v1/collection/${collection_id}/items`, { method: 'get' })
+        const {data, error} = await useRequest(`/v1/collection/${collection_id}/items`)
         if (error.value) {
             return []
         }
@@ -59,13 +49,10 @@ export default () => {
     }
     // 查询会话是否被收藏
     const findRecordCollection = async (c_id) => {
-        const {data, error} = await useRequest(`/v1/collection/item/check/${c_id}`, {
-            method: 'get'
-        })
+        const {data, error} = await useRequest(`/v1/collection/item/check/${c_id}`)
         return { data, error }
     }
     return {
-        getCollection,
         setOrUpdateCollection,
         deleteCollection,
         saveCollection,
diff --git a/pages/library/[id].vue b/pages/library/[id].vue
index 00e3f40..e6938c1 100644
--- a/pages/library/[id].vue
+++ b/pages/library/[id].vue
@@ -19,13 +19,14 @@
 </template>
 <script setup>
 const route = useRoute()
-const { findCollection, getCollection } = useCollectionRequest()
+const { findCollection } = useCollectionRequest()
+const { $collection } = storeToRefs(useLibraryStore())
+const { $getCollection } = useLibraryStore()
 const state = reactive({
     id: Number(route.params.id)
 })
 const themesTagList = ref([])
-const collection = ref([])
-const currentCollect = computed(() => collection.value.find(i => i.id === state.id))
+const currentCollect = computed(() => $collection.value.find(i => i.id === state.id))
 async function findCollectionData() {
     const data = await findCollection(state.id)
     themesTagList.value = data.map(item => {
@@ -36,8 +37,5 @@ async function findCollectionData() {
     })
 }
 await findCollectionData()
-async function getCollectionData () {
-    collection.value = await getCollection()
-}
-await getCollectionData()
+await $getCollection()
 </script>
\ No newline at end of file
diff --git a/pages/library/index.vue b/pages/library/index.vue
index 175b859..6a97bc2 100644
--- a/pages/library/index.vue
+++ b/pages/library/index.vue
@@ -26,7 +26,7 @@
                     </div>
                     <div class="flex flex-col gap-4 mt-4">
                         <ILibraryCollect
-                            v-for="item in collection"
+                            v-for="item in $collection"
                             :item="item"
                             :key="item.id"
                         />
@@ -37,23 +37,18 @@
     </div>
 </template>
 <script setup>
-const { $openLibraryCreate } = useLibraryStore()
-const { getCollection } = useCollectionRequest()
+const { $collection } = storeToRefs(useLibraryStore())
+const { $openLibraryCreate, $getCollection } = useLibraryStore()
 const { getThreadsList } = useLibraryRequest()
 
 function handleOpenCreateLibrary () {
     $openLibraryCreate()
 }
-// 合集列表
-const collection = ref([])
 // 主题列表
 const threads = ref([])
-async function getCollectionData () {
-    collection.value = await getCollection()    
-}
 async function getThreadData() {
     threads.value  = await getThreadsList()
 }
 await getThreadData()
-await getCollectionData()
+await $getCollection()
 </script>
diff --git a/stores/library.js b/stores/library.js
index 982c9f6..30d1cdf 100644
--- a/stores/library.js
+++ b/stores/library.js
@@ -6,6 +6,8 @@ export const useLibraryStore = defineStore('library', () => {
     const $selectThreadId = ref('')
     const $selectCollectionId = ref([])
 
+    const $collection = ref([])
+
     function $openLibraryCreate () {
         $isLibraryCreateOpen.value = true
     }
@@ -23,6 +25,11 @@ export const useLibraryStore = defineStore('library', () => {
     function $setSelectCollectionId (ids) {
         $selectCollectionId.value = ids
     }
+
+    async function $getCollection () {
+        const { data } = await useRequest('/v1/collection/list')
+        $collection.value = data.value.data
+    }
     return {
         $selectThreadId,
         $isLibraryCreateOpen,
@@ -32,6 +39,8 @@ export const useLibraryStore = defineStore('library', () => {
         $openLibrarySelect,
         $closeLibrarySelect,
         $selectCollectionId,
-        $setSelectCollectionId
+        $setSelectCollectionId,
+        $collection,
+        $getCollection
     }
 })
-- 
GitLab