ref |> 调整评论弹框上面点赞需要登录问题

Signed-off-by: xugenyuan <xugenyuan@wondertek.com.cn>

@@ -48,6 +48,7 @@ export struct CommentComponent {
 
 
   // 是否在弹框中
   // 是否在弹框中
   @Provide inDialog: boolean = false
   @Provide inDialog: boolean = false
+  private dialogBeforeJumpOtherPageAction: () => void = () => {}
 
 
   // 在自定义组件即将析构销毁时将dialogControlle置空
   // 在自定义组件即将析构销毁时将dialogControlle置空
   aboutToDisappear() {
   aboutToDisappear() {
@@ -158,7 +159,8 @@ export struct CommentComponent {
     commentHeaderView({
     commentHeaderView({
       item: item,
       item: item,
       dialogController: this.dialogController,
       dialogController: this.dialogController,
-      publishCommentModel: this.publishCommentModel
+      publishCommentModel: this.publishCommentModel,
+      dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction
     })
     })
   }
   }
 
 
@@ -194,7 +196,8 @@ export struct CommentComponent {
                     ChildCommentItem({
                     ChildCommentItem({
                       item: childItem,
                       item: childItem,
                       dialogController: this.dialogController,
                       dialogController: this.dialogController,
-                      publishCommentModel: this.publishCommentModel
+                      publishCommentModel: this.publishCommentModel,
+                      dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction
                     });
                     });
                   }
                   }
                   .onClick(() => {
                   .onClick(() => {
@@ -209,7 +212,8 @@ export struct CommentComponent {
                     ChildCommentItem({
                     ChildCommentItem({
                       item: childItem,
                       item: childItem,
                       dialogController: this.dialogController,
                       dialogController: this.dialogController,
-                      publishCommentModel: this.publishCommentModel
+                      publishCommentModel: this.publishCommentModel,
+                      dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction
                     });
                     });
                   }
                   }
                   .onClick(() => {
                   .onClick(() => {
@@ -319,6 +323,7 @@ struct ChildCommentItem {
   @Consume contentDetailData: ContentDetailDTO
   @Consume contentDetailData: ContentDetailDTO
 
 
   @Consume inDialog: boolean
   @Consume inDialog: boolean
+  private dialogBeforeJumpOtherPageAction: () => void = () => {}
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -388,7 +393,8 @@ struct ChildCommentItem {
       commentFooterView({
       commentFooterView({
         item: this.item,
         item: this.item,
         dialogController: this.dialogController,
         dialogController: this.dialogController,
-        publishCommentModel: this.publishCommentModel
+        publishCommentModel: this.publishCommentModel,
+        dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction
       }).margin({ left: 95, right: 16 })
       }).margin({ left: 95, right: 16 })
     }.alignItems(HorizontalAlign.Start)
     }.alignItems(HorizontalAlign.Start)
     .width('100%')
     .width('100%')
@@ -430,7 +436,7 @@ struct ChildCommentItem {
 
 
       commentViewModel.jumpToAccountPage(this.item, () => {
       commentViewModel.jumpToAccountPage(this.item, () => {
         if (this.inDialog) {
         if (this.inDialog) {
-          PublicDialogManager.shareInstance().closeLastDialog()
+          if (this.dialogBeforeJumpOtherPageAction) { this.dialogBeforeJumpOtherPageAction() }
         }
         }
       })
       })
     })
     })
@@ -541,6 +547,7 @@ struct commentHeaderView {
   @ObjectLink item: commentItemModel
   @ObjectLink item: commentItemModel
 
 
   @Consume inDialog: boolean
   @Consume inDialog: boolean
+  private dialogBeforeJumpOtherPageAction: () => void = () => {}
 
 
   build() {
   build() {
     Column() {
     Column() {
@@ -598,7 +605,8 @@ struct commentHeaderView {
       commentFooterView({
       commentFooterView({
         item: this.item,
         item: this.item,
         dialogController: this.dialogController,
         dialogController: this.dialogController,
-        publishCommentModel: this.publishCommentModel
+        publishCommentModel: this.publishCommentModel,
+        dialogBeforeJumpOtherPageAction: this.dialogBeforeJumpOtherPageAction
       }).margin({ left: 59, right: 16 })
       }).margin({ left: 59, right: 16 })
     }.alignItems(HorizontalAlign.Start)
     }.alignItems(HorizontalAlign.Start)
     .padding({bottom: 8})
     .padding({bottom: 8})
@@ -640,7 +648,7 @@ struct commentHeaderView {
 
 
       commentViewModel.jumpToAccountPage(this.item, () => {
       commentViewModel.jumpToAccountPage(this.item, () => {
         if (this.inDialog) {
         if (this.inDialog) {
-          PublicDialogManager.shareInstance().closeLastDialog()
+          if (this.dialogBeforeJumpOtherPageAction) { this.dialogBeforeJumpOtherPageAction() }
         }
         }
       })
       })
     })
     })
@@ -676,6 +684,7 @@ struct commentFooterView {
   @ObjectLink item: commentItemModel
   @ObjectLink item: commentItemModel
 
 
   @Consume inDialog: boolean
   @Consume inDialog: boolean
+  private dialogBeforeJumpOtherPageAction: () => void = () => {}
 
 
   build() {
   build() {
     Row() {
     Row() {
@@ -748,7 +757,7 @@ struct commentFooterView {
     const user_id = HttpUtils.getUserId()
     const user_id = HttpUtils.getUserId()
     if (!user_id) {
     if (!user_id) {
       if (this.inDialog) {
       if (this.inDialog) {
-        PublicDialogManager.shareInstance().closeLastDialog()
+        if (this.dialogBeforeJumpOtherPageAction) { this.dialogBeforeJumpOtherPageAction() }
       }
       }
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return

@@ -117,7 +117,12 @@ struct CommentListDialog {
         publishCommentModel: this.publishCommentModel,
         publishCommentModel: this.publishCommentModel,
         fixedHeightMode: true,
         fixedHeightMode: true,
         inDialog: true,
         inDialog: true,
-        showTitleComponent: false
+        showTitleComponent: false,
+        dialogBeforeJumpOtherPageAction: () => {
+          if (this.onClose) {
+            this.onClose()
+          }
+        }
       }).layoutWeight(1)
       }).layoutWeight(1)
 
 
       OperRowListView({
       OperRowListView({