diff --git a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
index 4e8ec321..487c7a0d 100644
--- a/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
+++ b/electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts
@@ -30,8 +30,8 @@ export class AppWindow {
private minWidth = 700;
private minHeight = 600;
- private defaultWidth = 1160;
- private defaultHeight = 800;
+ private defaultWidth = 1024;
+ private defaultHeight = 768;
public constructor(private appIconPath: string) {
const savedWindowState = windowStateKeeper({
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
index 0520ecc7..f9075c9b 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.html
@@ -7,10 +7,22 @@
class="card-header"
>{{ 'search.label' | translate }}
-
+
+
+
diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss
index bb77edd2..89109bd0 100644
--- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss
+++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/dialogs/search/integrated-search.dialog.component.scss
@@ -4,12 +4,28 @@
.mat-card-header-text {
margin: 0;
}
- .btn-dialog-close {
- font-size: 20px;
+ .btn-top-frme {
display: flex;
margin-left: auto;
- align-self: flex-start;
- color: #444444;
+ justify-content: space-between;
+
+ .btn-dialog-close,
+ .btn-dialog-refresh {
+ font-size: 20px;
+ display: flex;
+ margin-left: auto;
+ align-self: flex-start;
+ color: #444444;
+ }
+ .btn-dialog-fold {
+ width: 56px;
+ height: 26px;
+ padding: 0;
+ svg {
+ width: 24px;
+ height: 24px;
+ }
+ }
}
}
.mat-card-content {
@@ -20,32 +36,43 @@
}
}
.search-area {
+ display: flex;
+ align-items: center;
ucap-integrated-search-form {
position: relative;
display: inline-flex;
width: 30%;
margin: 0 -10px;
+ .search-container {
+ padding: 0;
+ }
+ }
+ .organization-option {
+ position: relative;
+ display: inline-flex;
+ width: 70%;
+ padding-left: 20px;
+ .mat-form-field {
+ margin-left: 20px;
+ &:first-child {
+ margin-left: 0;
+ }
+ }
}
}
-.organization-option {
- position: relative;
- display: inline-flex;
- width: 70%;
- transform: translateY(-10px);
- padding-bottom: 10px;
- padding-left: 0;
- border-bottom: 1px solid;
- .mat-form-field {
- margin-left: 20px;
- &:first-child {
- margin-left: 0;
- }
+.select-item {
+ border: 1x soild red;
+ line-height: 1.4em;
+
+ .select-trigger {
+ font-size: 0.88rem;
}
}
.content-area {
display: flex;
- height: calc(100% - 120px);
+ //height: calc(100% - 120px);하단 초기화, 접기 버튼 있는 경우
+ height: calc(100% - 70px);
flex-wrap: wrap;
flex-direction: column;
flex: 0 0 auto;
@@ -109,9 +136,20 @@
li {
display: inline-flex;
margin-left: 4px;
+ width: 120px;
+ button {
+ width: 100%;
+ }
}
}
}
.integrate-search-org {
+ width: 100%;
+ height: 100%;
overflow: auto;
}
+
+.list-chip {
+ max-height: 220px;
+ overflow-y: auto;
+}
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 21a96472..51bcd4d8 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
@@ -416,8 +416,8 @@ export class TopBarComponent implements OnInit, OnDestroy {
.replace(/(\(%USER_ID%\))/g, loginId)
.replace(/(\(%USER_PASS%\))/g, loginPw);
- let width = 1160;
- let height = 800;
+ let width = 1024;
+ let height = 768;
let openType = 'INNER-POPUP';
switch (link.key) {
case WebLinkType.Sms:
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
index 0c0826d2..4daee51b 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json
@@ -79,6 +79,7 @@
"searchFormPlaceholder": "Name, department, position, phone number, email",
"fold": "Folding",
"unfold": "Unfolding",
+ "clear": "Data clear",
"clearAndColse": "Data clear & Close",
"andOthers": "and {{count}}others",
"fieldProfile": "Profile",
diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
index bc6c58d1..ea7bf609 100644
--- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
+++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json
@@ -79,6 +79,7 @@
"searchFormPlaceholder": "이름, 부서, 직위, 전화번호, 이메일",
"fold": "접어두기",
"unfold": "펼쳐보기",
+ "clear":"검색 초기화",
"clearAndColse": "검색 초기화 & 닫기",
"andOthers": "외 {{count}}건",
"fieldProfile": "프로필",
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 172f5b2e..3b280fa7 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
@@ -7,7 +7,7 @@
font-size: 0.88rem;
color: #2d3a4a;
background-color: #ffffff;
- padding: 4px 10px;
+ padding: 0 10px;
border-radius: 3px;
width: 100%;
height: 100%;
@@ -20,3 +20,6 @@
flex: 1 1 auto;
}
}
+::ng-deep .mat-form-field-infix {
+ width: inherit;
+}