From d9a7b68a2bcf6625d122533e588049cddfc368cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Thu, 2 Jul 2020 21:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=8F=AF=E7=BC=96=E8=BE=91ta?=
 =?UTF-8?q?g=E7=BB=84=E4=BB=B6-=E8=BE=B9=E6=A1=86=EF=BC=8C=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editable-tag/editable-tag.component.ts    | 20 ++++++++++++++++---
 .../test-common-table.component.html          |  4 +++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/app/view/admin/components/editable-tag/editable-tag.component.ts b/src/app/view/admin/components/editable-tag/editable-tag.component.ts
index 89d185f..7971c35 100644
--- a/src/app/view/admin/components/editable-tag/editable-tag.component.ts
+++ b/src/app/view/admin/components/editable-tag/editable-tag.component.ts
@@ -3,7 +3,9 @@ import {Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild} f
 @Component({
     selector: 'editable-tag',
     template: `
-        <nz-tag *ngIf="!inputVisible" class="editable-tag" title="双击进入编辑" [nzColor]="color" nzNoAnimation (click)="showInput(true)">
+        <nz-tag *ngIf="!inputVisible" class="editable-tag" title="双击进入编辑" [nzColor]="color" nzNoAnimation
+                (click)="showInput(true)"
+                [style.border-style]="showBorder ? 'solid': 'none'">
             <ng-content></ng-content>
         </nz-tag>
         <input #inputElement
@@ -16,11 +18,15 @@ import {Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild} f
                (blur)="handleInputConfirm()"
                (keydown.enter)="handleInputConfirm()"
         />
-        <i nz-icon nzType="edit" nzTheme="fill" style="cursor: pointer" (click)="showInput(false)"></i>
+        <i nz-icon *ngIf="showEditIcon"
+           nzType="edit"
+           nzTheme="fill"
+           style="cursor: pointer;margin-right: 8px;"
+           (click)="showInput(false)">
+        </i>
     `,
     styles: [`.editable-tag {
         background: rgb(255, 255, 255);
-        border-style: none;
     }`]
 })
 export class EditableTagComponent implements OnInit {
@@ -34,11 +40,19 @@ export class EditableTagComponent implements OnInit {
 
     @Output() valueChange = new EventEmitter<string>();
     @Input() color: string;
+    @Input() showEditIcon: boolean;
+    @Input() showBorder: boolean;
     private doubleClickInfo = {
         date: null,
     };
 
     ngOnInit(): void {
+        if (this.showEditIcon == null) {
+            this.showEditIcon = true;
+        }
+        if (this.showBorder == null) {
+            this.showBorder = true;
+        }
     }
 
     showInput(doubleClick: boolean): void {
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 2035cc3..2c4f0ab 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
@@ -23,4 +23,6 @@
 </ng-template>
 
 
-<editable-tag >hhh</editable-tag>
+<editable-tag color="green">hhh</editable-tag>
+<editable-tag color="green" [showEditIcon]="false">hhh</editable-tag>
+<editable-tag color="green" [showBorder]="false">hhh</editable-tag>