From e66d3bbf62352c7e24463058807bdddf0b20487a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Wed, 27 May 2020 16:41:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=B7=E6=96=B0=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/admin/admin-link/admin-link.component.html  |  6 +++++-
 .../view/admin/admin-tag/admin-tag.component.html    | 11 ++++++++---
 src/app/view/admin/admin-tag/admin-tag.component.ts  | 12 +++++++++++-
 .../admin/admin-update/admin-update.component.html   |  5 ++++-
 .../view/admin/admin-update/admin-update.module.ts   |  5 +++--
 .../view/admin/admin-user/admin-user.component.html  |  7 ++++++-
 .../admin/admin-visitor/admin-visitor.component.html |  5 ++++-
 .../view/admin/admin-visitor/admin-visitor.module.ts |  5 +++--
 src/app/view/admin/admin.component.ts                |  1 -
 9 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/app/view/admin/admin-link/admin-link.component.html b/src/app/view/admin/admin-link/admin-link.component.html
index 08eef0c..ff5ff8d 100644
--- a/src/app/view/admin/admin-link/admin-link.component.html
+++ b/src/app/view/admin/admin-link/admin-link.component.html
@@ -1,5 +1,5 @@
 <div class="inner-content">
-    <nz-card nzTitle="友链管理" nzSize="small">
+    <nz-card nzTitle="友链管理" nzSize="small" [nzExtra]="reload">
         <button nz-button (click)="addLink()" style="margin-bottom: 15px">新增</button>
         <nz-table #table [nzData]="pageList.list" [nzTotal]="pageList.total" [(nzPageIndex)]="pageIndex"
                   [nzPageSize]="pageSize" [nzLoading]="loading"  [nzScroll]="{x:'1200px'}"
@@ -29,6 +29,10 @@
     </nz-card>
 </div>
 
+<ng-template #reload>
+    <a (click)="getLinks()" title="刷新"><i nz-icon nzType="reload" nzTheme="outline"></i></a>
+</ng-template>
+
 <nz-modal [(nzVisible)]="modalVisible" [nzTitle]="modalTitle" (nzOnOk)="modalConfirm()"
           (nzOnCancel)="modalVisible = false" [nzClosable]="true" [nzOkDisabled]="!formGroup.valid">
     <form nz-form [formGroup]="formGroup">
diff --git a/src/app/view/admin/admin-tag/admin-tag.component.html b/src/app/view/admin/admin-tag/admin-tag.component.html
index 5291bf6..51ce956 100644
--- a/src/app/view/admin/admin-tag/admin-tag.component.html
+++ b/src/app/view/admin/admin-tag/admin-tag.component.html
@@ -1,7 +1,7 @@
 <div class="inner-content">
     <nz-card nzTitle="" nzSize="small">
-        <nz-tabset>
-            <nz-tab nzTitle="分类管理" (nzClick)="editInfo.editFocus=false">
+        <nz-tabset [nzTabBarExtraContent]="reload">
+            <nz-tab nzTitle="分类管理" (nzClick)="tabChanged('tag')">
                 <div style="margin-bottom: 15px;">
                     <nz-input-group *ngIf="editInfo.editFocus&&editInfo.isAdd" [nzPrefix]="tagIcon"
                                     style="width: 200px">
@@ -49,7 +49,7 @@
                     </tbody>
                 </nz-table>
             </nz-tab>
-            <nz-tab nzTitle="标签管理" (nzClick)="editInfo.editFocus=false">
+            <nz-tab nzTitle="标签管理" (nzClick)="tabChanged('category')">
                 <nz-table #tagTable [nzData]="tagPageList.list" [nzTotal]="tagPageList.total"
                           [(nzPageIndex)]="pageIndex" [nzScroll]="{x:'800px'}"
                           [nzPageSize]="pageSize" (nzPageIndexChange)="getTag()" nzFrontPagination="false">
@@ -90,3 +90,8 @@
     </nz-card>
 </div>
 <ng-template #tagIcon><i nz-icon nzType="tag" nzTheme="outline"></i></ng-template>
+<ng-template #reload>
+    <a (click)="getData()" title="刷新"><i nz-icon nzType="reload" nzTheme="outline"></i></a>
+</ng-template>
+
+
diff --git a/src/app/view/admin/admin-tag/admin-tag.component.ts b/src/app/view/admin/admin-tag/admin-tag.component.ts
index 04cba13..2b7a48f 100644
--- a/src/app/view/admin/admin-tag/admin-tag.component.ts
+++ b/src/app/view/admin/admin-tag/admin-tag.component.ts
@@ -29,15 +29,17 @@ export class AdminTagComponent implements OnInit {
     pageIndex: number = 1;
     pageSize: number = 10;
 
+    getData: any;
 
     ngOnInit(): void {
         this.title.setTitle('小海博客 | 标签分类管理')
         this.getCategory();
         this.getTag();
+        this.getData = this.getTag;
     }
 
     getCategory = () => this.apiService.categories().subscribe({
-        next: data => this.categoryList = data.result,
+        next: data => this.categoryList = data.result.list,
         complete: () => this.loading = false,
         error: err => this.loading = false
     })
@@ -138,4 +140,12 @@ export class AdminTagComponent implements OnInit {
         this.editInfo.isAdd = false
         this.editInfo.name = null
     }
+
+    tabChanged(mode: 'tag' | 'category') {
+        this.editInfo.editFocus = false
+        if (mode === 'tag')
+            this.getData = this.getTag;
+        else
+            this.getData = this.getCategory;
+    }
 }
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 f73c2be..70b6f34 100644
--- a/src/app/view/admin/admin-update/admin-update.component.html
+++ b/src/app/view/admin/admin-update/admin-update.component.html
@@ -1,5 +1,5 @@
 <div class="inner-content">
-    <nz-card nzTitle="更新内容管理" nzSize="small">
+    <nz-card nzTitle="更新内容管理" nzSize="small" [nzExtra]="reload">
         <button nz-button (click)="showModal()" style="margin-bottom: 15px;">新增</button>
         <nz-table #table [nzData]="pageList.list" [nzTotal]="pageList.total" [(nzPageIndex)]="pageIndex"
                   [nzPageSize]="pageSize" [nzLoading]="loading" [nzScroll]="{x:'800px'}"
@@ -30,3 +30,6 @@
           (nzOnOk)="confirm()" [nzTitle]="modalData.title">
     <textarea nz-input [(ngModel)]="modalData.content" [nzAutosize]="{ minRows: 2, maxRows: 8 }"></textarea>
 </nz-modal>
+<ng-template #reload>
+    <a (click)="getUpdateInfo()" title="刷新"><i nz-icon nzType="reload" nzTheme="outline"></i></a>
+</ng-template>
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 a368774..b209195 100644
--- a/src/app/view/admin/admin-update/admin-update.module.ts
+++ b/src/app/view/admin/admin-update/admin-update.module.ts
@@ -5,7 +5,7 @@ import {AdminUpdateComponent} from './admin-update.component';
 import {
     NzButtonModule,
     NzCardModule,
-    NzDividerModule, NzInputModule, NzModalModule,
+    NzDividerModule, NzIconModule, NzInputModule, NzModalModule,
     NzPopconfirmModule,
     NzTableModule,
     NzToolTipModule,
@@ -30,7 +30,8 @@ import {FormsModule} from '@angular/forms';
         NzModalModule,
         FormsModule,
         NzButtonModule,
-        NzInputModule
+        NzInputModule,
+        NzIconModule
     ]
 })
 export class AdminUpdateModule {
diff --git a/src/app/view/admin/admin-user/admin-user.component.html b/src/app/view/admin/admin-user/admin-user.component.html
index c9694ec..52defd5 100644
--- a/src/app/view/admin/admin-user/admin-user.component.html
+++ b/src/app/view/admin/admin-user/admin-user.component.html
@@ -1,5 +1,5 @@
 <div class="inner-content">
-    <nz-card nzTitle="用户管理" nzSize="small">
+    <nz-card nzTitle="用户管理" nzSize="small" [nzExtra]="reload">
         <nz-table #table [nzData]="pageList.list" [nzTotal]="pageList.total" [(nzPageIndex)]="pageIndex"
                   [nzPageSize]="pageSize" [nzLoading]="loading" [nzScroll]="{x:'800px'}"
                   (nzPageIndexChange)="getUser()" nzFrontPagination="false">
@@ -115,3 +115,8 @@
     </ng-template>
 
 </nz-modal>
+
+
+<ng-template #reload>
+    <a (click)="getUser()" title="刷新"><i nz-icon nzType="reload" nzTheme="outline"></i></a>
+</ng-template>
diff --git a/src/app/view/admin/admin-visitor/admin-visitor.component.html b/src/app/view/admin/admin-visitor/admin-visitor.component.html
index 9808b3f..bba032f 100644
--- a/src/app/view/admin/admin-visitor/admin-visitor.component.html
+++ b/src/app/view/admin/admin-visitor/admin-visitor.component.html
@@ -1,5 +1,5 @@
 <div class="inner-content">
-    <nz-card nzTitle="访客信息管理" nzSize="small">
+    <nz-card nzTitle="访客信息管理" nzSize="small" [nzExtra]="reload">
         <nz-table #table [nzData]="pageList.list" [nzTotal]="pageList.total" [(nzPageIndex)]="pageIndex"
                   [nzPageSize]="pageSize" [nzLoading]="loading" [nzScroll]="{x:'800px'}"
                   (nzPageIndexChange)="getVisitors()" nzFrontPagination="false">
@@ -22,3 +22,6 @@
         </nz-table>
     </nz-card>
 </div>
+<ng-template #reload>
+    <a (click)="getVisitors()" title="刷新"><i nz-icon nzType="reload" nzTheme="outline"></i></a>
+</ng-template>
diff --git a/src/app/view/admin/admin-visitor/admin-visitor.module.ts b/src/app/view/admin/admin-visitor/admin-visitor.module.ts
index b673ee9..dad9947 100644
--- a/src/app/view/admin/admin-visitor/admin-visitor.module.ts
+++ b/src/app/view/admin/admin-visitor/admin-visitor.module.ts
@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {RouterModule} from '@angular/router';
 import {AdminVisitorComponent} from './admin-visitor.component';
-import {NzButtonModule, NzCardModule, NzDividerModule, NzTableModule} from 'ng-zorro-antd';
+import {NzButtonModule, NzCardModule, NzDividerModule, NzIconModule, NzTableModule} from 'ng-zorro-antd';
 
 
 @NgModule({
@@ -15,7 +15,8 @@ import {NzButtonModule, NzCardModule, NzDividerModule, NzTableModule} from 'ng-z
         NzCardModule,
         NzTableModule,
         NzButtonModule,
-        NzDividerModule
+        NzDividerModule,
+        NzIconModule
     ]
 })
 export class AdminVisitorModule {
diff --git a/src/app/view/admin/admin.component.ts b/src/app/view/admin/admin.component.ts
index c79df40..6f7ac84 100644
--- a/src/app/view/admin/admin.component.ts
+++ b/src/app/view/admin/admin.component.ts
@@ -24,7 +24,6 @@ export class AdminComponent implements OnInit {
                 next: data => {
                     console.log('更新user')
                     this.user = data.result
-                    this.user.avatarImgUrl += '?t=' + Date.now();
                     if (data.result) this.initHelloWords()
                 }
             }