diff --git a/src/app/view/admin/admin-update/admin-update.component.html b/src/app/view/admin/admin-update/admin-update.component.html index 70b6f34..61c91ae 100644 --- a/src/app/view/admin/admin-update/admin-update.component.html +++ b/src/app/view/admin/admin-update/admin-update.component.html @@ -1,35 +1,8 @@ -
- - - - - 更新内容 - 更新日期 - 操作 - - - - {{data.info}} - {{data.time}} - - 编辑 - - 删除 - - - - - -
+ + + - - - diff --git a/src/app/view/admin/admin-update/admin-update.component.less b/src/app/view/admin/admin-update/admin-update.component.less deleted file mode 100644 index 35aa4ab..0000000 --- a/src/app/view/admin/admin-update/admin-update.component.less +++ /dev/null @@ -1,3 +0,0 @@ -td { - max-width: 300px; -} diff --git a/src/app/view/admin/admin-update/admin-update.component.ts b/src/app/view/admin/admin-update/admin-update.component.ts index 44e7632..a15772a 100644 --- a/src/app/view/admin/admin-update/admin-update.component.ts +++ b/src/app/view/admin/admin-update/admin-update.component.ts @@ -3,13 +3,13 @@ import {NzMessageService} from 'ng-zorro-antd'; import {Title} from '@angular/platform-browser'; import {Observable} from 'rxjs'; import {ApiService} from '../../../api/api.service'; -import {PageList, Response} from '../../../class/HttpReqAndResp'; +import {PageList, RequestObj, Response} from '../../../class/HttpReqAndResp'; import {UpdateInfo} from '../../../class/UpdateInfo'; +import {Data} from '../components/common-table/data'; @Component({ selector: 'app-admin-update', - templateUrl: './admin-update.component.html', - styleUrls: ['./admin-update.component.less'] + templateUrl: './admin-update.component.html' }) export class AdminUpdateComponent implements OnInit { @@ -17,49 +17,47 @@ export class AdminUpdateComponent implements OnInit { constructor(private apiService: ApiService, private nzMessage: NzMessageService, private title: Title) { } - pageIndex: number = 1; - pageSize: number = 10; - - pageList: PageList = new PageList(); - - loading: boolean = true; - modalData = { visible: false, content: null, id: null, title: null }; + headData: Data[]; + request: RequestObj; ngOnInit(): void { this.title.setTitle('小海博客 | 更新信息管理') - this.getUpdateInfo(); + this.headData = [ + {fieldValue: 'id', show: false, title: '主键', primaryKey: true}, + {fieldValue: 'info', show: true, title: '更新内容'}, + {fieldValue: 'time', show: true, title: '更新日期'}, + { + fieldValue: '', show: true, title: '操作', isActionColumns: true, action: [ + {name: '编辑', click: data => this.showModal(data)}, + {name: '删除', color: 'red', needConfirm: true, click: data => this.deleteUpdateInfo(data.id)} + ] + } + ]; + this.request = { + path: '/webUpdate/pages', + method: 'GET', + queryParam: { + count: 1, + page: 10, + } + } } - getUpdateInfo = () => this.apiService.webUpdatePage(this.pageSize, this.pageIndex).subscribe({ - next: data => this.pageList = data.result, - complete: () => this.loading = false, - error: err => this.loading = false - }) - deleteUpdateInfo(id) { - this.loading = true; this.apiService.deleteWebUpdateInfo(id).subscribe({ - next: data => { - this.nzMessage.success('删除成功') - this.loading = false; - this.getUpdateInfo(); - }, - error: err => { - this.nzMessage.error(err.msg) - this.loading = false - } + next: data => this.nzMessage.success('删除成功'), + error: err => this.nzMessage.error(err.msg) }) } confirm() { - this.loading = true; this.modalData.visible = false; let observable: Observable> if (this.modalData.id) { @@ -68,17 +66,9 @@ export class AdminUpdateComponent implements OnInit { observable = this.apiService.createWebUpdateInfo(this.modalData.content) } observable.subscribe({ - next: data => { - this.nzMessage.success('操作成功') - this.loading = false; - this.getUpdateInfo(); - }, - error: err => { - this.nzMessage.error(err.msg) - this.loading = false - } + next: data => this.nzMessage.success('操作成功'), + error: err => this.nzMessage.error(err.msg) }) - console.log(this.modalData); } showModal(data?: UpdateInfo) { diff --git a/src/app/view/admin/admin-update/admin-update.module.ts b/src/app/view/admin/admin-update/admin-update.module.ts index b209195..f1c5082 100644 --- a/src/app/view/admin/admin-update/admin-update.module.ts +++ b/src/app/view/admin/admin-update/admin-update.module.ts @@ -2,16 +2,10 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {RouterModule} from '@angular/router'; import {AdminUpdateComponent} from './admin-update.component'; -import { - NzButtonModule, - NzCardModule, - NzDividerModule, NzIconModule, NzInputModule, NzModalModule, - NzPopconfirmModule, - NzTableModule, - NzToolTipModule, - NzTypographyModule -} from 'ng-zorro-antd'; + import {FormsModule} from '@angular/forms'; +import {CommonTableModule} from '../components/common-table/common-table.module'; +import {NzButtonModule, NzInputModule, NzModalModule} from 'ng-zorro-antd'; @NgModule({ @@ -21,17 +15,11 @@ import {FormsModule} from '@angular/forms'; imports: [ CommonModule, RouterModule.forChild([{path: '', component: AdminUpdateComponent}]), - NzCardModule, - NzTableModule, - NzTypographyModule, - NzToolTipModule, - NzDividerModule, - NzPopconfirmModule, - NzModalModule, FormsModule, - NzButtonModule, + CommonTableModule, + NzModalModule, NzInputModule, - NzIconModule + NzButtonModule ] }) export class AdminUpdateModule {