Merge pull request 'fix bug screen 8' (#91) from dev-dungtv-0821 into dev

Reviewed-on: #91

components/common/Grid.vue

@@ -173,8 +173,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/EqpmSelectPop.vue

@@ -2,17 +2,14 @@
 	<v-row class="search-box" align="center" no-gutters>
 		<v-col v-if="label" :cols="labelCols" class="mr-2">
 			<label for="" class="search-box-label">
-				<v-icon v-if="iconShow" small
-					:class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
+				<v-icon v-if="iconShow" small :class="['mr-1', required ? 'icon-orange' : 'icon-blue']">$icoBulletPoint</v-icon>
 				{{ label }}
 			</label>
 		</v-col>
 		<v-col :cols="textCols">
 			<v-text-field readonly v-model="selectValue" append-icon="" :class="['v-input__custom', customClass]"
 				@click="dialogOpenCloseEvent(dialog)" outlined :hide-details="true" :required="required || false"
-				:disabled="disabled || false"
-				:placeholder="placeholder"
-				>
+				:disabled="disabled || false" :placeholder="placeholder">
 				<template v-slot:append>
 					<!-- Custom SVG icon -->
 					<v-icon>$icoSearch</v-icon>
@@ -31,15 +28,15 @@
 					<v-row align="end">
 						<v-col :cols="3.5">
 							<!-- 설비그룹 -->
-							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01"
-								:label="'설비그룹'" :disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event"
-								:labelCols="12" :textCols="12" :iconShow="true" />
+							<component :is="'SelectBox'" :propsValue="selectValue01" :itemList="selectValueList01" :label="'설비그룹'"
+								:disabled="eqpmGrpDisabled" @update:propsValue="selectValue01 = $event" :labelCols="12" :textCols="12"
+								:iconShow="true" />
 						</v-col>
 						<v-col>
 							<!-- FAB -->
-							<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02"
-								:label="'FAB'" :labelCols="12" :multiple="true" :disabled="fabDisabled"
-								@update:propsValue="selectValue02 = $event" :textCols="12" :iconShow="true" />
+							<component :is="'SelectBoxMulti'" :propsValue="selectValue02" :itemList="selectValueList02" :label="'FAB'"
+								:labelCols="12" :multiple="true" :disabled="fabDisabled" @update:propsValue="selectValue02 = $event"
+								:textCols="12" :iconShow="true" />
 						</v-col>
 						<v-col>
 							<v-row>
@@ -86,15 +83,16 @@
 				</div>
 
 				<div class="pa-5" style="height:calc(100% - 30px)">
-					<div ref="modalGridParent" class="h100 w100">
+					<div ref="modalGridParent" :class="['h100', 'w100', isDarkMode ? 'dark-mode' : 'light-mode']">
 						<component :ref="gridName" :is="loadGrid ? 'Grid' : null"
-							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName"
-							:parentPrgmId="parentPrgmId" @getRowsData="getRowData" />
+							:dataPath="searchParam.eqpmSelectPopData.eqpmSelectPop" :gridName="gridName" :parentPrgmId="parentPrgmId"
+							@getRowsData="getRowData" />
 					</div>
 				</div>
 
 				<v-card-actions class="px-6 py-4 d-flex align-center justify-end">
-					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)" class="ant-btn-popup-default mr-2">닫기</a-button>
+					<a-button :ripple="false" @click="dialogOpenCloseEvent(dialog)"
+						class="ant-btn-popup-default mr-2">닫기</a-button>
 					<a-button :ripple="false" type="primary" @click="setUpdate($event)">확인</a-button>
 				</v-card-actions>
 			</v-card>
@@ -247,6 +245,7 @@ export default {
 					eqpmKindId: data.eqpmKindId,
 				}
 			},
+			isDarkMode: "isDarkMode",
 		}),
 		selectValue: {
 			get() {
@@ -585,6 +584,7 @@ var eqpmSelectPop = {
 
 	.tui-grid-lside-area {
 		.tui-grid-table {
+
 			.tui-grid-cell-header {
 				&.tui-grid-cell {
 					input[type=checkbox] {
@@ -594,7 +594,23 @@ var eqpmSelectPop = {
 			}
 		}
 	}
-
 }
 
+@each $theme in dark, light {
+	@include theme($theme);
+
+	.#{$theme}-mode {
+		::v-deep {
+			.tui-grid-lside-area {
+				.tui-grid-table{
+					border-right: 1px solid map-deep-get($config,
+						#{$theme},
+						"tui-grid-border-vertical-color"
+					) !important;
+				}
+			}
+		}
+	}
+
+}
 </style>

layouts/default.vue

@@ -347,6 +347,12 @@ export default {
         //console.log("localPageData", this.pageData);
       },
     },
+    isDarkMode(){
+      this.loadingStackCnt = 1;
+      setTimeout(() => {
+        this.loadingStackCnt = 0;
+      }, 1000);
+    },
     // menuLink: {
     //   deep: true,
     //   handler() {

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">
 							<!-- 대상일 -->

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',