Working on fix bugs.

Author: gnu4cn

src/app/home/services/book.service.ts

@@ -22,8 +22,6 @@ import {
     providedIn: 'root'
 })
 export class BookService {
-    private _list: Array<Book>;
-
     private _filter: IFilter = {
         displayRecycled: false,
         isOpened: false,
@@ -37,31 +35,24 @@ export class BookService {
         private writer: WriterService,
         private cate: CateService
     ) {
-        this.crud.getItems({table: 'Book'})
+    }
+
+    getList = async () => {
+        let list: Array<Book>;
+
+        await this.crud.getItems({table: 'Book'})
             .subscribe((res: IQueryResult) => {
                 this.opMessage.newMsg(res.message);
                 const books = res.data as Book[];
-                this._list = books.slice();
+                list = books.slice();
             });
-    }
 
-    get list () {
-        return this._list;
+        return list;
     }
 
-    bookUpdated = (book: Book) => {
-        const index = this._list.findIndex(b => b.id === book.id);
-        this._list.splice(index, 1);
-        this._list.push(book);
-    }
-
-    getList = (filter: IFilter) => {
-        return this.list.filter(b => filterFn(b, filter));
-    }
-
-    bookDeleted = (book: Book) => {
-        const index = this._list.findIndex(b => b.id === book.id);
-        this._list.splice(index, 1);
+    getFilterdList = async (filter: IFilter) => {
+        const list = await this.getList();
+        return list.filter(b => filterFn(b, filter));
     }
 
     save = async (res: IAddBookDialogResData) => {
@@ -77,16 +68,14 @@ export class BookService {
 
         newBook.website = await this.website.newWebsit(site);
         newBook.writer = await this.writer.newWriter(writerName, newBook.website);
-        newBook.cateList = await this.cate.saveList(res.cateList).slice();
+        newBook.cateList = await this.cate.saveList(res.cateList);
 
         const query: IQuery = {
             table: 'Book',
             item: newBook
         }
         this.crud.addItem(query).subscribe((res: IQueryResult) => {
             this.opMessage.newMsg(res.message);
-
-            this._list.push(res.data as Book);
         });
     }
 
@@ -102,22 +91,20 @@ export class BookService {
 
         this.crud.updateItem(query).subscribe((queryRes: IQueryResult) => {
             this.opMessage.newMsg(queryRes.message);
-            this.bookUpdated(queryRes.data as Book);
         });
     }
 
     update = async (book: Book) => {
         let query: IQuery;
 
-        book.cateList = await this.cate.saveList(book.cateList).slice();
+        book.cateList = await this.cate.saveList(book.cateList);
 
         query = {
             table: 'Book',
             item: book
         }
         this.crud.updateItem(query).subscribe((queryRes: IQueryResult) => {
             this.opMessage.newMsg(queryRes.message);
-            this.bookUpdated(queryRes.data as Book);
         });
     }
 
@@ -132,7 +119,6 @@ export class BookService {
 
             await this.crud.deleteItem(query).subscribe((queryRes: IQueryResult) => {
                 this.opMessage.newMsg(queryRes.message);
-                this.bookDeleted(res.book);
             });
 
             return 0;
@@ -153,7 +139,6 @@ export class BookService {
 
         this.crud.updateItem(query).subscribe((queryRes: IQueryResult) => {
             this.opMessage.newMsg(queryRes.message);
-            this.bookUpdated(queryRes.data as Book);
         });
     }
 }

src/app/home/services/cate.service.ts

@@ -13,28 +13,31 @@ import {
     providedIn: 'root'
 })
 export class CateService {
-    private _list: Array<Category>;
-
     constructor(
         private crud: CrudService,
         private opMessage: OpMessageService,
     ) {
-        this.crud.getItems({table: 'Category'})
+    }
+
+    getList = async () => {
+        let list: Array<Category>;
+
+        await this.crud.getItems({table: 'Category'})
             .subscribe((res: IQueryResult) => {
                 this.opMessage.newMsg(res.message);
                 const cates = res.data as Category[];
-                this._list = cates.slice();
+                list = cates.slice();
             });
-    }
 
-    get list () {
-        return this._list;
+        return list;
     }
 
-    saveList = (cateList: Array<Category>) => {
+    saveList = async (cateList: Array<Category>) => {
         const tempList: Array<Category> = [];
-        cateList.map(c => {
-            const cate = this._list.find(cate => cate.name === c.name);
+        const list = await this.getList();
+
+        await cateList.map(c => {
+            const cate = list.find(cate => cate.name === c.name);
             if (cate) tempList.push(cate);
             else {
                 const _cate = new Category();

src/app/home/services/website.service.ts

@@ -13,22 +13,30 @@ import {
     providedIn: 'root'
 })
 export class WebsiteService {
-    private _websiteList: Array<Website>;
-
     constructor(
         private crud: CrudService,
         private opMessage: OpMessageService,
     ) {
-        this.crud.getItems({table: 'Website'})
+    }
+
+    getList = async () => {
+        let list: Array<Website>;
+
+        await this.crud.getItems({table: 'Website'})
             .subscribe((res: IQueryResult) => {
                 this.opMessage.newMsg(res.message);
                 const websites = res.data as Website[];
-                this._websiteList = websites.slice();
+                list = websites.slice();
             });
+
+        return list;
+
     }
 
-    newWebsit = (uri: string) => {
-        const website = this._websiteList.find(w => w.uri === uri);
+    newWebsit = async (uri: string) => {
+        const list = await this.getList();
+
+        const website = list.find(w => w.uri === uri);
         if (website){
             return website;
         }
@@ -40,13 +48,15 @@ export class WebsiteService {
                 table: "Website",
                 item: _website
             }
-            this.crud.addItem(query).subscribe((res: IQueryResult) => {
+
+            let w: Website;
+            await this.crud.addItem(query).subscribe((res: IQueryResult) => {
                 this.opMessage.newMsg(res.message);
 
-                const website = res.data as Website;
-                this._websiteList.push(website);
-                return website;
+                w = res.data as Website;
             });
+
+            return w;
         }
     }
 }

src/app/home/services/writer.service.ts

@@ -13,26 +13,32 @@ import {
     providedIn: 'root'
 })
 export class WriterService {
-    private _writerList: Array<Writer>
-
-        constructor(
-            private crud: CrudService,
-            private opMessage: OpMessageService,
-        ) { 
-            this.crud.getItems({table: 'Writer'})
-                .subscribe((res: IQueryResult) => {
-                    this.opMessage.newMsg(res.message);
-                    const writers = res.data as Writer[];
-                    this._writerList = writers.slice();
-                });
-        }
+    constructor(
+        private crud: CrudService,
+        private opMessage: OpMessageService,
+    ) {}
+
+    getList = async () => {
+        let list: Array<Writer>;
+
+        await this.crud.getItems({table: 'Writer'})
+            .subscribe((res: IQueryResult) => {
+                this.opMessage.newMsg(res.message);
+                const writers = res.data as Writer[];
+                list = writers.slice();
+            });
 
+        return list;
+    }
+
+    newWriter = async (writerName: string, website: Website) => {
+        const list = await this.getList();
 
-    newWriter = (writerName: string, website: Website) => {
-        const writer = this._writerList.find(w => w.name === writerName);
+        const writer = list.find(w => w.name === writerName);
         if (writer){
             // 查看 website 是否在 writer 的
             if(writer.websiteList === undefined) writer.websiteList = [];
+
             const index = writer.websiteList.findIndex(w => w.uri === website.uri);
             if(index < 0) {
                 writer.websiteList.push(website);
@@ -41,10 +47,14 @@ export class WriterService {
                     table: 'Writer',
                     item: writer,
                 }
-                this.crud.updateItem(query).subscribe((res: IQueryResult) => {
+
+                let w: Writer;
+                await this.crud.updateItem(query).subscribe((res: IQueryResult) => {
                     this.opMessage.newMsg(res.message);
-                    return res.data as Writer;
+                    w = res.data as Writer;
                 });
+
+                return w;
             }
             else return writer;
         }
@@ -60,13 +70,15 @@ export class WriterService {
                 table: "Writer",
                 item: _writer
             }
-            this.crud.addItem(query).subscribe((res: IQueryResult) => {
+
+            let w: Writer;
+            await this.crud.addItem(query).subscribe((res: IQueryResult) => {
                 this.opMessage.newMsg(res.message);
 
-                const writer = res.data as Writer;
-                this._writerList.push(writer);
-                return writer;
+                w = res.data as Writer;
             });
+
+            return w;
         }
     }
 }