From 398716e3ffffb2384544a5aca40fce2ba71d17d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A6=BE=E5=87=A0=E6=B5=B7?= <zh56462271@qq.com>
Date: Fri, 7 Aug 2020 21:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E8=A1=A8=E5=8D=95=E7=BC=BA?=
 =?UTF-8?q?=E5=A4=B1=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin-link/admin-link.component.html      | 31 +++++++++++++++----
 .../admin/admin-link/admin-link.component.ts  | 10 ++----
 2 files changed, 28 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 7d68b1c..e40fa71 100644
--- a/src/app/view/admin/admin-link/admin-link.component.html
+++ b/src/app/view/admin/admin-link/admin-link.component.html
@@ -20,14 +20,14 @@
           (nzOnCancel)="modalVisible = false" [nzClosable]="true" [nzOkDisabled]="!formGroup.valid">
     <form nz-form [formGroup]="formGroup">
         <nz-form-item>
-            <nz-form-label nzRequired>网站名称</nz-form-label>
-            <nz-form-control nzErrorTip="网站名称不可为空">
+            <nz-form-label nzFlex="80px" nzRequired>网站名称</nz-form-label>
+            <nz-form-control nzFlex="auto" nzErrorTip="网站名称不可为空">
                 <input nz-input formControlName="name">
             </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-            <nz-form-label nzRequired>网站链接</nz-form-label>
-            <nz-form-control [nzErrorTip]="nameErrTip">
+            <nz-form-label nzFlex="80px" nzRequired>网站链接</nz-form-label>
+            <nz-form-control nzFlex="auto" [nzErrorTip]="nameErrTip">
                 <input nz-input formControlName="url">
                 <ng-template #nameErrTip>
                     <div *ngIf="formGroup.controls.url.hasError('required')">网站链接不可为空</div>
@@ -37,13 +37,32 @@
             </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-            <nz-form-label nzRequired>是否公开</nz-form-label>
-            <nz-form-control nzErrorTip="不可为空">
+            <nz-form-label nzFlex="80px" nzRequired>是否公开</nz-form-label>
+            <nz-form-control nzFlex="auto" nzErrorTip="不可为空">
                 <nz-select nzPlaceHolder="请选择" formControlName="open" [nzAllowClear]="true">
                     <nz-option [nzValue]="true" nzLabel="公开"></nz-option>
                     <nz-option [nzValue]="false" nzLabel="不公开"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+            <nz-form-label nzFlex="80px">网站图标</nz-form-label>
+            <nz-form-control nzFlex="auto" nzErrorTip="链接格式不正确">
+                <nz-input-group [nzSuffix]="icon" nzSize="large">
+                    <input nz-input formControlName="iconPath">
+                </nz-input-group>
+                <ng-template #icon>
+                    <img style="width: 25px;height: 25px" *ngIf="formGroup.value.iconPath"
+                         [src]="formGroup.value.iconPath" alt="icon">
+                </ng-template>
+            </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+            <nz-form-label nzFlex="80px">网站描述</nz-form-label>
+            <nz-form-control nzFlex="auto" nzErrorTip="可输入最大文字长度为255">
+                <textarea nz-input formControlName="desc" [nzAutosize]="{ minRows: 2, maxRows: 6 }"></textarea>
+            </nz-form-control>
+        </nz-form-item>
+
     </form>
 </nz-modal>
diff --git a/src/app/view/admin/admin-link/admin-link.component.ts b/src/app/view/admin/admin-link/admin-link.component.ts
index a3c7a91..cbbe489 100644
--- a/src/app/view/admin/admin-link/admin-link.component.ts
+++ b/src/app/view/admin/admin-link/admin-link.component.ts
@@ -22,6 +22,8 @@ export class AdminLinkComponent implements OnInit {
             name: new FormControl(null, [Validators.required]),
             url: new FormControl(null, [Validators.required, Validators.pattern(/^(https:\/\/|http:\/\/|)([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?$/)]),
             open: new FormControl(null, [Validators.required]),
+            desc: new FormControl(null, [Validators.maxLength(255)]),
+            iconPath: new FormControl(null, [Validators.pattern(/^(https:\/\/|http:\/\/|)([\w-]+\.)+[\w-]+(\/[\w-./?%&=]*)?$/)]),
             oper: new FormControl(null)
         })
     }
@@ -83,13 +85,7 @@ export class AdminLinkComponent implements OnInit {
 
     modalConfirm() {
         this.modalVisible = false;
-        const linkReq: Link = new Link();
-        linkReq.name = this.formGroup.value.name;
-        linkReq.url = this.formGroup.value.url;
-        linkReq.open = this.formGroup.value.open;
-        // 暂时设置未空
-        linkReq.desc = '';
-        linkReq.iconPath = '';
+        const linkReq: Link = this.formGroup.value
         const oper = this.formGroup.value.oper;
         let observable: Observable<Response<Link>>;
         if (oper === 'edit') {