From 729379d0f8442d800a9149bc5770354072019592 Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 12 Feb 2020 14:08:22 +0900 Subject: [PATCH 1/8] =?UTF-8?q?#=20=EC=8B=9C=ED=97=98=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=EB=B6=84=EC=84=9D=2081?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../native/components/top-bar.component.html | 1 + .../layouts/native/components/top-bar.component.ts | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html index 3d65cdda..7b8a060a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.html @@ -6,6 +6,7 @@
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts index 52616bd7..ad591d6b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.ts @@ -125,6 +125,8 @@ export class TopBarComponent implements OnInit, OnDestroy { @ViewChild('profileMenu', { static: true }) profileMenu: MatMenu; + integratedSearchWord = ''; + constructor( private store: Store, @Inject(UCAP_NATIVE_SERVICE) private nativeService: NativeService, @@ -567,19 +569,24 @@ export class TopBarComponent implements OnInit, OnDestroy { ); } - onIntegratedSearch(keyword: string) { + async onIntegratedSearch(keyword: string) { if (!keyword || keyword.trim().length === 0) { return; } - this.dialogService.open< + this.integratedSearchWord = keyword; + + const result = await this.dialogService.open< IntegratedSearchDialogComponent, IntegratedSearchDialogData, IntegratedSearchDialogResult >(IntegratedSearchDialogComponent, { data: { keyword - } + }, + restoreFocus: false }); + + this.integratedSearchWord = ''; } } From b60c6086d25b11f0359b8b5a306c23f15c3d1b4d Mon Sep 17 00:00:00 2001 From: khk Date: Wed, 12 Feb 2020 14:13:23 +0900 Subject: [PATCH 2/8] =?UTF-8?q?ng-deep=20=EC=A0=95=EB=A6=AC=EC=A4=91(3?= =?UTF-8?q?=EC=B0=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/left-nav.component.scss | 7 - .../left-sidenav/chat.component.scss | 7 - .../left-sidenav/group.component.scss | 5 +- .../components/right-drawer.component.scss | 57 -------- .../right-drawer/file-box.component.scss | 26 ++++ .../right-drawer/notice.component.scss | 21 --- .../chat/clipboard.dialog.component.scss | 128 ------------------ .../chat/create-chat.dialog.component.scss | 5 - .../group/select-group.dialog.component.html | 1 + .../group/select-group.dialog.component.scss | 5 +- .../messenger-settings.dialog.component.scss | 57 +------- .../lib/components/list-item.component.html | 14 +- .../src/lib/components/write.component.scss | 23 ++-- .../src/lib/components/general.component.scss | 3 + .../src/assets/scss/partials/_icons.scss | 9 ++ .../sticker-selector.component.scss | 1 + 16 files changed, 68 insertions(+), 301 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss index bcd106ec..1fdb3d35 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-nav.component.scss @@ -76,13 +76,6 @@ } } -/*::ng-deep .ps { - .ps-content { - position: relative; - width: 100%; - height: 100%; - } -}*/ // perfect-scrollbar right로 2px이동 ::ng-deep .ps__rail-y { & > .ps__thumb-y { diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss index a1a17129..54b2eb9b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/chat.component.scss @@ -32,10 +32,3 @@ width: 100%; height: 100%; } -/*::ng-deep .cdk-virtual-scroll-orientation-vertical { - .cdk-virtual-scroll-content-wrapper { - width: 100%; - height: 100%; - contain: unset; - } -}*/ diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss index 2d0e09b6..eb66295b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/group.component.scss @@ -32,10 +32,7 @@ } } } -/*::ng-deep .mat-tab-body-content { - height: 100%; - overflow: unset; -}*/ + .mat-menu-item { display: flex; align-items: center; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss index c92d8b0b..5219b909 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss @@ -27,60 +27,3 @@ $tablet-s-width: 768px; } } } - -::ng-deep .footer-fix { - position: absolute; - bottom: 0; - min-height: 40px; - width: 100%; - flex-direction: column; - box-sizing: border-box; - display: flex; - border-top: 1px solid #dddddd; - .btn-box { - height: 50px; - padding-bottom: 10px; - width: 100%; - background-color: #ffffff; - button { - margin: 5px; - font-size: 0.9em; - padding: 0 12px; - } - } - .mat-paginator-page-size { - @media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) { - display: none; - } - } -} - -/*right-drawer tab 레이아웃 -::ng-deep .rightDrawer-tab { - .mat-tab-labels { - display: flex; - width: 100%; - border-bottom: 2px solid #dddddd; - flex: 1 1 auto; - justify-content: space-around; - width: 100%; - padding: 0; - min-width: 0 !important; - - .mat-tab-label { - width: 50%; - } - } - .mat-tab-header-pagination.mat-tab-header-pagination-disabled { - display: none !important; - } - .message-tab { - position: relative; - height: 100%; - & > .mat-tab-header { - width: 100%; - .mat-tab-label { - min-width: 33%; - } - } -}*/ diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss index e1ac7b65..3feca976 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/file-box.component.scss @@ -148,6 +148,32 @@ $tablet-s-width: 768px; font-size: 1em; } } +.footer-fix { + position: absolute; + bottom: 0; + min-height: 40px; + width: 100%; + flex-direction: column; + box-sizing: border-box; + display: flex; + border-top: 1px solid #dddddd; + .btn-box { + height: 50px; + padding-bottom: 10px; + width: 100%; + background-color: #ffffff; + button { + margin: 5px; + font-size: 0.9em; + padding: 0 12px; + } + } + .mat-paginator-page-size { + @media screen and (max-width: #{$tablet-s-width}), (max-height: 800px) { + display: none; + } + } +} .mat-paginator-container { display: flex; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss index 499f6d07..d1822359 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/notice.component.scss @@ -95,27 +95,6 @@ } } -/*::ng-deep .mat-paginator { - .mat-paginator-container { - justify-content: center; - } - .mat-paginator-navigation-first { - order: 1; - } - .mat-paginator-navigation-previous { - order: 2; - } - // override material paginator page switch - .mat-paginator-range-label { - order: 3; - } - .mat-paginator-navigation-next { - order: 4; - } - .mat-paginator-navigation-last { - order: 5; - } -}*/ .mat-form-field-appearance-legacy { .mat-form-field-infix { padding: 6px; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss index 3e27161c..e0713d91 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/clipboard.dialog.component.scss @@ -1,131 +1,3 @@ -/*.clipboard-frame { - padding: 16px; - height: 100%; - min-width: 500px; - position: relative; - - .mat-dialog-container { - position: relative; - } - - .mat-card-header { - position: relative; - width: 100%; - border-bottom: 1px solid #dddddd; - margin-bottom: 12px; - - .btn-dialog-close { - font-size: 20px; - display: flex; - margin-left: auto; - align-self: flex-start; - color: #444444; - } - } - .mat-card-content { - flex: 0 0 auto; - display: flex; - align-items: flex-start; - height: calc(100% - 100px); - border-bottom: 1px solid #dddddd; - .setting-tab { - position: relative; - width: 100%; - height: 100%; - - .title-text { - padding-left: 5px; - } - - .mat-tab-group { - flex-direction: row; - .mat-tab-header { - width: 160px; - .mat-tab-labels { - flex-direction: column; - .mat-tab-label { - padding: 0 10px; - align-content: flex-start; - text-align: left; - align-items: self-start; - justify-content: flex-start; - } - } - .mat-ink-bar { - display: none; - } - } - } - } - } - - .button-farm { - text-align: right; - position: absolute; - width: 100%; - bottom: 10px; - .mat-primary { - margin-left: 4px; - } - } -} - -::ng-deep .clipboard-tab { - .mat-tab-group { - position: relative; - height: 100%; - width: 100%; - - .mat-tab-header { - width: 170px; - flex-flow: column; - border-right: 1px solid #dddddd; - .mat-tab-label-container { - .mat-tab-list { - .mat-tab-labels { - border-bottom: 0; - //padding-right: 10px; - .mat-tab-label { - padding: 0 10px; - } - } - } - } - } - - .mat-tab-body-wrapper { - .mat-tab-body { - .mat-tab-body-conten { - position: relative; - width: 100%; - height: 100%; - .mat-list-base { - position: relative; - } - } - } - } - } -} - -::ng-deep .setting-category { - .mat-list-base { - position: relative; - .mat-list-item { - font-size: 15px; - .mat-tab-header { - border-right: none; - } - } - .mat-divider { - //margin-top: 10px; - } - .mat-subheader { - font-weight: 600; - } - } -} -*/ .clipboard-frame { padding: 16px; height: 100%; diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss index c4e4f973..3dbcf3f6 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/chat/create-chat.dialog.component.scss @@ -170,8 +170,3 @@ } } } -/*::ng-deep .ps-content { - .cdk-virtual-scroll-viewport { - height: 100%; - } -}*/ diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html index 9cb66e91..3f05fc2b 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html @@ -16,6 +16,7 @@ add {{ 'group.addNew' | translate }} +
- + + {{ message.title }}
diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss index f88cea1f..11aa5f22 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/write.component.scss @@ -91,7 +91,7 @@ } } -::ng-deep .ucap-message-write { +.ucap-message-write { padding: 0; .add-row { display: flex; @@ -100,19 +100,18 @@ margin-bottom: 10px; border-bottom: 1px solid #dddddd; .mat-mini-fab { - .mat-button-wrapper { - padding: 0; - .mat-icon { - width: 40px; - height: 40px; - line-height: 40px; - } - .mat-fab__label { - color: #212121; - margin-left: 10px; - } + .mat-icon { + width: 40px; + height: 40px; + line-height: 40px; + margin-top: -8px; + } + .mat-fab__label { + color: #212121; + margin-left: 10px; } } + .receiver-sum { margin-left: auto; } diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss index 2f361eb7..7a6dcf96 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss @@ -77,6 +77,9 @@ .mat-tab-label { width: 140px; height: 120px; + &.mat-tab-label-active { + opacity: 1; + } .mat-tab-label-content { position: relative; flex-flow: column; diff --git a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss index 9931e3c5..fa019354 100644 --- a/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss +++ b/projects/ucap-webmessenger-ui/src/assets/scss/partials/_icons.scss @@ -54,6 +54,12 @@ mat-icon { height: 24px; line-height: 24px; } + &-30 { + font-size: 30px; + width: 30px; + height: 30px; + line-height: 30px; + } } &:before { display: inline-block; @@ -69,3 +75,6 @@ mat-icon { opacity: 0.7; } } +.circle-button { + border-radius: 50%; +} diff --git a/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.scss index a3aac945..3522e933 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/sticker-selector.component.scss @@ -21,6 +21,7 @@ $tablet-s-width: 768px; } } } + .sticker-item-box { flex-wrap: wrap; padding: 10px 20px 0; From ecb7eb5f2f7999d60ebf8b81e9f7b8935eee00e5 Mon Sep 17 00:00:00 2001 From: khk Date: Wed, 12 Feb 2020 15:06:26 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=ED=86=B5=ED=95=A9=EA=B2=80=EC=83=89=20inpu?= =?UTF-8?q?tbox=20=EC=98=81=EC=97=AD(background-color=20white=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD)=20=EC=9A=94=EA=B5=AC=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../native/components/top-bar.component.scss | 3 ++- .../src/lib/components/list-item.component.scss | 4 ++-- .../integrated-search-form.component.scss | 14 +++++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss index 0db581da..1aafd228 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/native/components/top-bar.component.scss @@ -42,6 +42,7 @@ height: 100%; display: inline-flex; align-items: center; + margin-right: 10px; } .app-layout-native-title-bar-link { @@ -54,7 +55,7 @@ overflow: hidden; white-space: nowrap; align-items: center; - height:100%; + height: 100%; .button { -webkit-app-region: no-drag; outline: 0; diff --git a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss index b46e7252..5ec4c83b 100644 --- a/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss +++ b/projects/ucap-webmessenger-ui-message/src/lib/components/list-item.component.scss @@ -26,8 +26,8 @@ width: 100%; position: relative; justify-items: center; - .mat-icon{ - font-size:18px; + .icon-img { + margin-right: 6px; } .final-message { white-space: nowrap; diff --git a/projects/ucap-webmessenger-ui/src/lib/components/integrated-search-form.component.scss b/projects/ucap-webmessenger-ui/src/lib/components/integrated-search-form.component.scss index 94da42fa..f57a1f8c 100644 --- a/projects/ucap-webmessenger-ui/src/lib/components/integrated-search-form.component.scss +++ b/projects/ucap-webmessenger-ui/src/lib/components/integrated-search-form.component.scss @@ -3,11 +3,19 @@ display: flex; flex-flow: row; align-items: center; - width: 250px; - max-width: 250px; + width: 240px; + max-width: 240px; color: #ffffff; - font-size: 0.9em; + font-size: 0.88rem; + color: #2d3a4a; + background-color: #ffffff; + padding: 4px 10px; + border-radius: 3px; .icon-img { flex: 0 0 auto; } + .mat-form-field { + font-size: 0.88rem; + color: #333333; + } } From d9d17f8c2a09cb9bfe8a3c81e70537eb335663a3 Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 12 Feb 2020 15:21:29 +0900 Subject: [PATCH 4/8] bugfix --- electron-projects/ucap-webmessenger-electron/src/index.ts | 2 ++ .../src/app/store/messenger/sync/reducers.ts | 4 ++-- .../src/lib/protocols/info.ts | 2 +- .../src/lib/protocols/room.ts | 2 +- .../src/lib/components/messages.component.ts | 8 +++++++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/electron-projects/ucap-webmessenger-electron/src/index.ts b/electron-projects/ucap-webmessenger-electron/src/index.ts index 1ae23473..2734a605 100644 --- a/electron-projects/ucap-webmessenger-electron/src/index.ts +++ b/electron-projects/ucap-webmessenger-electron/src/index.ts @@ -549,10 +549,12 @@ ipcMain.on( if (!err) { event.returnValue = savePath; } else { + log.info('SaveFile err', err); event.returnValue = undefined; } }); } catch (error) { + log.info('SaveFile error', error); event.returnValue = undefined; } } diff --git a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts index 8c645c5c..163eb95f 100644 --- a/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts +++ b/projects/ucap-webmessenger-app/src/app/store/messenger/sync/reducers.ts @@ -82,7 +82,7 @@ export const reducer = createReducer( // tslint:disable-next-line: forin for (const key in state.room.entities) { const value = state.room.entities[key]; - unReadCount += value.noReadCnt; + unReadCount += isNaN(value.noReadCnt) ? 0 : value.noReadCnt; } action.roomList.map(item => (unReadCount += item.noReadCnt)); @@ -304,7 +304,7 @@ export const reducer = createReducer( for (const key in state.room.entities) { if (key !== action.roomSeq) { const value = state.room.entities[key]; - unReadCount += value.noReadCnt; + unReadCount += isNaN(value.noReadCnt) ? 0 : value.noReadCnt; } } } else { diff --git a/projects/ucap-webmessenger-protocol-room/src/lib/protocols/info.ts b/projects/ucap-webmessenger-protocol-room/src/lib/protocols/info.ts index 85622e51..9d76f066 100644 --- a/projects/ucap-webmessenger-protocol-room/src/lib/protocols/info.ts +++ b/projects/ucap-webmessenger-protocol-room/src/lib/protocols/info.ts @@ -89,7 +89,7 @@ export const decodeInfoData: ProtocolDecoder = ( finalEventMessage: info[4], finalEventDate: info[5], joinUserCount: Number(info[6]), - noReadCnt: Number(info[7]), + noReadCnt: isNaN(info[7]) ? 0 : Number(info[7]), receiveAlarm: info[8] !== 'N' ? true : false, isJoinRoom: info[9] === 'Y' ? true : false, expiredFileStdSeq: Number(info[10]), diff --git a/projects/ucap-webmessenger-protocol-sync/src/lib/protocols/room.ts b/projects/ucap-webmessenger-protocol-sync/src/lib/protocols/room.ts index 02e5dd76..97a80292 100644 --- a/projects/ucap-webmessenger-protocol-sync/src/lib/protocols/room.ts +++ b/projects/ucap-webmessenger-protocol-sync/src/lib/protocols/room.ts @@ -83,7 +83,7 @@ export const decodeRoomData: ProtocolDecoder = ( finalEventMessage: info[4], finalEventDate: info[5], joinUserCount: Number(info[6]), - noReadCnt: Number(info[7]), + noReadCnt: isNaN(info[7]) ? 0 : Number(info[7]), receiveAlarm: info[8] !== 'N' ? true : false, isJoinRoom: info[9] === 'Y' ? true : false, expiredFileStdSeq: Number(info[10]), diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts index aa5608b5..9f481c02 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/messages.component.ts @@ -178,6 +178,13 @@ export class MessagesComponent implements OnInit, OnDestroy { this.loginRes = loginRes; }); this.roomInfoSubscription = this.roomInfo$.subscribe(roomInfo => { + if ( + !this.roomInfo || + (!!this.roomInfo && this.roomInfo.roomSeq !== roomInfo.roomSeq) + ) { + this.baseEventSeq = 0; + } + this.roomInfo = roomInfo; this.showMore = false; @@ -196,7 +203,6 @@ export class MessagesComponent implements OnInit, OnDestroy { !this.roomInfo || (!!this.roomInfo && this.roomInfo.roomSeq !== roomInfo.roomSeq) ) { - this.baseEventSeq = 0; this.initEventMore(); } }); From 59774abb1fd75b42c992d0932bb87bdf2e4f6f16 Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 12 Feb 2020 16:26:20 +0900 Subject: [PATCH 5/8] =?UTF-8?q?bugfix=20::=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20=ED=86=B5=ED=95=A9=EA=B2=80=EC=83=89=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=86=8C=ED=8C=85=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dialogs/search/integrated-search.dialog.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts index 01ed6aa9..741f9297 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.ts @@ -151,7 +151,9 @@ export class IntegratedSearchDialogComponent implements OnInit, OnDestroy { const response = res as DeptUserResponse; // 검색 결과 처리. - this.searchUserInfos = searchUserInfos; + this.searchUserInfos = searchUserInfos.sort((a, b) => + a.name < b.name ? -1 : a.name > b.name ? 1 : 0 + ); this.totalCount = response.pageTotalCount; this.pageCurrent = response.pageCurrent; From e87b27a4fa3082ff2ff38f663cad5e5f891d2888 Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 12 Feb 2020 16:27:12 +0900 Subject: [PATCH 6/8] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?243?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messenger/components/left-side.component.html | 4 +++- .../components/left-sidenav/chat.component.ts | 13 +++++++++---- .../left-sidenav/organization.component.ts | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html index fe8d3d01..291f6aa0 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-side.component.html @@ -16,7 +16,9 @@ class="left-side-tabs-contents" [style.display]="MainMenu.Chat === currentTabLable ? 'block' : 'none'" > - +
0 && !this.isInitList && this.isVisible ) { this.isInitList = true; - this.cvsvChatList.checkViewportSize(); + this.vsChatRoomList.refresh(); + + if (!!this.psDirectiveRef) { + this.psDirectiveRef.update(); + } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts index 115985fd..0027d837 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/left-sidenav/organization.component.ts @@ -298,6 +298,7 @@ export class OrganizationComponent this.isVisible ) { this.isInitList = true; + this.vsDeptUser.refresh(); } } From 0d5e3471a598b097093a94e770c6cc4aab143c10 Mon Sep 17 00:00:00 2001 From: khk Date: Wed, 12 Feb 2020 16:49:39 +0900 Subject: [PATCH 7/8] =?UTF-8?q?ng-deep=20=EC=A0=95=EB=A6=AC=EC=A4=91(4?= =?UTF-8?q?=EC=B0=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/right-drawer.component.scss | 3 -- .../right-drawer/album-box.component.html | 2 + .../right-drawer/album-box.component.scss | 35 +++++++-------- .../chat/create-chat.dialog.component.scss | 3 +- .../message-detail.dialog.component.scss | 6 +-- .../src/lib/components/form.component.html | 27 +----------- .../src/lib/components/form.component.scss | 10 ++--- .../src/lib/components/general.component.scss | 44 ------------------- 8 files changed, 25 insertions(+), 105 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss index 5219b909..8b61b407 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer.component.scss @@ -22,8 +22,5 @@ $tablet-s-width: 768px; width: 50%; min-width: 50%; } - .mat-tab-header-pagination { - display: none; - } } } diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html index e9189136..c25d0f1a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/right-drawer/album-box.component.html @@ -100,6 +100,7 @@
+
+
.mat-tab-body-wrapper { .mat-tab-body { height: 380px; @@ -170,3 +170,4 @@ } } } +*/ diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss index 1345d827..b32390bd 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/message/message-detail.dialog.component.scss @@ -23,10 +23,6 @@ } } -::ng-deep .mat-mini-fab .mat-button-wrapper { - padding: 0; -} - .contents { height: 380px; .message-contents { @@ -46,7 +42,7 @@ } } -::ng-deep .message-container { +.message-container { background-color: #ffffff !important; .message-info { /*.profile { diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html index c3a9ca13..c64d520e 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.html @@ -27,7 +27,6 @@ (click)="onClickStickerSelector()" matTooltip="{{ 'chat.btnSticker' | translate }}" > - @@ -37,16 +36,6 @@ (click)="onClickTranslation()" matTooltip="{{ 'chat.btnTranslate' | translate }}" > -
diff --git a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss index 50d37040..b456d22f 100644 --- a/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss +++ b/projects/ucap-webmessenger-ui-chat/src/lib/components/form.component.scss @@ -57,23 +57,19 @@ textarea[name='message'] { padding-top: 0; } -::ng-deep .send-message-button { +.send-message-button { margin-left: 20px; + line-height: unset; @media screen and (max-width: #{$tablet-l-width}), (max-height: 800px) { margin-left: 6px; } - .mat-button-wrapper { - display: flex; - justify-content: center; - justify-items: center; - } i { display: inline-block; width: 40px; height: 40px; border-radius: 50%; line-height: 40px; - font-size: 20px; + font-size: 24px; color: #ffffff; &:hover { opacity: 0.8; diff --git a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss index 7a6dcf96..a704b4d9 100644 --- a/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss +++ b/projects/ucap-webmessenger-ui-settings/src/lib/components/general.component.scss @@ -1,47 +1,3 @@ -/*::ng-deep .mat-list-base { - .theme-select.mat-list-item { - position: relative; - height: 160px; - .mat-list-item-content { - flex-direction: column; - } - } -} - -::ng-deep .theme-list { - position: relative; - display: flex; - flex-flow: row; - width: 100%; - margin: 10px; - height: auto !important; - .mat-tab-header { - position: relative; - width: 100% !important; - .mat-tab-labels { - position: relative; - width: 100%; - flex-flow: row !important; - .mat-tab-label { - width: 140px; - height: 120px; - .mat-tab-label-content { - position: relative; - flex-flow: column; - width: 100%; - } - } - } - .mat-ink-bar { - display: none; - } - } - .mat-tab-body-wrapper { - border-left: none; - } -} - -*/ .mat-list-item { margin-bottom: 10px; } From b4eaa336e2885c11b23c95f590ac268ead11d2ed Mon Sep 17 00:00:00 2001 From: leejinho Date: Wed, 12 Feb 2020 16:54:24 +0900 Subject: [PATCH 8/8] =?UTF-8?q?#=20=EC=9D=B4=EC=8A=88=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?242?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/select-group.dialog.component.html | 15 +++- .../group/select-group.dialog.component.ts | 83 +++++++++++++++++-- 2 files changed, 91 insertions(+), 7 deletions(-) diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html index 3f05fc2b..52539aec 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.html @@ -34,7 +34,6 @@ value="" formControlName="groupName" /> - - {{ inputGroupName.value?.length || 0 }}/20 + + {{ + 'group.errors.bannedWords' + | translate: { bannedWords: bannedWords.join(',') } + }} + + + {{ 'group.errors.sameNameExist' | translate }} + diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.ts index e32b0ea7..a19855bc 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/group/select-group.dialog.component.ts @@ -5,7 +5,7 @@ import { MatSelectionList, MatSelectionListChange } from '@angular/material'; -import { Observable, combineLatest } from 'rxjs'; +import { Observable, combineLatest, Subscription } from 'rxjs'; import { Store, select } from '@ngrx/store'; import { map, take } from 'rxjs/operators'; @@ -20,8 +20,14 @@ import { } from '@ucap-webmessenger/ui'; import { GroupDetailData, UserInfo } from '@ucap-webmessenger/protocol-sync'; import { environment } from '../../../../../environments/environment'; -import { TranslateService } from '@ngx-translate/core'; -import { FormGroup, FormBuilder, Validators } from '@angular/forms'; +import { TranslateService, TranslateParser } from '@ngx-translate/core'; +import { + FormGroup, + FormBuilder, + Validators, + ValidatorFn, + AbstractControl +} from '@angular/forms'; import { StringUtil } from '@ucap-webmessenger/core'; export interface SelectGroupDialogData { @@ -43,6 +49,10 @@ export class SelectGroupDialogComponent implements OnInit { groupName: string; inputForm: FormGroup; + bannedWords: string[] = []; + groupListSubscription: Subscription; + groupList: GroupDetailData[]; + constructor( public dialogRef: MatDialogRef< SelectGroupDialogData, @@ -52,8 +62,34 @@ export class SelectGroupDialogComponent implements OnInit { private store: Store, private dialogService: DialogService, private translateService: TranslateService, + private translateParser: TranslateParser, private formBuilder: FormBuilder - ) {} + ) { + const banKeys: string[] = [ + 'group.nameFavorite', + 'group.nameMyDept', + 'group.nameDefault' + ]; + + const langs = ['ko', 'en']; + + langs.forEach(lang => { + this.translateService + .getTranslation(lang) + .pipe(take(1)) + .subscribe( + translation => { + banKeys.forEach(banKey => { + this.bannedWords.push( + this.translateParser.getValue(translation, banKey) + ); + }); + }, + error => {}, + () => {} + ); + }); + } @ViewChild('groups', { static: true }) groups: MatSelectionList; groupBuddyList$: Observable< @@ -64,7 +100,15 @@ export class SelectGroupDialogComponent implements OnInit { ngOnInit(): void { this.inputForm = this.formBuilder.group({ - groupName: ['', [Validators.required, StringUtil.checkSpecialCharacter()]] + groupName: [ + '', + [ + Validators.required, + StringUtil.checkSpecialCharacter(), + this.checkBanWords(), + this.checkSameName() + ] + ] }); this.groups.selectionChange.subscribe((s: MatSelectionListChange) => { @@ -82,6 +126,8 @@ export class SelectGroupDialogComponent implements OnInit { ) ]).pipe( map(([buddyList, groupList]) => { + this.groupList = groupList; + // sort.. if (!!groupList && groupList.length > 0) { const tempOrderArr: GroupDetailData[] = []; @@ -214,4 +260,31 @@ export class SelectGroupDialogComponent implements OnInit { } return false; } + + checkBanWords(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } | null => { + if (!control || !control.value) { + return null; + } + const ban = + -1 < this.bannedWords.indexOf((control.value as string).trim()); + return ban ? { groupNameBanned: { value: control.value } } : null; + }; + } + + checkSameName(): ValidatorFn { + return (control: AbstractControl): { [key: string]: any } | null => { + if ( + !control || + !control.value || + !this.groupList || + 0 === this.groupList.length + ) { + return null; + } + const v = (control.value as string).trim(); + const ban = -1 < this.groupList.findIndex(g => g.name === v); + return ban ? { groupNameSamed: { value: control.value } } : null; + }; + } }