change background color popup input screen 13

assets/scss/common/editor.scss

@@ -83,7 +83,7 @@
 
 .toastui-editor-dark .toastui-editor-popup,
 .toastui-editor-dark .toastui-editor-context-menu {
-  background-color: #121212;
+  background-color: #212224;
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
   border-color: #494c56;
 }
@@ -92,8 +92,25 @@
   background-color: #36383f;
 }
 
+.toastui-editor-dark .toastui-editor-popup-add-heading h1,
+.toastui-editor-dark .toastui-editor-popup-add-heading h2,
+.toastui-editor-dark .toastui-editor-popup-add-heading h3,
+.toastui-editor-dark .toastui-editor-popup-add-heading h4,
+.toastui-editor-dark .toastui-editor-popup-add-heading h5,
+.toastui-editor-dark .toastui-editor-popup-add-heading h6 {
+  color: #eee;
+}
+
+.toastui-editor-popup-body label,
+.toastui-editor-popup-body button,
+.toastui-editor-popup-body .tab-item,
+.toastui-editor-popup-body span,
+.toastui-editor-popup-body input {
+    font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif) !important;
+}
+
 .toastui-editor-dark .toastui-editor-popup-body label {
-  color: #9a9da3;
+  color: rgba(255, 255, 255, 0.85098);
 }
 
 .toastui-editor-dark .toastui-editor-popup-body input[type='text'] {
@@ -107,7 +124,7 @@
 }
 
 .toastui-editor-dark .toastui-editor-popup-body input[type='text'].disabled {
-  color: #969aa5;
+  color:  rgba(255, 255, 255, 0.85098);
   border-color: #303238;
   background-color: rgba(48, 50, 56, 0.4);
 }
@@ -126,6 +143,10 @@
   border-bottom-color: #67ccff;
 }
 
+.toastui-editor-dark .toastui-editor-popup-add-image .toastui-editor-file-name.has-file {
+  color:#eee;
+}
+
 .toastui-editor-dark .toastui-editor-popup-body .toastui-editor-file-name {
   border-color: #303238;
   color: #eee;
@@ -141,24 +162,54 @@
   border-color: #494c56;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button {
-  color: #eee;
-  border-color: #303238;
-  background-color: #232428;
+.toastui-editor-defaultUI .toastui-editor-button-container button{
+  border-radius: 6px;
+  height: 32px;
+  font-family: var(--desktop-normal-font-family, "Inter-Regular", sans-serif);
+  font-size: var(--desktop-normal-font-size, 14px);
+  font-weight: 400;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-close-button:hover {
-  border-color: #494c56;
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-close-button{
+  background: #FFFFFF;
+  color: rgba(0, 0, 0, 0.87843);
+  border: 1px solid #D9D9D9;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button {
-  color: #121212;
-  background-color: #67ccff;
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-close-button:hover {
+  border-color: #D9D9D9;
 }
 
-.toastui-editor-dark.toastui-editor-defaultUI .toastui-editor-ok-button:hover {
-  color: #121212;
-  background-color: #32baff;
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-close-button {
+  background: #212224;
+  color: rgba(255, 255, 255, 0.85098);
+  border: 1px solid #424242;
+}
+
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-close-button:hover {
+  border-color: #424242;
+}
+
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-ok-button{
+  background: #1677FF;
+  border-color: #1677FF;
+  color: #FFF;
+}
+
+.toastui-editor-light .toastui-editor-defaultUI .toastui-editor-ok-button:hover{
+  color: #FFF;
+  background-color: #1677FF;
+}
+
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-ok-button {
+  background: #1668DC;
+  border-color: #1668DC;
+  color: #212224;
+}
+
+.toastui-editor-dark .toastui-editor-defaultUI .toastui-editor-ok-button:hover {
+  color: #212224;
+  background-color: #1668DC;
 }
 
 .toastui-editor-dark .toastui-editor-popup-add-table .toastui-editor-table-cell {

components/common/Grid.vue

@@ -174,8 +174,9 @@ export default {
 				this.gridScrollTop = e.target.scrollTop;
 				this.gridScrollLeft = e.target.scrollLeft;
 			});
-
-			if (!(this.scrollBody.scrollHeight > this.scrollBody.clientHeight)) {
+			if (this.scrollBody.scrollHeight > this.scrollBody.clientHeight) {
+				this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.remove('tui-grid-no-scroll-y');
+			} else {
 				this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.add('tui-grid-no-scroll-y');
 			}
 		}

components/common/modal/PlanPop.vue

@@ -802,17 +802,31 @@ export default {
 	}
 }
 
-
-
-
 .v-input__custom {
-
-
 	&.half {
 		width: calc(50% - 20px);
 	}
 }
 
+
+@each $theme in dark, light {
+	.v-application.#{$theme}-mode {
+		.v-input__custom {
+			&.v-input--is-readonly {
+				&:not(.v-input--radio-group) {
+					&:not(.v-input--checkbox) {
+						::v-deep {
+							.v-input__slot {
+								background-color: rgba(0, 0, 0, 0) !important;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
 ::v-deep {
 	.tui-timepicker-row {
 		display: flex;

pages/comm/base/NoticeMngPage.vue

@@ -509,7 +509,7 @@ export default {
 			this.loadGrid = false;
 
 			const res = await this.postApiReturn({
-				apiKey: 'selectPostPage',
+				apiKey: 'selectPostData',
 				resKey: 'postPage',
 				sendParam: params,
 			});

pages/ems/base/PastRsltDataReadPage.vue

@@ -12,7 +12,7 @@
 						</v-col>
 						<v-col :cols="3">
 							<component :is="'EvtObjPop'" :parentPrgmId="myPrgmId" :item="evtObjPopItem"
-								class="no-gutters" customClass="select-large" />
+								class="no-gutters" customClass="select-large pa-0" />
 						</v-col>
 						<v-col :cols="3">
 							<!-- 대상일 -->
@@ -30,8 +30,8 @@
 		</v-row>
 		<v-row ref="contents">
 			<v-col :cols="12" class="h100">
-				<v-card class="px-5 py-5">
-					<div ref="gridParent" class="px-5" style="height:calc(100% - 40px)">
+				<v-card class="pa-5 pb-0">
+					<div ref="gridParent" class="px-5" style="height:calc(100% - 70px)">
 						<component ref="myGrid" :is="loadGrid ? 'Grid' : null" :gridName="gridName"
 							:parentPrgmId="myPrgmId" />
 					</div>

pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue

@@ -546,12 +546,6 @@ export default {
 				columnOptions: {
 					resizable: true,
 				},
-				rowHeaders: [
-					{
-						type: 'rowNum',
-						align: 'right',
-					},
-				],
 				header: {
 					height: 37,
 				},
@@ -575,6 +569,7 @@ export default {
 
 			const _this = this;
 			const myColumns = [
+				{ header: 'No.', name: 'rowSeq', align: 'right', width: 90 },
 				{
 					header: 'FAB',
 					name: 'fabNm',

store/modules/list.js

@@ -514,7 +514,7 @@ const INIT_URL_STATE = {
 
 	// prgmId: "PRG0003" 공지사항
 	selectPostList: 'comm/base/NoticeMngCtr/selectPostList',
-	selectPostPage: 'comm/base/NoticeMngCtr/selectPostPage',
+	selectPostData: 'comm/base/NoticeMngCtr/selectPostData',
 	selectPostPageTotal: 'comm/base/NoticeMngCtr/selectPostPageTotal',
 	deletePostList: 'comm/base/NoticeMngCtr/deletePost',