From 014a9eebe4ebd5f456e0025a1fdf719091ee6b89 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, 1 Jul 2020 12:40:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=BB=84=E4=BB=B6-=E5=A4=9A?=
 =?UTF-8?q?=E7=BA=A7=E5=B1=9E=E6=80=A7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common-table/common-table.component.html        | 12 ++++++------
 .../common-table/common-table.component.ts          | 13 +++++++++++--
 .../test-common-table.component.html                |  2 +-
 .../test-common-table.component.ts                  | 12 +++++++++---
 .../test-common-table/test-common-table.module.ts   |  2 +-
 5 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/app/view/admin/components/common-table/common-table.component.html b/src/app/view/admin/components/common-table/common-table.component.html
index d81c2ba..0b1c2f9 100644
--- a/src/app/view/admin/components/common-table/common-table.component.html
+++ b/src/app/view/admin/components/common-table/common-table.component.html
@@ -1,4 +1,4 @@
-<nz-card nzSize="small" [nzExtra]="refresh" [nzTitle]="title" [nzLoading]="loading">
+<nz-card nzSize="small" [nzExtra]="refresh" [nzTitle]="cardTitle" [nzLoading]="loading">
     <nz-table nzTableLayout="fixed"
               [nzData]="dataList.list"
               [nzTotal]="dataList.total"
@@ -16,17 +16,17 @@
         </tr>
         </thead>
         <tbody>
-        <tr *ngFor="let t of dataList.list">
+        <tr *ngFor="let t of dataList.list;let index = index">
             <ng-container *ngFor="let headData of data">
                 <td *ngIf="headData.show"
                     nz-typography
                     nzEllipsis
                     nzEllipsisRows="1"
-                    [nzTooltipTitle]="headData.fieldName+' : '+t[headData.fieldValue]"
-                    nzTooltipPlacement="right"
+                    [nzTooltipTitle]="headData.isActionColumns ? null : headData.fieldName+' : '+getValue(index,headData.fieldValue)"
+                    nzTooltipPlacement="top"
                     nz-tooltip>
                     <ng-template [ngIf]="!headData.isActionColumns">
-                        {{t[headData.fieldValue]}}
+                        {{ getValue(index, headData.fieldValue) }}
                     </ng-template>
                     <ng-container *ngIf="headData.isActionColumns">
                         <a *ngFor="let action of headData.action; let i = index" (mouseenter)="action.hover(t)"
@@ -47,5 +47,5 @@
 
 
 <ng-template #refresh>
-    <i nz-icon nzType="reload" nzTheme="outline" (click)="getData()"></i>
+    <i nz-icon nzType="reload" nzTheme="outline" (click)="getData()" style="cursor: pointer"></i>
 </ng-template>
diff --git a/src/app/view/admin/components/common-table/common-table.component.ts b/src/app/view/admin/components/common-table/common-table.component.ts
index a2e6fdf..c7dd62e 100644
--- a/src/app/view/admin/components/common-table/common-table.component.ts
+++ b/src/app/view/admin/components/common-table/common-table.component.ts
@@ -14,9 +14,12 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
 
     }
 
-    @Input() data: Data<T>[]
+    /**
+     * 设置readonly data 因为后面有使用eval 为了安全 TODO
+     */
+    @Input() readonly data: Data<T>[]
     @Input() request: RequestObj
-    @Input() title: string
+    @Input() cardTitle: string
     loading: boolean = true;
 
     dataList: PageList<T> = new PageList<T>();
@@ -51,4 +54,10 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
     ngOnChanges(changes: SimpleChanges): void {
     }
 
+
+    getValue(index: number, fieldValue: string) {
+        // todo: 过滤
+        // tslint:disable-next-line:no-eval
+        return eval(`this.dataList.list[${index}].` + fieldValue);
+    }
 }
diff --git a/src/app/view/admin/test-common-table/test-common-table.component.html b/src/app/view/admin/test-common-table/test-common-table.component.html
index 51b3df4..09d986b 100644
--- a/src/app/view/admin/test-common-table/test-common-table.component.html
+++ b/src/app/view/admin/test-common-table/test-common-table.component.html
@@ -1 +1 @@
-<app-common-table [data]="data" [request]="req" title="文章管理"></app-common-table>
+<app-common-table [data]="data" [request]="req" cardTitle="文章管理"></app-common-table>
diff --git a/src/app/view/admin/test-common-table/test-common-table.component.ts b/src/app/view/admin/test-common-table/test-common-table.component.ts
index 06e8651..b02b194 100644
--- a/src/app/view/admin/test-common-table/test-common-table.component.ts
+++ b/src/app/view/admin/test-common-table/test-common-table.component.ts
@@ -1,7 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {Data} from '../components/common-table/data';
 import {Article} from '../../../class/Article';
-import {RequestObj} from "../../../class/HttpReqAndResp";
+import {RequestObj} from '../../../class/HttpReqAndResp';
 
 @Component({
     selector: 'app-test-common-table',
@@ -26,13 +26,19 @@ title: "教你动手写一个刷课脚本"
 updateDateFormat: "2020-05-27 00:55:05"*/
     constructor() {
         this.data = [
-            {fieldName: '主键', fieldValue: 'id', show: false},
+            {fieldName: '主键', fieldValue: 'id', show: false, primaryKey: true},
             {fieldName: '标题', fieldValue: 'title', show: true},
-            {fieldName: '标签', fieldValue: 'category', show: true},
+            {fieldName: '发布日期', fieldValue: 'publishDateFormat', show: true},
+            {fieldName: '更新日期', fieldValue: 'updateDateFormat', show: true},
+            {fieldName: '文章类型', fieldValue: 'original', show: true},
+            {fieldName: '阅读量', fieldValue: 'readingNumber', show: true},
+            {fieldName: '分类', fieldValue: 'category', show: true},
             {fieldName: '👎数', fieldValue: 'dislikeCount', show: true},
             {fieldName: '👍数', fieldValue: 'likeCount', show: true},
             {fieldName: '状态', fieldValue: 'open', show: true},
             {fieldName: '简介', fieldValue: 'summary', show: false},
+            {fieldName: '作者', fieldValue: 'author.displayName', show: true},
+            {fieldName: '标签数', fieldValue: 'tags.length', show: true},
             {
                 fieldName: '操作', fieldValue: '', show: true, isActionColumns: true,
                 action: [
diff --git a/src/app/view/admin/test-common-table/test-common-table.module.ts b/src/app/view/admin/test-common-table/test-common-table.module.ts
index 2f88ee4..97f6e8e 100644
--- a/src/app/view/admin/test-common-table/test-common-table.module.ts
+++ b/src/app/view/admin/test-common-table/test-common-table.module.ts
@@ -2,7 +2,7 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {TestCommonTableComponent} from './test-common-table.component';
 import {Router, RouterModule} from '@angular/router';
-import {CommonTableModule} from "../components/common-table/common-table.module";
+import {CommonTableModule} from '../components/common-table/common-table.module';
 
 
 @NgModule({