Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/message.component.ts

@@ -336,13 +336,13 @@ export class MessageBoxComponent
 
     this.getSearchMessage(
       MessageType.All,
-      MessageSearchType.Name,
+      this.fgSearchType.get('searchMessageSearchType').value,
       search.trim()
     );
   }
   getSearchMessage(
     messageType: MessageType,
-    searchType: MessageSearchType,
+    searchType: MessageSearchType = MessageSearchType.Name,
     searchStr: string
   ) {
     this.isSearch = true;

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.html

@@ -194,6 +194,7 @@
               </mat-icon>
             </ng-template>
             <div fxFlexFill style="max-height: 508px;">
+              <perfect-scrollbar fxFlex="1 1 auto" >
               <div class="mat-tab-frame dialog-tab-chatlist">
                 <ucap-room-list-item
                   *ngFor="let room of roomList"
@@ -206,10 +207,11 @@
                   [multiCheckable]="false"
                   (checkRoom)="onCheckRoom($event)"
                   (click)="onToggleRoom(room)"
-                  class="chat"
+                  class="chat checkbox"
                 >
                 </ucap-room-list-item>
               </div>
+              </perfect-scrollbar>
             </div>
           </mat-tab>
         </mat-tab-group>

projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss

@@ -60,12 +60,23 @@
   }
 }
 
-.dialog-tab-chatlist {
+::ng-deep .dialog-tab-chatlist {
-  height: 528px;
+  height: 508px;
   width: 100%;
   .chat {
     width: 100%;
   }
+  .chat.checkbox {
+    & > .list-item {
+      padding: 0 10px;
+      .item-default {
+        width: calc(100% - 30px);
+      }
+      .mat-badge {
+        display: none;
+      }
+    }
+  }
 }
 
 ::ng-deep .dialog-tab-orglist {
@@ -158,32 +169,8 @@
     }
   }
 }
-::ng-deep .ps-content {
+/*::ng-deep .ps-content {
   .cdk-virtual-scroll-viewport {
     height: 100%;
   }
-}
+}*/
-/*:
-.mat-tab-frame {
-  width: 100%;
-  height: 100%;
-  .list-panel {
-    width: 100%;
-    height: calc(100% - 60px);
-    .group-expansion {
-      .list-item {
-        height: 70px;
-      }
-    }
-  }
-}
-::ng-deep .mat-card > .mat-tab-labels {
-  border-bottom: 2px solid #dddddd;
-}
-
-
-.list-item-frame {
-  width: 100%;
-  height: 100%;
-}
-*/

projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss

@@ -11,6 +11,9 @@
   }
 
   .message-write-body {
+    white-space: pre-wrap;
+    word-wrap: normal;
+    overflow: auto;
     [contenteditable]:hover {
       background: #fafafa;
     }
@@ -68,6 +71,7 @@
       padding: 10px;
       min-height: 250px;
       border: 1px solid #dddddd;
+      word-break: break-all;
       //overflow: auto;
     }
   }