From 7da74fcba18f138332b8a1ee1fffe2c2bb95b49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= Date: Wed, 1 Jul 2020 23:02:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=88=87=E6=8D=A2=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E7=BB=84=E4=BB=B61/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin-comment.component.html | 11 +++ .../admin-comment.component.less | 3 - .../admin-comment/admin-comment.component.ts | 96 +++++++++++-------- .../admin-comment/admin-comment.module.ts | 24 +---- 4 files changed, 69 insertions(+), 65 deletions(-) delete mode 100644 src/app/view/admin/admin-comment/admin-comment.component.less diff --git a/src/app/view/admin/admin-comment/admin-comment.component.html b/src/app/view/admin/admin-comment/admin-comment.component.html index ecd3aef..209a453 100644 --- a/src/app/view/admin/admin-comment/admin-comment.component.html +++ b/src/app/view/admin/admin-comment/admin-comment.component.html @@ -1,3 +1,4 @@ + + + + + + + {{value}} + {{value}} + diff --git a/src/app/view/admin/admin-comment/admin-comment.component.less b/src/app/view/admin/admin-comment/admin-comment.component.less deleted file mode 100644 index 35aa4ab..0000000 --- a/src/app/view/admin/admin-comment/admin-comment.component.less +++ /dev/null @@ -1,3 +0,0 @@ -td { - max-width: 300px; -} diff --git a/src/app/view/admin/admin-comment/admin-comment.component.ts b/src/app/view/admin/admin-comment/admin-comment.component.ts index ddb8ccb..8fa9c7a 100644 --- a/src/app/view/admin/admin-comment/admin-comment.component.ts +++ b/src/app/view/admin/admin-comment/admin-comment.component.ts @@ -1,99 +1,111 @@ import {Component, OnInit} from '@angular/core'; import {NzMessageService} from 'ng-zorro-antd'; import {ApiService} from '../../../api/api.service'; -import {PageList} from '../../../class/HttpReqAndResp'; +import {RequestObj} from '../../../class/HttpReqAndResp'; import {Comment, CommentReq} from '../../../class/Comment'; import {GlobalUserService} from '../../../services/global-user.service'; import {Title} from '@angular/platform-browser'; +import {Data} from '../components/common-table/data'; @Component({ selector: 'app-admin-comment', templateUrl: './admin-comment.component.html', - styleUrls: ['./admin-comment.component.less'] }) export class AdminCommentComponent implements OnInit { constructor(private apiService: ApiService, private messageService: NzMessageService, private userService: GlobalUserService, private title: Title) { this.title.setTitle('小海博客 | 评论管理') + this.request = { + // path: `/admin/comment/pagePath/${pagePath}`, + path: null, + method: 'GET', + queryParam: { + page: 1, + count: 10 + } + } this.userService.watchUserInfo({ next: data => { if (data.result) { if (data.result.role === 'admin') { - this.getComment = this.getCommentForAdmin; + this.request.path = '/admin/comment/pagePath/*' } else { - this.getComment = this.getCommentForUser; + this.request.path = '/user/comment/pagePath/*' } - } else { - this.getComment = this.getCommentForUser; } - if (this.requested) return; - this.getComment() - this.requested = true }, - error: null, - complete: null + error: () => null, + complete: () => null }) } - loading: boolean = true; - pageIndex: number = 1; - pageSize: number = 10; - pageList: PageList = new PageList(); + request: RequestObj; editInfo = { id: null, content: new CommentReq(null), editFocus: false, } - getComment: any;// 存放获取评论的方法 - private requested: boolean = false; - + headData: Data[]; ngOnInit(): void { + this.headData = [ + {fieldName: '主键', fieldValue: 'id', show: false, primaryKey: true}, + {fieldName: '评论路径', fieldValue: 'pagePath', show: true}, + {fieldName: '评论创建者昵称', fieldValue: 'fromUser.displayName', show: true}, + {fieldName: '评论接收者昵称', fieldValue: 'toUser.displayName', show: true}, + {fieldName: '评论内容', fieldValue: 'content', show: false}, + {fieldName: '评论日期', fieldValue: 'date', show: true}, + {fieldName: '父评论id', fieldValue: 'pid', show: false}, + {fieldName: '状态', fieldValue: 'status', show: true}, + { + fieldName: '操作', + fieldValue: '', + show: true, + isActionColumns: true, + action: [ + {name: '查看', click: data => console.log(data)}, + {name: '删除', color: 'red', click: data => this.deleteComment(data), needConfirm: true}, + {name: '编辑', color: '#2db7f5', click: data => this.edit(data)}, + ] + } + ]; } - // TODO:: pagePath - getCommentForAdmin = () => this.apiService.getCommentByTypeForAdmin('*', this.pageIndex, this.pageSize).subscribe({ - next: data => this.pageList = data.result, - complete: () => this.loading = false, - error: err => this.loading = false - }) + // // TODO:: pagePath + // getCommentForAdmin = () => this.apiService.getCommentByTypeForAdmin('*', this.pageIndex, this.pageSize).subscribe({ + // next: data => this.pageList = data.result, + // complete: () => this.loading = false, + // error: err => this.loading = false + // }) - getCommentForUser = () => this.apiService.getCommentByTypeForUser('*', this.pageIndex, this.pageSize).subscribe({ - next: data => this.pageList = data.result, - complete: () => this.loading = false, - error: err => this.loading = false - }) + // getCommentForUser = () => this.apiService.getCommentByTypeForUser('*', this.pageIndex, this.pageSize).subscribe({ + // next: data => this.pageList = data.result, + // complete: () => this.loading = false, + // error: err => this.loading = false + // }) - deleteComment(id: number) { - this.loading = true; - this.apiService.deleteComment(id).subscribe({ + deleteComment(data: Comment) { + this.apiService.deleteComment(data.id).subscribe({ next: () => { this.messageService.success('删除评论成功'); - this.getComment(); }, error: err => { - this.loading = false; this.messageService.error(err.msg); - }, - complete: () => this.loading = false + } }) } - edit() { - this.editInfo.editFocus = false; - this.loading = true; + edit(comment: Comment) { this.apiService.updateComment(this.editInfo.content).subscribe({ next: data => { this.messageService.success('更新评论成功'); - this.getComment(); }, error: err => { - this.loading = false; this.messageService.success(err.msg); }, - complete: () => this.loading = false + complete: () => null }) } diff --git a/src/app/view/admin/admin-comment/admin-comment.module.ts b/src/app/view/admin/admin-comment/admin-comment.module.ts index b070182..c253b84 100644 --- a/src/app/view/admin/admin-comment/admin-comment.module.ts +++ b/src/app/view/admin/admin-comment/admin-comment.module.ts @@ -2,16 +2,8 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {RouterModule} from '@angular/router'; import {AdminCommentComponent} from './admin-comment.component'; -import { - NzButtonModule, - NzCardModule, - NzDividerModule, NzIconModule, NzInputModule, - NzPopconfirmModule, - NzTableModule, - NzToolTipModule, - NzTypographyModule -} from 'ng-zorro-antd'; -import {FormsModule} from '@angular/forms'; +import {CommonTableModule} from '../components/common-table/common-table.module'; +import {NzTagModule} from 'ng-zorro-antd'; @NgModule({ @@ -21,16 +13,8 @@ import {FormsModule} from '@angular/forms'; imports: [ CommonModule, RouterModule.forChild([{path: '', component: AdminCommentComponent}]), - NzCardModule, - NzTableModule, - NzDividerModule, - NzPopconfirmModule, - NzTypographyModule, - NzToolTipModule, - NzInputModule, - FormsModule, - NzIconModule, - NzButtonModule + CommonTableModule, + NzTagModule, ] }) export class AdminCommentModule {