ucap/next-ucap-messenger
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

Browse Source 
1. 대화창 > 빈값으로 대화 입력시 alert
2. 대화방 > 대화 > 대화전달 팝업 :: 대화방 리스트 안나오는 문제 수정.
This commit is contained in:
leejh 2019-10-30 11:12:45 +09:00
parent 9d2e92b31a
commit d099bcb035
2 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts
View File

@ -13,7 +13,10 @@ import {
DialogService, DialogService,
ConfirmDialogComponent, ConfirmDialogComponent,
ConfirmDialogData, ConfirmDialogData,
ConfirmDialogResult ConfirmDialogResult,
AlertDialogComponent,
AlertDialogData,
AlertDialogResult
} from '@ucap-webmessenger/ui'; } from '@ucap-webmessenger/ui';
import { Store, select } from '@ngrx/store'; import { Store, select } from '@ngrx/store';
import { NGXLogger } from 'ngx-logger'; import { NGXLogger } from 'ngx-logger';
@ -198,7 +201,22 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked {
selectContact() {} selectContact() {}
onSendMessage(message: string) { async onSendMessage(message: string) {
if (!message || message.trim().length === 0) {
const result = await this.dialogService.open<
AlertDialogComponent,
AlertDialogData,
AlertDialogResult
>(AlertDialogComponent, {
width: '360px',
data: {
title: 'Alert',
message: `대화내용을 입력해주세요.`
}
});
return;
}
if (message.trim().length > Maximum_Range.MassText) { if (message.trim().length > Maximum_Range.MassText) {
// MASS TEXT // MASS TEXT
this.store.dispatch( this.store.dispatch(

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

@ -5,7 +5,10 @@
<mat-card-content> <mat-card-content>
<div *ngIf="data.type === UserSelectDialogType.NewGroup"> <div *ngIf="data.type === UserSelectDialogType.NewGroup">
<form name="inputForm" [formGroup]="inputForm" novalidate> <form name="inputForm" [formGroup]="inputForm" novalidate>
<mat-form-field hintLabel="특수문자는 '-,_'만 사용할 수 있습니다." style="display:block;margin-bottom:10px;"> <mat-form-field
hintLabel="특수문자는 '-,_'만 사용할 수 있습니다."
style="display:block;margin-bottom:10px;"
>
<input <input
matInput matInput
#input #input
@ -103,9 +106,9 @@
<mat-icon>chat</mat-icon> <mat-icon>chat</mat-icon>
</ng-template> </ng-template>
<div> <div>
<cdk-virtual-scroll-viewport itemSize="20" style="height: 100%"> <!-- <cdk-virtual-scroll-viewport itemSize="20" style="height: 100%">
<ucap-room-list-item <ucap-room-list-item
*ngFor="let room of roomList" *cdkVirtualFor="let room of roomList"
[loginRes]="loginRes" [loginRes]="loginRes"
[roomInfo]="room" [roomInfo]="room"
[roomUserInfo]="getRoomUserList(room)" [roomUserInfo]="getRoomUserList(room)"
@ -116,12 +119,24 @@
(checkRoom)="onCheckRoom($event)" (checkRoom)="onCheckRoom($event)"
> >
</ucap-room-list-item> </ucap-room-list-item>
</cdk-virtual-scroll-viewport> </cdk-virtual-scroll-viewport> -->
<ucap-room-list-item
*ngFor="let room of roomList"
[loginRes]="loginRes"
[roomInfo]="room"
[roomUserInfo]="getRoomUserList(room)"
[sessionVerinfo]="sessionVerinfo"
[checkable]="getCheckableRoom(room)"
[isChecked]="getCheckedRoom(room)"
[multiCheckable]="false"
(checkRoom)="onCheckRoom($event)"
>
</ucap-room-list-item>
</div> </div>
</mat-tab> </mat-tab>
</mat-tab-group> </mat-tab-group>
</div> </div>
<div *ngIf="isShowSelectedUserList" class="list-chip"> <div *ngIf="isShowSelectedUserList" class="list-chip">
<mat-chip-list aria-label="User selection"> <mat-chip-list aria-label="User selection">
<mat-chip <mat-chip
*ngFor="let userInfo of selectedUserList" *ngFor="let userInfo of selectedUserList"