image viewer and file upload are modified

This commit is contained in:
병준 박 2019-10-29 18:19:41 +09:00
parent f75bd7c2bb
commit 5d44c1d2f1
3 changed files with 26 additions and 20 deletions

View File

@ -84,7 +84,11 @@
</ucap-chat-messages> </ucap-chat-messages>
</perfect-scrollbar> </perfect-scrollbar>
<!-- CHAT MESSAGES --> <!-- CHAT MESSAGES -->
</div>
<!-- / CHAT CONTENT -->
<!-- CHAT FOOTER -->
<div fxFlex="0 0 auto" fxLayout="column">
<div <div
*ngIf="fileDragOver || (files && 0 < files.length)" *ngIf="fileDragOver || (files && 0 < files.length)"
class="file-drop-zone-container" class="file-drop-zone-container"
@ -95,13 +99,12 @@
></ucap-ui-file-upload-queue> ></ucap-ui-file-upload-queue>
</div> </div>
</div> </div>
</div>
<!-- / CHAT CONTENT -->
<!-- CHAT FOOTER -->
<div fxFlex="0 0 auto" fxLayout="column">
<!-- REPLY FORM --> <!-- REPLY FORM -->
<ucap-chat-form (send)="onSendMessage($event)"></ucap-chat-form> <ucap-chat-form
(send)="onSendMessage($event)"
(sendFiles)="onFileSelected($event)"
></ucap-chat-form>
<!-- / REPLY FORM --> <!-- / REPLY FORM -->
</div> </div>
<!-- / CHAT FOOTER--> <!-- / CHAT FOOTER-->

View File

@ -58,21 +58,21 @@ $line-basic: 1px solid #dddddd;
background: transparent; background: transparent;
overflow: auto; overflow: auto;
-webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
}
.file-drop-zone-container { .file-drop-zone-container {
position: relative; position: relative;
.file-drop-zone { .file-drop-zone {
position: absolute; position: absolute;
border: 2px solid gray; border: 2px solid gray;
background-color: white; background-color: white;
width: 600px; width: 600px;
height: 150px; height: 150px;
bottom: 0px; bottom: 0px;
margin: auto; margin: auto;
left: 0px; left: 0px;
right: 0px; right: 0px;
}
} }
} }
} }

View File

@ -241,10 +241,13 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewChecked {
ImageViewerDialogResult ImageViewerDialogResult
>(ImageViewerDialogComponent, { >(ImageViewerDialogComponent, {
position: { position: {
top: '10px' top: '30px'
}, },
maxWidth: '100vw',
maxHeight: '100vh',
height: 'calc(100% - 30px)',
width: '100%', width: '100%',
height: '98%', hasBackdrop: false,
data: {} data: {}
}); });
} }