From f1a0f241fff16e8e08a68ce9fde386dc0146d569 Mon Sep 17 00:00:00 2001
From: leejinho <lilis7575@gmail.com>
Date: Fri, 13 Mar 2020 10:56:28 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A1=B0=EC=A7=81=EB=8F=84=20=EB=A0=88?=
 =?UTF-8?q?=EC=9D=B4=EC=95=84=EC=9B=83=20=EC=88=98=EC=A0=95.=201.=20expans?=
 =?UTF-8?q?ion=20panel=20indicator=20=EC=88=98=EC=A0=95.=202.=20class=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main-contents/organization.component.html | 32 ++++++++++++++-----
 .../main-contents/organization.component.scss | 16 +++++++---
 .../components/detail-table.component.html    | 15 ++++-----
 .../components/detail-table.component.scss    |  8 ++---
 4 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.html
index a96d826f..da22b709 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.html
@@ -177,7 +177,7 @@
 
   <div fxFlex="auto" fxLayout="column">
     <mat-accordion class="organization-accordion">
-      <mat-expansion-panel>
+      <mat-expansion-panel hideToggle>
         <mat-expansion-panel-header>
           <mat-panel-title class="select-user-title">
             {{ 'organization.selectedUser' | translate }}
@@ -186,18 +186,34 @@
               {{ 'common.units.persons' | translate }}
             </span>
           </mat-panel-title>
-          <mat-panel-description> </mat-panel-description>
+          <mat-panel-description>
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              height="24"
+              viewBox="0 0 24 24"
+              width="24"
+              class="indicator"
+            >
+              <path d="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6z" />
+              <path d="M0 0h24v24H0z" fill="none" />
+            </svg>
+          </mat-panel-description>
         </mat-expansion-panel-header>
 
         <div class="list-chip">
           <mat-chip-list aria-label="User selection">
-            <mat-chip
-              *ngFor="let userInfo of selectedUserList"
-              (removed)="onClickDeleteUser(userInfo)"
+            <perfect-scrollbar
+              [config]="{ suppressScrollX: true }"
+              class="selected-user-list-chip"
             >
-              {{ userInfo.name }}
-              <mat-icon matChipRemove>clear</mat-icon>
-            </mat-chip>
+              <mat-chip
+                *ngFor="let userInfo of selectedUserList"
+                (removed)="onClickDeleteUser(userInfo)"
+              >
+                {{ userInfo.name }}
+                <mat-icon matChipRemove>clear</mat-icon>
+              </mat-chip>
+            </perfect-scrollbar>
           </mat-chip-list>
         </div>
         <div class="btn-box">
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.scss
index fde4e5a4..51ce649c 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/main-contents/organization.component.scss
@@ -163,17 +163,23 @@
   font-weight: 600;
 }
 
-::ng-depp .organization-accordion {
+::ng-deep .organization-accordion {
   .mat-expansion-panel {
     .mat-expansion-panel-header {
-      .mat-expansion-indicator {
-        transform: rotate(180deg) !important;
+      .indicator {
+        position: absolute;
+        right: 10px;
+        transform: rotate(0deg) !important;
       }
       &.mat-expanded {
-        .mat-expansion-indicator {
-          transform: rotate(0deg) !important;
+        .indicator {
+          transform: rotate(180deg) !important;
         }
       }
     }
   }
 }
+
+.selected-user-list-chip {
+  max-height: 120px;
+}
diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.html b/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.html
index f254d6a4..196cb752 100644
--- a/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.html
+++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.html
@@ -7,7 +7,7 @@
   >
     <ng-container matColumnDef="profileImage">
       <th mat-header-cell *matHeaderCellDef class="profileImage">
-        <span class="ui-column-resizer none"></span>
+        <span class="ui-column-divider"></span>
         <span>
           {{ 'search.fieldProfile' | translate }}
         </span>
@@ -42,7 +42,7 @@
     <ng-container matColumnDef="profileInfo">
       <th mat-header-cell *matHeaderCellDef class="profileInfo" minWidth="150">
         <span
-          class="ui-column-resizer"
+          class="ui-column-divider resizable"
           (mousedown)="resizeTable($event)"
         ></span>
         <span mat-sort-header="name">
@@ -84,7 +84,7 @@
     <ng-container matColumnDef="company_hpNumber">
       <th mat-header-cell *matHeaderCellDef minWidth="75">
         <span
-          class="ui-column-resizer"
+          class="ui-column-divider resizable"
           (mousedown)="resizeTable($event)"
         ></span>
         <div mat-sort-header="company">
@@ -106,7 +106,7 @@
     <ng-container matColumnDef="workplace_lineNumber">
       <th mat-header-cell *matHeaderCellDef minWidth="75">
         <span
-          class="ui-column-resizer"
+          class="ui-column-divider resizable"
           (mousedown)="resizeTable($event)"
         ></span>
         <div mat-sort-header="workplace">
@@ -118,7 +118,7 @@
       </th>
       <td mat-cell *matCellDef="let element">
         <span
-          class="ui-column-resizer"
+          class="ui-column-divider resizable"
           (mousedown)="resizeTable($event)"
         ></span>
         <div class="workplace">
@@ -131,10 +131,7 @@
     </ng-container>
     <ng-container matColumnDef="responsibilities_email">
       <th mat-header-cell *matHeaderCellDef minWidth="90">
-        <span
-          class="ui-column-resizer"
-          (mousedown)="resizeTable($event)"
-        ></span>
+        <span class="ui-column-divider"></span>
         <div mat-sort-header="responsibilities">
           {{ 'search.fieldResponsibilities' | translate }}
         </div>
diff --git a/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.scss b/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.scss
index 62382ebb..54836a27 100644
--- a/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.scss
+++ b/projects/ucap-webmessenger-ui-organization/src/lib/components/detail-table.component.scss
@@ -37,7 +37,7 @@ th.mat-header-cell {
   position: relative;
   padding: 0 10px;
 
-  span.ui-column-resizer {
+  span.ui-column-divider {
     display: block;
     position: absolute;
     top: 10px;
@@ -46,12 +46,12 @@ th.mat-header-cell {
     width: 2px;
     height: 40px;
     padding: 0;
-    cursor: col-resize;
+    cursor: initial;
     border: none;
     background-color: #d4d4d4;
 
-    &.none {
-      cursor: initial;
+    &.resizable {
+      cursor: col-resize;
     }
   }
   span {