From 188b6e98232da2443b8a4f902b813278e3a1064f Mon Sep 17 00:00:00 2001 From: leejinho Date: Thu, 21 Nov 2019 14:51:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EA=B7=B8=EB=A3=B9=20>=20=ED=8E=BC=EC=B3=90?= =?UTF-8?q?=EB=86=93=EA=B3=A0=20=EA=B7=B8=EB=A3=B9=EB=A9=A4=EB=B2=84=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=EC=8B=9C=20=EC=A0=91=ED=9E=88=EB=A9=B4?= =?UTF-8?q?=EC=84=9C=20=EC=8A=A4=ED=81=AC=EB=A1=A4=EC=9D=B4=20=ED=95=98?= =?UTF-8?q?=EB=8B=A8=EC=97=90=20=EC=9C=A0=EC=A7=80=EB=90=98=EB=8A=94=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C.=20=20=20=20>=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=ED=9B=84=20scroll=20top=EC=9C=BC=EB=A1=9C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/lib/components/expansion-panel.component.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts index 4d2382c6..8c4f1aef 100644 --- a/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts +++ b/projects/ucap-webmessenger-ui-group/src/lib/components/expansion-panel.component.ts @@ -26,6 +26,7 @@ import { NGXLogger } from 'ngx-logger'; import { VirtualScrollTreeFlatDataSource } from '@ucap-webmessenger/ui'; import { FlatTreeControl } from '@angular/cdk/tree'; import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; +import { PerfectScrollbarDirective } from 'ngx-perfect-scrollbar'; enum NodeType { None = 'None', @@ -116,6 +117,10 @@ export class ExpansionPanelComponent children: [] }; + item.buddyList.sort((a, b) => + a.name < b.name ? -1 : a.name > b.name ? 1 : 0 + ); + item.buddyList.forEach(userInfo => { groupNode.children.push({ nodeType: NodeType.Buddy, @@ -160,6 +165,9 @@ export class ExpansionPanelComponent @ViewChild('cvsvGroup', { static: false }) cvsvGroup: CdkVirtualScrollViewport; + @ViewChild('cvsvGroup', { read: PerfectScrollbarDirective, static: false }) + perfectScrollbar: PerfectScrollbarDirective; + NodeType = NodeType; profileNodes: GroupNode[] = []; @@ -270,5 +278,9 @@ export class ExpansionPanelComponent ...this.buddyNodes ]; this.dataSource.data = this.rootNodeList; + + if (!!this.perfectScrollbar) { + this.perfectScrollbar.scrollToTop(); + } } } From 834357a550132c8aee5b70c25e6108000a66aba9 Mon Sep 17 00:00:00 2001 From: leejinho Date: Thu, 21 Nov 2019 15:01:41 +0900 Subject: [PATCH 2/3] =?UTF-8?q?bugfix=20>>=20@=EB=8C=80=ED=99=94=EB=B0=A9?= =?UTF-8?q?=20=ED=83=80=EC=9E=85=EB=B3=84=20context=20menu=20=EB=B6=84?= =?UTF-8?q?=EB=A6=AC=EC=B2=98=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/app/layouts/messenger/components/messages.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts index bb6ecf4c..5302ce94 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts @@ -339,6 +339,8 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { menuType === 'EDIT_ROOM' ) { if ( + !this.roomInfo || + !this.roomInfo.roomType || this.roomInfo.roomType === RoomType.Mytalk || this.roomInfo.roomType === RoomType.Allim || this.roomInfo.roomType === RoomType.Bot || From 2c464bcc52123697d60e24cf3fa3eecb650f4f9a Mon Sep 17 00:00:00 2001 From: khk Date: Thu, 21 Nov 2019 15:04:03 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EB=A7=90=ED=92=8D=EC=84=A0=20-=20=EC=A4=84?= =?UTF-8?q?=EB=B0=94=EA=BF=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/lib/components/message-box/text.component.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss index 166e8c59..5fc47429 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/text.component.scss @@ -1,9 +1,9 @@ .bubble-main { padding: 14px; - text-align:left; - span{ + text-align: left; + span { word-wrap: break-word; white-space: pre-wrap; - word-break: keep-all; + word-break: break-word; } -} \ No newline at end of file +}