Merge pull request #239 from mgz0227/dev_2008

MaoXiaoone · web-flow · commit cd4f08beebca · 2024-08-03T21:06:14.000+08:00
管理页面支持分组下的书籍添加到书单中
diff --git a/entry/src/main/ets/common/constants/CommonConstants.ets b/entry/src/main/ets/common/constants/CommonConstants.ets
@@ -235,6 +235,7 @@ export default class CommonConstants {
   static readonly HAS_EXPLORE_URL:string = 'HAS_EXPLORE_URL'
   static readonly BOOK_IS_BOOK_REFRESHING:string = 'BOOK_IS_BOOK_REFRESHING'
   static readonly BOOK_IS_BOOK_GROUPS_REFRESHING:string = 'BOOK_IS_BOOK_GROUPS_REFRESHING'
+  static readonly BOOK_IS_BOOK_WORKS_BOOK_LIST:string = 'BOOK_IS_BOOK_WORKS_BOOK_LIST'
   // 订阅源分组数据
   //分组是否初始化key
   static readonly RSS_SOURCES_GROUP_INIT:string = 'RSS_SOURCES_GROUP_INIT'
diff --git a/entry/src/main/ets/common/utils/bookGroupUtils.ets b/entry/src/main/ets/common/utils/bookGroupUtils.ets
@@ -98,6 +98,11 @@ class bookGroupUtils{
   updateMoveGroupBookIds(data:Record<number, number>){
     BookGroupsDao.updateMoveBookIdsByGroupId(data)
   }
+  //根据分组获取分组下的书籍Id
+  async queryBookByGroupId(groupId:number|number[]){
+    let Ids:number[] = toolsUtils.numberArrays(groupId)
+    return await BookGroupsDao.queryBookByGroup(Ids)
+  }
 }
 let bookGroupUtil = new bookGroupUtils();
 export default bookGroupUtil as bookGroupUtils;
diff --git a/entry/src/main/ets/database/dao/BookGroupsDao.ets b/entry/src/main/ets/database/dao/BookGroupsDao.ets
@@ -338,6 +338,33 @@ class BookGroupsDao{
       return false
     }
   }
+  /**
+   * 分组id查询分组下的书籍Id然后去重
+   * @param ids
+   */
+  async queryBookByGroup(ids:number[]){
+    try {
+      const column: ColumnInfo[] = AppDatabaseUtil.getColumn(this.TABLE_NAME);
+      const predicates = DbUtil.getPredicates(this.TABLE_NAME);
+      const validIds = ids.filter(id => typeof id === 'number');
+      predicates.in('groupId', validIds);
+      const groups = await DbUtil.queryForList<BookGroupDb>(predicates, column);
+      const bookIds:number[] = []
+      if (groups.length > 0) {
+        groups.forEach((item) => {
+          ToBookGroups(item).bookIds?.forEach((bookId) => {
+            if (!bookIds.includes(Number(bookId))) {
+              bookIds.push(Number(bookId))
+            }
+          })
+        })
+      }
+      return bookIds
+    } catch (e){
+      console.log('queryBookByGroup, Error, ', JSON.stringify(e))
+      return []
+    }
+  }
 
 }
 
diff --git a/entry/src/main/ets/pages/view/bookShelf/Manage/BookManagePage.ets b/entry/src/main/ets/pages/view/bookShelf/Manage/BookManagePage.ets
@@ -42,7 +42,6 @@ struct BookManagePage {
   @StorageLink('topRectHeight') topRectHeight: number = 0
   @StorageLink('bottomRectHeight') bottomRectHeight: number = 0
   @State isAddShelfShow:boolean = false
-  tabsController: TabsController = new TabsController();
   @State topTitle:string = '置顶'
   @State bookList:Books[] = []
   @State @Watch('listenCheckList')checkLists: Record<number, boolean> = {}
@@ -122,7 +121,6 @@ struct BookManagePage {
     } else if (this.bookTypeNumber === 5){
       this.getWorkLists()
       this.isMoveStatus = 2
-      // this.getBookList() //todo 获取书单
     } else {
       this.getBookList()
       this.isMoveStatus = 0
@@ -131,6 +129,7 @@ struct BookManagePage {
 
   @State isCatalogAddShelf:boolean = false
   @State showNumber:number = 0
+  @State bookOrFolder:number = 0
   build() {
     Column(){
       Header({
@@ -144,35 +143,27 @@ struct BookManagePage {
       })
         .visibility(this.showNumber === 0?Visibility.Visible:Visibility.None)
         .opacity(this.showNumber === 0?1:0)
-      Tabs({
-        index:this.showNumber,
-        controller: this.tabsController
-      }){
-       TabContent(){
-         this.bookManage()
-       }
-       TabContent(){
-         newBookShelf({
-           currentIndex:this.currentIndex,
-           changeShowNumber:(index:number)=>{
-             this.showNumber = index
-             this.refreshData()
-           },
-           bookIds:this.checkListNumber
-         })
-       }
-       .padding({
-         top:this.topRectHeight
-       })
+      // Tabs({
+      //   index:this.showNumber,
+      //   controller: this.tabsController
+      // }){
+      //  TabContent(){
+      //
+      //  }
+      // }
+      // .backgroundColor(Color.White)
+      // .barWidth(0)
+      // .barHeight(0)
+      // .layoutWeight(1)
+      // .scrollable(false)
+      // .onChange((index: number) => {
+      //   this.showNumber = index
+      // })
+      Column(){
+        this.bookManage()
       }
-      .backgroundColor(Color.White)
-      .barWidth(0)
-      .barHeight(0)
       .layoutWeight(1)
-      .scrollable(false)
-      .onChange((index: number) => {
-        this.showNumber = index
-      })
+      .backgroundColor(Color.White)
       Flex()
         .bindSheet($$this.isCatalogAddShelf, this.dialogCatalogAddShelf(), {
           height:400,
@@ -182,6 +173,13 @@ struct BookManagePage {
             this.isCatalogAddShelf = false
           }
         })
+      Flex()
+        .bindContentCover($$this.isShowEditBook, this.showEditBook(), {
+          modalTransition: ModalTransition.DEFAULT,
+          onDisappear: () => {
+            this.isShowEditBook = false;
+          }
+        })
     }
     .margin({
       bottom:this.bottomRectHeight
@@ -241,6 +239,28 @@ struct BookManagePage {
       }.backgroundColor(Color.White)
     }
   }
+  //新建书单弹出
+  @State isShowEditBook:boolean = false
+  @Builder showEditBook(){
+    Column(){
+      newBookShelf({
+        currentIndex:this.currentIndex,
+        changeShowNumber:(index:number)=>{
+          this.showNumber = index
+          this.isShowEditBook = false
+          this.refreshData()
+        },
+        bookIds:this.checkListNumber,
+        bookOrFolder:this.bookOrFolder
+      })
+    }
+    .padding({
+      top:this.topRectHeight,
+      bottom:this.bottomRectHeight
+    })
+    .backgroundColor(Color.White)
+  }
+
   //书单弹窗
   @Builder dialogCatalogAddShelf(){
     Column(){
@@ -251,7 +271,7 @@ struct BookManagePage {
         changeShowNumber:(val:number)=>{
           this.showNumber = val
           this.isCatalogAddShelf = false
-
+          this.isShowEditBook = true
         },
         currentIndex:this.currentIndex
       })
@@ -418,6 +438,11 @@ struct BookManagePage {
         this.bookMoveGroup?.open(); break;
       case 3 :
         this.isCatalogAddShelf = true
+        if (this.bookTypeNumber === 1) {
+          this.bookOrFolder = 1
+        } else {
+          this.bookOrFolder = 0
+        }
         this.dataCheckList();
         break;
       case 4 :
diff --git a/entry/src/main/ets/pages/view/bookShelf/Manage/bookManage/newBookShelf.ets b/entry/src/main/ets/pages/view/bookShelf/Manage/bookManage/newBookShelf.ets
@@ -3,6 +3,7 @@
  */
 import CommonConstants from '../../../../../common/constants/CommonConstants'
 import PaddingConstants from '../../../../../common/constants/PaddingConstants'
+import bookGroupUtil from '../../../../../common/utils/bookGroupUtils'
 import worksListsUtils from '../../../../../common/utils/WorksListsUtils'
 import confirmDialogExample from '../../../../../componets/common/confirmDialog'
 import { showMessage } from '../../../../../componets/common/promptShow'
@@ -22,6 +23,8 @@ export default struct newBookShelf{
   @Prop bookIds:number[] = []
   @State  @Watch('changeBookIds')newBookIds:number[] = []
   @State isShowAddBook:boolean = false
+  //默认0为书籍 1为分组
+  @Prop bookOrFolder:number = 0
   changeShowNumber:Function = (_index:number)=>{
 
   }
@@ -31,22 +34,31 @@ export default struct newBookShelf{
   changeBookIds(){
     this.getBookIds()
   }
-  aboutToAppear(): void {
-    if (this.workBookListStatus === 0) {
-      this.newBookIds = this.bookIds
-    } else {
-      this.workBookList = this.lastWorkBookList
-      if (this.workBookList.worksBookList) {
-        //初始推荐理由
-        this.workBookList.worksBookList.forEach((item: WorksBookList) => {
-          if (item.bookId) {
-            this.TextRecommend[item.bookId] = item.recommend ?? '';
+
+  async aboutToAppear(): Promise<void> {
+    if (this.bookOrFolder === 1){
+     let bookId =  await bookGroupUtil.queryBookByGroupId(this.bookIds)
+      if (bookId.length) {
+        this.newBookIds = bookId
+      }
+    }
+    if (this.bookOrFolder === 0) {
+      if (this.workBookListStatus === 0) {
+        this.newBookIds = this.bookIds
+      } else {
+        this.workBookList = this.lastWorkBookList
+        if (this.workBookList.worksBookList) {
+          //初始推荐理由
+          this.workBookList.worksBookList.forEach((item: WorksBookList) => {
+            if (item.bookId) {
+              this.TextRecommend[item.bookId] = item.recommend ?? '';
+            }
+          })
+          //初始书籍
+          let bookIds = worksListsUtils.getBookIds(this.workBookList.worksBookList).toString()
+          if (bookIds.length) {
+            this.newBookIds = bookIds.split(',').map(Number);
           }
-        })
-        //初始书籍
-        let bookIds = worksListsUtils.getBookIds(this.workBookList.worksBookList).toString()
-        if (bookIds.length) {
-          this.newBookIds = bookIds.split(',').map(Number);
         }
       }
     }
diff --git a/entry/src/main/ets/pages/view/bookShelf/Manage/components/catalogAddShelf.ets b/entry/src/main/ets/pages/view/bookShelf/Manage/components/catalogAddShelf.ets
@@ -3,7 +3,6 @@
  * @datetime 2024/7/26 20:35
  * @className: catalogAddShelf
  * 加入书单弹窗
- * todo 书单功能db暂未实现
  */
 import CommonConstants from '../../../../../common/constants/CommonConstants'
 import buttonCommon from '../../../../../componets/common/buttonCommon'
diff --git a/entry/src/main/ets/pages/view/bookShelf/Shelf/WorksBookLists.ets b/entry/src/main/ets/pages/view/bookShelf/Shelf/WorksBookLists.ets
@@ -20,6 +20,7 @@ export default struct WorksBookLists {
   @State worksBook:WorksLists = new WorksLists()
   @StorageLink('topRectHeight') topRectHeight: number = 0
   @StorageLink('bottomRectHeight') bottomRectHeight: number = 0
+  @StorageLink('BOOK_IS_BOOK_WORKS_BOOK_LIST') @Watch('getWorkLists')isWorksBookListRefreshing: number = 0
   aboutToAppear(): void {
     if (this.worksLists.length === 0) {
       this.getWorkLists()
diff --git a/entry/src/main/ets/pages/view/bookShelf/components/BookContentRefresh.ets b/entry/src/main/ets/pages/view/bookShelf/components/BookContentRefresh.ets
@@ -13,6 +13,7 @@ export default struct BookContentRefresh {
   @State @Watch('changeRefreshing')isRefreshing: boolean = false
   @StorageLink('BOOK_IS_BOOK_REFRESHING') isBookRefreshing: number = 0
   @StorageLink('BOOK_IS_BOOK_GROUPS_REFRESHING') isGroupRefreshing: number = 0
+  @StorageLink('BOOK_IS_BOOK_WORKS_BOOK_LIST') isWorksBookListRefreshing: number = 0
   @State counter: number = 0
   @State RefreshingTitle: string = '松开刷新'
   @Prop currentIndex: number = 0
@@ -23,8 +24,17 @@ export default struct BookContentRefresh {
   @State checkGroup:Record<number, boolean> = {}
   changeRefreshing(){
     if (this.isRefreshing) {
-      this.isBookRefreshing++
-      this.isGroupRefreshing++
+      switch (this.bookTypeNumber){
+        case 1:
+          this.isGroupRefreshing++
+          break;
+        case 5:
+          this.isWorksBookListRefreshing++
+          break;
+        default:
+          this.isBookRefreshing++
+          break
+      }
     }
   }
   build() {
diff --git a/entry/src/main/ets/pages/view/bookShelf/components/dialog/BookManageDialog.ets b/entry/src/main/ets/pages/view/bookShelf/components/dialog/BookManageDialog.ets
diff --git a/entry/src/main/ets/storage/bookListData.ets b/entry/src/main/ets/storage/bookListData.ets

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,11 @@ class bookGroupUtils{`
`98`	`98`	`updateMoveGroupBookIds(data:Record<number, number>){`
`99`	`99`	`BookGroupsDao.updateMoveBookIdsByGroupId(data)`
`100`	`100`	`}`
	`101`	`+ //根据分组获取分组下的书籍Id`
	`102`	`+ async queryBookByGroupId(groupId:number\|number[]){`
	`103`	`+ let Ids:number[] = toolsUtils.numberArrays(groupId)`
	`104`	`+ return await BookGroupsDao.queryBookByGroup(Ids)`
	`105`	`+ }`
`101`	`106`	`}`
`102`	`107`	`let bookGroupUtil = new bookGroupUtils();`
`103`	`108`	`export default bookGroupUtil as bookGroupUtils;`