fix(web): connectStatus not change when connected backend abort connection; fix relative URL parse; fix loadWebCatalog ElMessage bug

modules/web/src/store/bookStore.ts

@@ -29,9 +29,6 @@ let webReadConfigLoadedDate: Date | undefined
 export const useBookStore = defineStore('book', {
   state: () => {
     return {
-      connectStatus: '正在连接后端服务器……',
-      connectType: 'primary' as 'primary' | 'success' | 'danger',
-      newConnect: true,
       searchBooks: [] as SeachBook[],
       shelf: [] as Book[],
       catalog: [] as BookChapter[],
@@ -69,15 +66,6 @@ export const useBookStore = defineStore('book', {
     isNight: state => state.config.theme == 6,
   },
   actions: {
-    setConnectStatus(connectStatus: string) {
-      this.connectStatus = connectStatus
-    },
-    setConnectType(connectType: 'primary' | 'success' | 'danger') {
-      this.connectType = connectType
-    },
-    setNewConnect(newConnect: boolean) {
-      this.newConnect = newConnect
-    },
     /** 从后端加载书架书籍，优先返回内存缓存 */
     async loadBookShelf(): Promise<Book[]> {
       const fetchBookshellf_promise = API.getBookShelf().then(resp => {
@@ -116,16 +104,13 @@ export const useBookStore = defineStore('book', {
         return await fetchBookshellf_promise
       }
     },
-    clearBooks() {
-      this.shelf = []
-    },
     /** 从后端加载书籍目录，优先返回内存缓存 */
     async loadWebCatalog(
       book: typeof this.readingBook,
     ): Promise<BookChapter[]> {
       const { bookUrl, name, chapterIndex } = book
       const fetchChapterList_promise = API.getChapterList(
-        book.bookUrl as string,
+        bookUrl as string,
       ).then(res => {
         const { isSuccess, data, errorMsg } = res.data
         if (isSuccess === false) {
@@ -133,13 +118,14 @@ export const useBookStore = defineStore('book', {
           throw new Error()
         }
         if (
+          bookUrl === this.readingBook.bookUrl &&
           data.length !== this.catalog.length &&
           data.length > 0 &&
           this.catalog.length > 0
         ) {
           ElMessage.info(`书籍${name}: 章节目录已更新`)
         }
-        this.setCatalog(data)
+        this.catalog = data
         console.log(`书籍${name}: 章节目录已更新`)
         return this.catalog
       })
@@ -155,9 +141,6 @@ export const useBookStore = defineStore('book', {
         return await fetchChapterList_promise
       }
     },
-    setCatalog(catalog: BookChapter[]) {
-      this.catalog = catalog
-    },
     setPopCataVisible(visible: boolean) {
       this.popCataVisible = visible
     },

modules/web/src/store/connectionStore.ts

@@ -0,0 +1,24 @@
+import { defineStore } from 'pinia'
+
+export const useConnectionStore = defineStore('connection', {
+  state: () => {
+    return {
+      connectStatus: '正在连接后端服务器……',
+      connectType: 'primary' as 'primary' | 'success' | 'danger',
+      newConnect: false,
+    }
+  },
+  actions: {
+    setConnectStatus(connectStatus: string) {
+      if (this.newConnect === true) return
+      this.connectStatus = connectStatus
+    },
+    setConnectType(connectType: 'primary' | 'success' | 'danger') {
+      if (this.newConnect === true) return
+      this.connectType = connectType
+    },
+    setNewConnect(newConnect: boolean) {
+      this.newConnect = newConnect
+    },
+  },
+})

modules/web/src/store/index.ts

@@ -2,4 +2,5 @@ import { createPinia } from 'pinia'
 
 export * from './bookStore'
 export * from './sourceStore'
+export * from './connectionStore'
 export default createPinia()