Merge pull request #284 from mgz0227/cat_dev

订阅源-收藏-取消重命名、删除功能
mgz0227 · Dec 3, 2024 · f9a1f3c · f9a1f3c
2 parents 840639c + 1df5caa
commit f9a1f3c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/entry/src/main/ets/componets/import/SubscriptionImport.ets b/entry/src/main/ets/componets/import/SubscriptionImport.ets
@@ -239,7 +239,7 @@ export default struct SubscriptionImport {
             await SubscriptionDao.batchInsert(insertRssSources)
             this.show = false;
             this.resetState()
-            showMessage('添加成功')
+            showMessage('导入成功')
           })
       }
       .backgroundColor(Color.White)

diff --git a/entry/src/main/ets/pages/view/Subscription/components/SubscriptionContent.ets b/entry/src/main/ets/pages/view/Subscription/components/SubscriptionContent.ets
@@ -82,7 +82,7 @@ export default struct SubscriptionContent{
               this.rightDialogBuilder(this.Item_Right_Dialog_Data, async (index: number) => {
                 switch (index) {
                   case 0:
-                    showMessage('编辑')
+                    showMessage('重命名')
                     break
                   case 1:
                     showMessage('置顶')
@@ -314,6 +314,13 @@ export default struct SubscriptionContent{
   }
 
   Item_Right_Dialog_Data: IconTitleVo[] = [
+    new IconTitleVo($r('app.media.ic_public_edit'), '重命名'),
+    new IconTitleVo($r('app.media.icon_operate_top'), '置顶'),
+    new IconTitleVo($r('app.media.icon_operate_move'), '移动至'),
+    new IconTitleVo($r('app.media.delete_svg'), '删除'),
+  ]
+
+  Item_Dialog_Data: IconTitleVo[] = [
     new IconTitleVo($r('app.media.ic_public_edit'), '编辑'),
     new IconTitleVo($r('app.media.icon_operate_top'), '置顶'),
     new IconTitleVo($r('app.media.icon_operate_move'), '移动至'),
@@ -327,7 +334,7 @@ export default struct SubscriptionContent{
       GridRow({
         columns:4
       }){
-       ForEach(this.Item_Right_Dialog_Data,(item:IconTitleVo,index:number)=>{
+       ForEach(this.Item_Dialog_Data,(item:IconTitleVo,index:number)=>{
          GridCol(){
            CircleIcon({
              item:item
@@ -414,7 +421,7 @@ export default struct SubscriptionContent{
       direction:FlexDirection.Column
     }){
       ForEach(list, (item: IconTitleVo, index) => {
-        if (!(this.subscriptionTitle === '收藏' && item.title === '删除')){
+        if (this.subscriptionTitle.indexOf('收藏') === -1){
           dialogTitleFuction({
             title: item.title,
             icon: item.icon,
@@ -423,6 +430,17 @@ export default struct SubscriptionContent{
             .onClick(() => {
               dialogRightChange(index)
             })
+        } else {
+          if (item.title !== '重命名' && item.title !== '删除') {
+            dialogTitleFuction({
+              title: item.title,
+              icon: item.icon,
+              isBorder: list.length !== index + 1
+            })
+              .onClick(() => {
+                dialogRightChange(index)
+              })
+          }
         }
 
       })