bugfix
This commit is contained in:
parent
bf6a5c3669
commit
29ec8492ae
|
@ -1,6 +1,5 @@
|
||||||
<div class="date-split">
|
<div class="date-split">
|
||||||
<span class="line"></span>
|
<span class="line"></span>
|
||||||
<!-- {{ message.sendDate | date: 'short' }} -->
|
<span class="date">{{ dateInfo }}</span>
|
||||||
<span class="date">{{ dateInfo }}2019.10.3</span>
|
|
||||||
<span class="line"></span>
|
<span class="line"></span>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -18,7 +18,7 @@ export class DateSplitterComponent implements OnInit {
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.dateInfo = this.datePipe.transform(
|
this.dateInfo = this.datePipe.transform(
|
||||||
this.message.sendDate,
|
this.message.sendDate,
|
||||||
'yyyy-MM-dd EEE'
|
'yyyy.MM.dd EEE'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
<p>
|
<div>
|
||||||
{{ contents }}
|
{{ contents }}
|
||||||
</p>
|
</div>
|
||||||
|
|
|
@ -1,12 +1,11 @@
|
||||||
<div class="bubble-main">
|
<div class="bubble-main">
|
||||||
<span>
|
<span class="content">
|
||||||
{{ content }}
|
{{ content }}
|
||||||
</span>
|
</span>
|
||||||
<span>
|
<span>
|
||||||
{{ message.sendDate | date: 'short' }}
|
{{ message.sendDate | date: 'short' }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{{detailButteonShow}}
|
|
||||||
<div *ngIf="detailButteonShow" class="btn-box">
|
<div *ngIf="detailButteonShow" class="btn-box">
|
||||||
<button mat-button (click)="onClickDetailView()">Detail View</button>
|
<button mat-button (click)="onClickDetailView()">Detail View</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,6 +1,12 @@
|
||||||
|
@charset 'utf-8';
|
||||||
|
@import '../../../../ucap-webmessenger-app/src/assets/scss/global/common.scss';
|
||||||
.bubble-main {
|
.bubble-main {
|
||||||
padding: 14px;
|
padding: 14px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
.content {
|
||||||
|
max-width: 250px;
|
||||||
|
@include ellipsis(1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-box {
|
.btn-box {
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
<div class="chat-messages">
|
<div class="chat-messages">
|
||||||
<!-- MESSAGE -->
|
<!-- MESSAGE -->
|
||||||
<ucap-chat-message-box-date-splitter *ngIf="getDateSplitter(i)" [message]="message">
|
|
||||||
</ucap-chat-message-box-date-splitter>
|
|
||||||
|
|
||||||
<div
|
<div
|
||||||
*ngFor="let message of messages; let i = index"
|
*ngFor="let message of messages; let i = index"
|
||||||
class="message-row"
|
class="message-row"
|
||||||
|
@ -11,6 +8,13 @@
|
||||||
contact: message.senderSeq !== loginRes.userSeq
|
contact: message.senderSeq !== loginRes.userSeq
|
||||||
}"
|
}"
|
||||||
>
|
>
|
||||||
|
<div>
|
||||||
|
<ucap-chat-message-box-date-splitter
|
||||||
|
*ngIf="getDateSplitter(i)"
|
||||||
|
[message]="message"
|
||||||
|
>
|
||||||
|
</ucap-chat-message-box-date-splitter>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
*ngIf="getIsInformation(message); then information; else contents"
|
*ngIf="getIsInformation(message); then information; else contents"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user