From 6bd15f3cc08905cc8b851e1d82f59e12ca60e758 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 14:11:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E7=BB=84=E4=BB=B6-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5=E4=BF=A1=E6=81=AF=E6=94=B9=E5=8F=98?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common-table/common-table.component.ts     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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 5ea5047..973da13 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
@@ -1,4 +1,4 @@
-import {Component, Input, OnChanges, OnInit, SimpleChanges, TemplateRef} from '@angular/core';
+import {Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, TemplateRef} from '@angular/core';
 import {Data} from './data';
 import {PageList, RequestObj} from '../../../../class/HttpReqAndResp';
 import {HttpService} from '../../../../api/http/http.service';
@@ -15,7 +15,7 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
     }
 
     /**
-     * 设置readonly data 因为后面有使用eval 为了安全 TODO
+     * 设置readonly data 因为后面有使用eval 为了安全
      */
     @Input() readonly data: Data<T>[];
     @Input() request: RequestObj;
@@ -26,6 +26,7 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
             param?: { [key: string]: string }
         }
     };
+    @Output() pageInfo = new EventEmitter<{ page: number, pageSize: number }>();
     loading: boolean = true;
 
     dataList: PageList<T> = new PageList<T>();
@@ -44,10 +45,13 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
 
     getData = () => {
         this.loading = true;
+        const pageValue = this.dataList.pageNum ? this.dataList.pageNum : 1;
+        const countValue = this.dataList.pageSize ? this.dataList.pageSize : 10
         this.request.queryParam = {
-            page: this.dataList.pageNum ? this.dataList.pageNum : 1,
-            count: this.dataList.pageSize ? this.dataList.pageSize : 10
+            page: pageValue,
+            count: countValue
         }
+        this.pageInfo.emit({page: pageValue, pageSize: countValue})
         this.httpService.Service<PageList<T>>(this.request).subscribe({
             next: resp => {
                 this.dataList = resp.result;
@@ -62,9 +66,11 @@ export class CommonTableComponent<T> implements OnInit, OnChanges {
 
 
     getValue(index: number, fieldValue: string) {
-        // todo: 过滤
+        let str = `this.dataList.list[${index}].` + fieldValue;
+        const regexp = /<|>|=|onload|$|{|}|《/
+        str = str.replace(regexp, '');
         // tslint:disable-next-line:no-eval
-        const value = eval(`this.dataList.list[${index}].` + fieldValue);
+        const value = eval(str);
         return value ? value : '暂无数据';
     }